Merge branch 'taion809-travis-ci-builds' into dev

Author: danielmewes

.travis.yml

@@ -0,0 +1,35 @@
+language: php
+
+sudo: true
+
+php:
+  - 5.3
+  - 5.4
+  - 5.5
+  - 5.6
+  - 7.0
+  - hhvm
+
+matrix:
+  allow_failures:
+    - php: hhvm
+
+cache:
+  directories:
+    - $HOME/.composer/cache
+
+before_install:
+  - source /etc/lsb-release && echo "deb http://download.rethinkdb.com/apt $DISTRIB_CODENAME main" | sudo tee /etc/apt/sources.list.d/rethinkdb.list
+  - wget -qO- https://download.rethinkdb.com/apt/pubkey.gpg | sudo apt-key add -
+  - sudo apt-get update
+  - sudo apt-get install -y rethinkdb
+  - nohup rethinkdb &
+  - travis_retry composer self-update
+
+install:
+  - travis_retry composer update --no-interaction --prefer-source
+
+script:
+  - php vendor/bin/parallel-lint --exclude vendor .
+  - php vendor/bin/phpcs -n --standard=PSR2 rdb/
+  - composer test

composer.json

@@ -18,7 +18,8 @@
     },
     "require-dev": {
         "phpunit/phpunit": "~4.8",
-        "jakub-onderka/php-parallel-lint": "dev-master"
+        "jakub-onderka/php-parallel-lint": "dev-master",
+        "squizlabs/php_codesniffer": "~2.5"
     },
     "autoload": {
         "files": ["rdb/rdb.php"],

rdb/DatumConverter.php

@@ -34,12 +34,7 @@ public function nativeToDatum($v)
                 if (!is_numeric($key) && !is_string($key)) {
                     throw new RqlDriverError("Key must be a string.");
                 }
-                if (
-                    (is_object($val)
-                    && is_subclass_of($val, "\\r\\Query"))
-                    && !(is_object($val)
-                    && is_subclass_of($val, '\r\Datum\Datum'))
-                ) {
+                if (is_subclass_of($val, "\\r\\Query") && !is_subclass_of($val, '\r\Datum\Datum')) {
                     $subDatum = $val;
                     $mustUseMakeTerm = true;
                 } else {

tests/Functional/JoinTest.php

@@ -152,19 +152,19 @@ public function testEqJoinId()
         $excpected = array(
             array(
                 'left' => array('id' => 1, 'other' => 'a'),
-                'right' => array('id' => 'a', 'other' => 1 )
+                'right' => array('id' => 'b', 'other' => 1 )
             ),
             array(
                 'left' => array('id' => 1, 'other' => 'a'),
-                'right' => array('id' => 'b', 'other' => 1 )
-            )
+                'right' => array('id' => 'a', 'other' => 1 )
+            ),
         );
 
         $res = $this->db()->table('t1')
             ->eqJoin('id', $this->db()->table('t2'), array('index' => 'other'))
             ->run($this->conn);
 
-        $this->assertEquals($excpected, $this->orderArrayByLeftId($res));
+        $this->assertEquals($excpected, $this->toArray($res->toArray()));
     }
 
     public function testEqJoinFunc()