updates from casting (#3)

* pulled changes from upstream

* fixed closures in where failing

Author: Flambe

.travis.yml

@@ -9,24 +9,12 @@ services:
   - docker
 
 install:
-  # Update docker-engine using Ubuntu 'trusty' apt repo
-  - >
-    curl -sSL "https://get.docker.com/gpg" |
-     sudo -E apt-key add -
-  - >
-    echo "deb https://apt.dockerproject.org/repo ubuntu-trusty main" |
-     sudo tee -a /etc/apt/sources.list
-  - sudo apt-get update
-  - >
-    sudo apt-get -o Dpkg::Options::="--force-confdef" \
-     -o Dpkg::Options::="--force-confold" --assume-yes install docker-engine --allow-unauthenticated
   - docker version
-
-  # Update docker-compose via pip
   - sudo pip install docker-compose
   - docker-compose version
-  - docker-compose up --build -d
-  - docker ps -a
+  - sed -i -e "s/php:cli/php:${TRAVIS_PHP_VERSION}-cli/g" Dockerfile
+  - cat Dockerfile
+  - docker-compose build
 
 script:
   - docker-compose up --exit-code-from php

docker/Dockerfile renamed to Dockerfile

@@ -1,4 +1,4 @@
-FROM php:7.1-cli
+FROM php:cli
 
 RUN pecl install xdebug
 
@@ -11,4 +11,4 @@ RUN curl -sS https://getcomposer.org/installer | php \
     && mv composer.phar /usr/local/bin/ \
     && ln -s /usr/local/bin/composer.phar /usr/local/bin/composer
 
-ENV PATH="~/.composer/vendor/bin:./vendor/bin:${PATH}"
+ENV PATH="~/.composer/vendor/bin:./vendor/bin:${PATH}"

docker-compose.yml

@@ -6,11 +6,11 @@ services:
         container_name: php
         build:
             context: .
-            dockerfile: docker/Dockerfile
+            dockerfile: Dockerfile
         volumes:
             - .:/code
         working_dir: /code
-        command: docker/entrypoint.sh
+        command: bash -c "composer install --prefer-source --no-interaction && php ./vendor/bin/phpunit"
         depends_on:
           - mysql
           - mongodb

docker/entrypoint.sh

@@ -876,7 +876,7 @@ public function where($column, $operator = null, $value = null, $boolean = 'and'
         }
 
         // Convert $casts
-        if ($this->isCastableToObjectId($column)) {
+        if (!($column instanceof \Closure) && $this->isCastableToObjectId($column)) {
             if (is_array($params[2])) {
                 foreach ($params[2] as &$value) {
                     if (is_string($value)) {