From 2a7ea3bea6b6e597743de00c70f85cb31f9ae783 Mon Sep 17 00:00:00 2001
From: Remi Collin <rcollin2@gmail.com>
Date: Tue, 6 Feb 2018 11:39:29 +0100
Subject: [PATCH 01/40] Upgrade dependencies to illuminate:5.6

---
 composer.json | 12 +++++++-----
 1 file changed, 7 insertions(+), 5 deletions(-)

diff --git a/composer.json b/composer.json
index 8655bd45c..d0114e2fd 100644
--- a/composer.json
+++ b/composer.json
@@ -11,10 +11,10 @@
     ],
     "license" : "MIT",
     "require": {
-        "illuminate/support": "^5.5",
-        "illuminate/container": "^5.5",
-        "illuminate/database": "^5.5",
-        "illuminate/events": "^5.5",
+        "illuminate/support": "^5.6",
+        "illuminate/container": "^5.6",
+        "illuminate/database": "^5.6",
+        "illuminate/events": "^5.6",
         "mongodb/mongodb": "^1.0.0"
     },
     "require-dev": {
@@ -47,5 +47,7 @@
                 "Jenssegers\\Mongodb\\MongodbQueueServiceProvider"
             ]
         }
-    }
+    },
+    "minimum-stability" : "dev",
+    "prefer-stable": true
 }

From 9096abe1a0bbb65036ccd28e7327fda98ccf69fa Mon Sep 17 00:00:00 2001
From: Remi Collin <rcollin2@gmail.com>
Date: Tue, 6 Feb 2018 11:41:09 +0100
Subject: [PATCH 02/40] Change Model::getDateFormat() to public

---
 src/Jenssegers/Mongodb/Eloquent/Model.php | 2 +-
 tests/models/User.php                     | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/Jenssegers/Mongodb/Eloquent/Model.php b/src/Jenssegers/Mongodb/Eloquent/Model.php
index 38b3858f8..86f8ef3b5 100644
--- a/src/Jenssegers/Mongodb/Eloquent/Model.php
+++ b/src/Jenssegers/Mongodb/Eloquent/Model.php
@@ -101,7 +101,7 @@ protected function asDateTime($value)
     /**
      * @inheritdoc
      */
-    protected function getDateFormat()
+    public function getDateFormat()
     {
         return $this->dateFormat ?: 'Y-m-d H:i:s';
     }
diff --git a/tests/models/User.php b/tests/models/User.php
index ded0a3966..d233c3f32 100644
--- a/tests/models/User.php
+++ b/tests/models/User.php
@@ -65,7 +65,7 @@ public function father()
         return $this->embedsOne('User');
     }
 
-    protected function getDateFormat()
+    public function getDateFormat()
     {
         return 'l jS \of F Y h:i:s A';
     }

From 9b125dc00fc116749e3e99d37f6b259e518afebe Mon Sep 17 00:00:00 2001
From: Remi Collin <rcollin2@gmail.com>
Date: Tue, 6 Feb 2018 11:43:29 +0100
Subject: [PATCH 03/40] Add new optionnal argument in
 HybridRelations::morphTo()

---
 src/Jenssegers/Mongodb/Eloquent/HybridRelations.php | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/Jenssegers/Mongodb/Eloquent/HybridRelations.php b/src/Jenssegers/Mongodb/Eloquent/HybridRelations.php
index 7f9b511ae..34b8b5788 100644
--- a/src/Jenssegers/Mongodb/Eloquent/HybridRelations.php
+++ b/src/Jenssegers/Mongodb/Eloquent/HybridRelations.php
@@ -169,9 +169,10 @@ public function belongsTo($related, $foreignKey = null, $otherKey = null, $relat
      * @param  string $name
      * @param  string $type
      * @param  string $id
+     * @param  string $ownerKey
      * @return \Illuminate\Database\Eloquent\Relations\MorphTo
      */
-    public function morphTo($name = null, $type = null, $id = null)
+    public function morphTo($name = null, $type = null, $id = null, $ownerKey = null)
     {
         // If no name is provided, we will use the backtrace to get the function name
         // since that is most likely the name of the polymorphic interface. We can

From 004af283a5d36c605a6402bf8dad1ac9de4c0aa0 Mon Sep 17 00:00:00 2001
From: Remi Collin <rcollin2@gmail.com>
Date: Tue, 6 Feb 2018 11:48:58 +0100
Subject: [PATCH 04/40] remove php7.0 from travis

---
 .travis.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.travis.yml b/.travis.yml
index 27000a962..45eedf0a9 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,8 +1,8 @@
 language: php
 
 php:
-  - 7
   - 7.1
+  - 7.2
 
 matrix:
   fast_finish: true

From 3ffd30419c3cad638e4e75fb30052bc98b24d939 Mon Sep 17 00:00:00 2001
From: Remi Collin <rcollin2@gmail.com>
Date: Thu, 8 Feb 2018 08:12:01 +0100
Subject: [PATCH 05/40] update minimum stability

---
 composer.json | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/composer.json b/composer.json
index d0114e2fd..138981aaf 100644
--- a/composer.json
+++ b/composer.json
@@ -47,7 +47,5 @@
                 "Jenssegers\\Mongodb\\MongodbQueueServiceProvider"
             ]
         }
-    },
-    "minimum-stability" : "dev",
-    "prefer-stable": true
+    }
 }

From 2de872832f6736783abe1abf6f9fd0933fd11bec Mon Sep 17 00:00:00 2001
From: Remi Collin <rcollin2@gmail.com>
Date: Thu, 8 Feb 2018 12:14:16 +0100
Subject: [PATCH 06/40] Accept both phpunit 6.0/7.0 to allow composer to
 require latest Orchestra/TestBench version

---
 composer.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/composer.json b/composer.json
index 138981aaf..ce32f6407 100644
--- a/composer.json
+++ b/composer.json
@@ -18,7 +18,7 @@
         "mongodb/mongodb": "^1.0.0"
     },
     "require-dev": {
-        "phpunit/phpunit": "^6.0",
+        "phpunit/phpunit": "^6.0|^7.0",
         "orchestra/testbench": "^3.1",
         "mockery/mockery": "^1.0",
         "satooshi/php-coveralls": "^2.0",

From 00379cd9a98f8d590c718cc9f5bfcf2194455230 Mon Sep 17 00:00:00 2001
From: Remi Collin <rcollin2@gmail.com>
Date: Fri, 9 Feb 2018 11:59:03 +0100
Subject: [PATCH 07/40] Update travis config

---
 .travis.yml | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index 45eedf0a9..662eb0dfb 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -13,15 +13,15 @@ services:
   - mongodb
   - mysql
 
-addons:
-  apt:
-    sources:
-    - mongodb-3.0-precise
-    packages:
-    - mongodb-org-server
+#addons:
+#  apt:
+#    sources:
+#    - mongodb-3.0-precise
+#    packages:
+#    - mongodb-org-server
 
 before_script:
-  - pecl install mongodb
+# - pecl install mongodb
   - mysql -e 'create database unittest;'
   - travis_retry composer self-update
   - travis_retry composer install --no-interaction

From 01223305653c75378ae41e2b874c4199e7517585 Mon Sep 17 00:00:00 2001
From: Remi Collin <rcollin2@gmail.com>
Date: Fri, 9 Feb 2018 12:03:23 +0100
Subject: [PATCH 08/40] Fix mongo driver script

---
 .travis.yml | 30 +++++++++++++++++++++++-------
 1 file changed, 23 insertions(+), 7 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index 662eb0dfb..e0707977d 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,3 +1,5 @@
+dist: trusty
+
 language: php
 
 php:
@@ -13,15 +15,29 @@ services:
   - mongodb
   - mysql
 
-#addons:
-#  apt:
-#    sources:
-#    - mongodb-3.0-precise
-#    packages:
-#    - mongodb-org-server
+matrix:
+  fast_finish: true
+  include:
+    - php: 7.1
+      addons:
+        apt:
+          sources:
+            - sourceline: "deb [arch=amd64] https://repo.mongodb.org/apt/ubuntu trusty/mongodb-org/3.4 multiverse"
+              key_url: "https://www.mongodb.org/static/pgp/server-3.4.asc"
+            - "mongodb-upstart"
+          packages: ['mongodb-org-server']
+    - php: 7.2
+      addons:
+        apt:
+          sources:
+            - sourceline: "deb [arch=amd64] https://repo.mongodb.org/apt/ubuntu trusty/mongodb-org/3.4 multiverse"
+              key_url: "https://www.mongodb.org/static/pgp/server-3.4.asc"
+            - "mongodb-upstart"
+          packages: ['mongodb-org-server']
 
 before_script:
-# - pecl install mongodb
+  - if [[ ${TRAVIS_PHP_VERSION:0:2} == "7." ]]; then pecl install -f mongodb-${DRIVER_VERSION}; fi
+  - if [[ ${TRAVIS_PHP_VERSION:0:2} == "7." ]]; then composer config "platform.ext-mongo" "1.6.16" && composer require "alcaeus/mongo-php-adapter=${ADAPTER_VERSION}"; fi
   - mysql -e 'create database unittest;'
   - travis_retry composer self-update
   - travis_retry composer install --no-interaction

From 21f36419947fb2a3c42cde86389486bbd39e4915 Mon Sep 17 00:00:00 2001
From: Remi Collin <rcollin2@gmail.com>
Date: Fri, 9 Feb 2018 13:10:17 +0100
Subject: [PATCH 09/40] Add missing environment variable

---
 .travis.yml | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index e0707977d..4f473f5d8 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -6,8 +6,9 @@ php:
   - 7.1
   - 7.2
 
-matrix:
-  fast_finish: true
+env:
+  global:
+    - DRIVER_VERSION="stable"
 
 sudo: false
 

From fd2659546a3e4fedcb315d6de51598f30de7f23d Mon Sep 17 00:00:00 2001
From: Remi Collin <rcollin2@gmail.com>
Date: Fri, 9 Feb 2018 13:13:35 +0100
Subject: [PATCH 10/40] Add missing environment variable

---
 .travis.yml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.travis.yml b/.travis.yml
index 4f473f5d8..17dc4b824 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -9,6 +9,7 @@ php:
 env:
   global:
     - DRIVER_VERSION="stable"
+    - ADAPTER_VERSION="^1.0.0"
 
 sudo: false
 

From fe49676bb71384cd7104907f65f06e6a0e434a4b Mon Sep 17 00:00:00 2001
From: Remi Collin <rcollin2@gmail.com>
Date: Fri, 9 Feb 2018 13:26:20 +0100
Subject: [PATCH 11/40] Explicitely setup port

---
 tests/config/database.php | 1 +
 1 file changed, 1 insertion(+)

diff --git a/tests/config/database.php b/tests/config/database.php
index 1986807a3..10c3c01b4 100644
--- a/tests/config/database.php
+++ b/tests/config/database.php
@@ -9,6 +9,7 @@
             'driver'     => 'mongodb',
             'host'       => 'mongodb',
             'database'   => 'unittest',
+            'port'       => 27017,
         ],
 
         'mysql' => [

From 83f95edb95cea17d46b5cbc11dee3a060841dd5d Mon Sep 17 00:00:00 2001
From: Remi Collin <rcollin2@gmail.com>
Date: Fri, 9 Feb 2018 16:22:37 +0100
Subject: [PATCH 12/40] Add explicit mongo start

---
 .travis.yml | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/.travis.yml b/.travis.yml
index 17dc4b824..adecf90d3 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -11,7 +11,7 @@ env:
     - DRIVER_VERSION="stable"
     - ADAPTER_VERSION="^1.0.0"
 
-sudo: false
+sudo: true
 
 services:
   - mongodb
@@ -41,6 +41,7 @@ before_script:
   - if [[ ${TRAVIS_PHP_VERSION:0:2} == "7." ]]; then pecl install -f mongodb-${DRIVER_VERSION}; fi
   - if [[ ${TRAVIS_PHP_VERSION:0:2} == "7." ]]; then composer config "platform.ext-mongo" "1.6.16" && composer require "alcaeus/mongo-php-adapter=${ADAPTER_VERSION}"; fi
   - mysql -e 'create database unittest;'
+  - sudo service mongod start
   - travis_retry composer self-update
   - travis_retry composer install --no-interaction
 

From d51f582d8b5c5795a246cea9269c94ad1f06000b Mon Sep 17 00:00:00 2001
From: Remi Collin <rcollin2@gmail.com>
Date: Fri, 9 Feb 2018 16:29:37 +0100
Subject: [PATCH 13/40] Travis : use default distribution

---
 .travis.yml | 2 --
 1 file changed, 2 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index adecf90d3..4caf33303 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,5 +1,3 @@
-dist: trusty
-
 language: php
 
 php:

From 4721124ae175c5e1d01ae4dfb3825fbbc53f8278 Mon Sep 17 00:00:00 2001
From: Remi Collin <rcollin2@gmail.com>
Date: Fri, 9 Feb 2018 16:30:13 +0100
Subject: [PATCH 14/40] Remove sudo

---
 .travis.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.travis.yml b/.travis.yml
index 4caf33303..ebdf6bd33 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -39,7 +39,7 @@ before_script:
   - if [[ ${TRAVIS_PHP_VERSION:0:2} == "7." ]]; then pecl install -f mongodb-${DRIVER_VERSION}; fi
   - if [[ ${TRAVIS_PHP_VERSION:0:2} == "7." ]]; then composer config "platform.ext-mongo" "1.6.16" && composer require "alcaeus/mongo-php-adapter=${ADAPTER_VERSION}"; fi
   - mysql -e 'create database unittest;'
-  - sudo service mongod start
+  - service mongod start
   - travis_retry composer self-update
   - travis_retry composer install --no-interaction
 

From ea06454886f4a6c18657f163ada066beddea4b93 Mon Sep 17 00:00:00 2001
From: Remi Collin <rcollin2@gmail.com>
Date: Mon, 12 Feb 2018 13:40:06 +0100
Subject: [PATCH 15/40] Remove port from config

---
 tests/config/database.php | 1 -
 1 file changed, 1 deletion(-)

diff --git a/tests/config/database.php b/tests/config/database.php
index 10c3c01b4..1986807a3 100644
--- a/tests/config/database.php
+++ b/tests/config/database.php
@@ -9,7 +9,6 @@
             'driver'     => 'mongodb',
             'host'       => 'mongodb',
             'database'   => 'unittest',
-            'port'       => 27017,
         ],
 
         'mysql' => [

From 8289095995f48a2ebef2329e315f383fc8590a14 Mon Sep 17 00:00:00 2001
From: Thilanga Pitigala <thilanga.pitigala@digital360.com.au>
Date: Fri, 16 Feb 2018 15:18:28 +1100
Subject: [PATCH 16/40] Added dropifExists method

---
 src/Jenssegers/Mongodb/Schema/Builder.php | 13 +++++++++++++
 1 file changed, 13 insertions(+)

diff --git a/src/Jenssegers/Mongodb/Schema/Builder.php b/src/Jenssegers/Mongodb/Schema/Builder.php
index e30e162b7..eaa6ddf04 100644
--- a/src/Jenssegers/Mongodb/Schema/Builder.php
+++ b/src/Jenssegers/Mongodb/Schema/Builder.php
@@ -96,6 +96,19 @@ public function create($collection, Closure $callback = null)
         }
     }
 
+    /**
+     * @inheritdoc
+     */
+    public function dropIfExists($collection)
+    {
+        if($this->hasCollection($collection)) {
+
+            return $this->drop($collection);
+        }
+
+        return false;
+    }
+
     /**
      * @inheritdoc
      */

From 7347a87bd807ce9d42f38013395d862ba7266013 Mon Sep 17 00:00:00 2001
From: Thilanga Pitigala <thilanga.pitigala@digital360.com.au>
Date: Fri, 16 Feb 2018 15:21:35 +1100
Subject: [PATCH 17/40] Increment attempts

---
 src/Jenssegers/Mongodb/Queue/MongoQueue.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/Jenssegers/Mongodb/Queue/MongoQueue.php b/src/Jenssegers/Mongodb/Queue/MongoQueue.php
index ed7e9c2ed..e9cd8da9c 100644
--- a/src/Jenssegers/Mongodb/Queue/MongoQueue.php
+++ b/src/Jenssegers/Mongodb/Queue/MongoQueue.php
@@ -117,7 +117,7 @@ protected function releaseJobsThatHaveBeenReservedTooLong($queue)
             })->get();
 
         foreach ($reserved as $job) {
-            $attempts = $job['attempts'];
+            $attempts = $job['attempts'] + 1;
             $this->releaseJob($job['_id'], $attempts);
         }
     }

From 27ad5f3555966f224e026d776dd57338a8107f7d Mon Sep 17 00:00:00 2001
From: Thilanga Pitigala <thilanga.pitigala@digital360.com.au>
Date: Fri, 16 Feb 2018 22:27:56 +1100
Subject: [PATCH 18/40] Added docker support to travis

---
 .travis.yml          | 56 +++++++++++++++++++++-----------------------
 docker-compose.yml   |  3 +++
 docker/Dockerfile    |  4 ++++
 docker/entrypoint.sh |  1 -
 4 files changed, 34 insertions(+), 30 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index 27000a962..43f8a8124 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,34 +1,32 @@
+sudo: required
+dist: trusty
 language: php
-
 php:
-  - 7
-  - 7.1
-
-matrix:
-  fast_finish: true
-
-sudo: false
-
+  - "7.1"
+  - "7.0"
 services:
-  - mongodb
-  - mysql
-
-addons:
-  apt:
-    sources:
-    - mongodb-3.0-precise
-    packages:
-    - mongodb-org-server
-
-before_script:
-  - pecl install mongodb
-  - mysql -e 'create database unittest;'
-  - travis_retry composer self-update
-  - travis_retry composer install --no-interaction
-
-script:
+  - 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
   - mkdir -p build/logs
-  - vendor/bin/phpunit --coverage-clover build/logs/clover.xml
+  # Update docker-compose via pip
+  - sudo pip install docker-compose
+  - docker-compose version
+  - docker-compose up --build -d
+  - docker ps -a
+  - docker exec -it php_test composer install --prefer-source --no-interaction
 
-after_success:
-  - sh -c 'php vendor/bin/coveralls -v'
+script:
+  - docker exec -it php_test php ./vendor/bin/phpunit --coverage-clover build/logs/clover.xml
diff --git a/docker-compose.yml b/docker-compose.yml
index 6c2c773bb..0319e40e7 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -3,6 +3,7 @@ version: '3'
 services:
 
     php:
+        container_name: php_test
         build:
             context: .
             dockerfile: docker/Dockerfile
@@ -15,6 +16,7 @@ services:
           - mongodb
 
     mysql:
+        container_name: mysql_test
         image: mysql
         environment:
             MYSQL_ROOT_PASSWORD:
@@ -24,6 +26,7 @@ services:
             driver: none
 
     mongodb:
+        container_name: mongodb_test
         image: mongo
         logging:
             driver: none
diff --git a/docker/Dockerfile b/docker/Dockerfile
index 0ba057324..6b3330207 100644
--- a/docker/Dockerfile
+++ b/docker/Dockerfile
@@ -4,3 +4,7 @@ RUN apt-get update && \
     apt-get install -y autoconf pkg-config libssl-dev && \
     pecl install mongodb && docker-php-ext-enable mongodb && \
     docker-php-ext-install -j$(nproc) pdo pdo_mysql
+
+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
diff --git a/docker/entrypoint.sh b/docker/entrypoint.sh
index ecff3cf08..7489c2ff6 100755
--- a/docker/entrypoint.sh
+++ b/docker/entrypoint.sh
@@ -1,3 +1,2 @@
 #!/usr/bin/env bash
-
 sleep 3 && php ./vendor/bin/phpunit

From 51676e9d9462ed37d6e67dd5a8126e66ca3c8d35 Mon Sep 17 00:00:00 2001
From: Thilanga Pitigala <thilanga.pitigala@digital360.com.au>
Date: Fri, 16 Feb 2018 22:31:16 +1100
Subject: [PATCH 19/40] Call docker-compose up to run phpunit test

---
 .travis.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.travis.yml b/.travis.yml
index 43f8a8124..9117e3326 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -29,4 +29,4 @@ install:
   - docker exec -it php_test composer install --prefer-source --no-interaction
 
 script:
-  - docker exec -it php_test php ./vendor/bin/phpunit --coverage-clover build/logs/clover.xml
+  - docker-compose up

From 5ed0f0f75c5be6d566fd61035851e1f478c1257f Mon Sep 17 00:00:00 2001
From: Thilanga Pitigala <thilanga.pitigala@digital360.com.au>
Date: Fri, 16 Feb 2018 22:33:48 +1100
Subject: [PATCH 20/40] Updated to add composer to the path

---
 docker/Dockerfile | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/docker/Dockerfile b/docker/Dockerfile
index 6b3330207..4afaf0dc0 100644
--- a/docker/Dockerfile
+++ b/docker/Dockerfile
@@ -8,3 +8,5 @@ RUN apt-get update && \
 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}"
\ No newline at end of file

From 82da20f03797335a8585ae0d1c00b49713bf3903 Mon Sep 17 00:00:00 2001
From: Thilanga Pitigala <thilanga.pitigala@digital360.com.au>
Date: Fri, 16 Feb 2018 22:39:19 +1100
Subject: [PATCH 21/40] Updated to move composer install to entry point

---
 .travis.yml          | 1 -
 docker/entrypoint.sh | 3 ++-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index 9117e3326..123e8f933 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -26,7 +26,6 @@ install:
   - docker-compose version
   - docker-compose up --build -d
   - docker ps -a
-  - docker exec -it php_test composer install --prefer-source --no-interaction
 
 script:
   - docker-compose up
diff --git a/docker/entrypoint.sh b/docker/entrypoint.sh
index 7489c2ff6..994015103 100755
--- a/docker/entrypoint.sh
+++ b/docker/entrypoint.sh
@@ -1,2 +1,3 @@
 #!/usr/bin/env bash
-sleep 3 && php ./vendor/bin/phpunit
+
+sleep 3 && composer install --prefer-source --no-interaction && php ./vendor/bin/phpunit
\ No newline at end of file

From b6b84d132866383f73655c31882f0e809294904a Mon Sep 17 00:00:00 2001
From: Thilanga Pitigala <thilanga.pitigala@digital360.com.au>
Date: Fri, 16 Feb 2018 22:41:58 +1100
Subject: [PATCH 22/40] Removed php70

---
 .travis.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.travis.yml b/.travis.yml
index 123e8f933..6feab6964 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -3,7 +3,7 @@ dist: trusty
 language: php
 php:
   - "7.1"
-  - "7.0"
+
 services:
   - docker
 

From 272b6df5dd011331a2a5486b5797413f131c18d4 Mon Sep 17 00:00:00 2001
From: Thilanga Pitigala <thilanga.pitigala@digital360.com.au>
Date: Fri, 16 Feb 2018 22:46:09 +1100
Subject: [PATCH 23/40] Updated to add zip and unzip packages

---
 docker/Dockerfile | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/docker/Dockerfile b/docker/Dockerfile
index 4afaf0dc0..d8aab9747 100644
--- a/docker/Dockerfile
+++ b/docker/Dockerfile
@@ -1,9 +1,9 @@
 FROM php:7.1-cli
 
 RUN apt-get update && \
-    apt-get install -y autoconf pkg-config libssl-dev && \
-    pecl install mongodb && docker-php-ext-enable mongodb && \
-    docker-php-ext-install -j$(nproc) pdo pdo_mysql
+    apt-get install -y autoconf pkg-config libssl-dev git && \
+    pecl install mongodb git zlib1g-dev && docker-php-ext-enable mongodb && \
+    docker-php-ext-install -j$(nproc) pdo pdo_mysql zip
 
 RUN curl -sS https://getcomposer.org/installer | php \
     && mv composer.phar /usr/local/bin/ \

From ac6dc3eabf1f747e1d7779ef3f69e0d3afb35ca2 Mon Sep 17 00:00:00 2001
From: Thilanga Pitigala <thilanga.pitigala@digital360.com.au>
Date: Fri, 16 Feb 2018 22:47:54 +1100
Subject: [PATCH 24/40] Updated with container exit

---
 .travis.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.travis.yml b/.travis.yml
index 6feab6964..f85a432ee 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -28,4 +28,4 @@ install:
   - docker ps -a
 
 script:
-  - docker-compose up
+  - docker-compose up --exit-code-from php_test

From 4689d2a9101f048c47d4f6ad2b3efa7b6049fdd3 Mon Sep 17 00:00:00 2001
From: Thilanga Pitigala <thilanga.pitigala@digital360.com.au>
Date: Fri, 16 Feb 2018 22:53:41 +1100
Subject: [PATCH 25/40] Updated container names and composer up

---
 .travis.yml        | 2 +-
 docker-compose.yml | 6 +++---
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index f85a432ee..f29d12204 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -28,4 +28,4 @@ install:
   - docker ps -a
 
 script:
-  - docker-compose up --exit-code-from php_test
+  - docker-compose up --exit-code-from php
diff --git a/docker-compose.yml b/docker-compose.yml
index 0319e40e7..ce5c95652 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -3,7 +3,7 @@ version: '3'
 services:
 
     php:
-        container_name: php_test
+        container_name: php
         build:
             context: .
             dockerfile: docker/Dockerfile
@@ -16,7 +16,7 @@ services:
           - mongodb
 
     mysql:
-        container_name: mysql_test
+        container_name: mysql
         image: mysql
         environment:
             MYSQL_ROOT_PASSWORD:
@@ -26,7 +26,7 @@ services:
             driver: none
 
     mongodb:
-        container_name: mongodb_test
+        container_name: mongodb
         image: mongo
         logging:
             driver: none

From ecc974e7e25fa8e5a0fa592fda1f50b5f663c85b Mon Sep 17 00:00:00 2001
From: Thilanga Pitigala <thilanga.pitigala@digital360.com.au>
Date: Fri, 16 Feb 2018 23:03:28 +1100
Subject: [PATCH 26/40] Updated to handle container down

---
 .travis.yml | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/.travis.yml b/.travis.yml
index f29d12204..aa920f172 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -29,3 +29,6 @@ install:
 
 script:
   - docker-compose up --exit-code-from php
+
+after_script:
+  - docker-compose down

From aa2a6e002b587e170912afc7645f3338466de235 Mon Sep 17 00:00:00 2001
From: Thilanga Pitigala <thilanga.pitigala@digital360.com.au>
Date: Fri, 16 Feb 2018 23:03:51 +1100
Subject: [PATCH 27/40] Updated to shorten the command

---
 docker/entrypoint.sh | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/docker/entrypoint.sh b/docker/entrypoint.sh
index 994015103..db9ac0ed0 100755
--- a/docker/entrypoint.sh
+++ b/docker/entrypoint.sh
@@ -1,3 +1,7 @@
 #!/usr/bin/env bash
 
-sleep 3 && composer install --prefer-source --no-interaction && php ./vendor/bin/phpunit
\ No newline at end of file
+sleep 3 &&
+composer install --prefer-source --no-interaction &&
+php ./vendor/bin/phpunit &&
+php ./vendor/bin/phpunit --coverage-clover build/logs/clover.xml &&
+php ./vendor/bin/coveralls -v
\ No newline at end of file

From 4566abe02f22a12813f239374f5da1b154b9f5a4 Mon Sep 17 00:00:00 2001
From: Thilanga Pitigala <thilanga.pitigala@digital360.com.au>
Date: Fri, 16 Feb 2018 23:05:14 +1100
Subject: [PATCH 28/40] Updated to test failer

---
 tests/QueueTest.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tests/QueueTest.php b/tests/QueueTest.php
index 35be33f9a..440d63039 100644
--- a/tests/QueueTest.php
+++ b/tests/QueueTest.php
@@ -47,7 +47,7 @@ public function testQueueJobExpired()
 
         // Expect an attempted older job in the queue
         $job = Queue::pop('test');
-        $this->assertEquals(1, $job->attempts());
+        $this->assertEquals(1, 0);// trying to get a fail test
         $this->assertGreaterThan($expiry, $job->reservedAt());
 
         $job->delete();

From 00538412b6ed431de7a817d3bbf5d23022b6e2d2 Mon Sep 17 00:00:00 2001
From: Thilanga Pitigala <thilanga.pitigala@digital360.com.au>
Date: Fri, 16 Feb 2018 23:08:18 +1100
Subject: [PATCH 29/40] Updated to add php 7.2 support

---
 .travis.yml         | 2 ++
 tests/QueueTest.php | 2 +-
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/.travis.yml b/.travis.yml
index aa920f172..a7a3bc50c 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -2,7 +2,9 @@ sudo: required
 dist: trusty
 language: php
 php:
+  - "7.2"
   - "7.1"
+  - "7.0"
 
 services:
   - docker
diff --git a/tests/QueueTest.php b/tests/QueueTest.php
index 440d63039..35be33f9a 100644
--- a/tests/QueueTest.php
+++ b/tests/QueueTest.php
@@ -47,7 +47,7 @@ public function testQueueJobExpired()
 
         // Expect an attempted older job in the queue
         $job = Queue::pop('test');
-        $this->assertEquals(1, 0);// trying to get a fail test
+        $this->assertEquals(1, $job->attempts());
         $this->assertGreaterThan($expiry, $job->reservedAt());
 
         $job->delete();

From 2ae102fe2ae1ba8806d23661fa597fabc9e05314 Mon Sep 17 00:00:00 2001
From: Thilanga Pitigala <thilanga.pitigala@digital360.com.au>
Date: Fri, 16 Feb 2018 23:11:28 +1100
Subject: [PATCH 30/40] Updated to remove docker-compose down

---
 .travis.yml | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index a7a3bc50c..8fc370c77 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -31,6 +31,3 @@ install:
 
 script:
   - docker-compose up --exit-code-from php
-
-after_script:
-  - docker-compose down

From 82714375e204bbb88de8a50203bea9f1f56f0525 Mon Sep 17 00:00:00 2001
From: Thilanga Pitigala <thilanga.pitigala@digital360.com.au>
Date: Fri, 16 Feb 2018 23:13:12 +1100
Subject: [PATCH 31/40] Updated to test failure

---
 tests/QueueTest.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tests/QueueTest.php b/tests/QueueTest.php
index 35be33f9a..440d63039 100644
--- a/tests/QueueTest.php
+++ b/tests/QueueTest.php
@@ -47,7 +47,7 @@ public function testQueueJobExpired()
 
         // Expect an attempted older job in the queue
         $job = Queue::pop('test');
-        $this->assertEquals(1, $job->attempts());
+        $this->assertEquals(1, 0);// trying to get a fail test
         $this->assertGreaterThan($expiry, $job->reservedAt());
 
         $job->delete();

From 6b6e3c70209c8d02a445aac8a6559ead14c22744 Mon Sep 17 00:00:00 2001
From: Thilanga Pitigala <thilanga.pitigala@digital360.com.au>
Date: Fri, 16 Feb 2018 23:14:17 +1100
Subject: [PATCH 32/40] Updated to remove failure assert

---
 tests/QueueTest.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tests/QueueTest.php b/tests/QueueTest.php
index 440d63039..35be33f9a 100644
--- a/tests/QueueTest.php
+++ b/tests/QueueTest.php
@@ -47,7 +47,7 @@ public function testQueueJobExpired()
 
         // Expect an attempted older job in the queue
         $job = Queue::pop('test');
-        $this->assertEquals(1, 0);// trying to get a fail test
+        $this->assertEquals(1, $job->attempts());
         $this->assertGreaterThan($expiry, $job->reservedAt());
 
         $job->delete();

From 58b93eb12c32b8a438b305a2333df09b4862f66c Mon Sep 17 00:00:00 2001
From: Thilanga Pitigala <thilanga.pitigala@digital360.com.au>
Date: Fri, 16 Feb 2018 23:22:51 +1100
Subject: [PATCH 33/40] Updated to fix php-coverall path

---
 docker/entrypoint.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/docker/entrypoint.sh b/docker/entrypoint.sh
index db9ac0ed0..bd10c47f6 100755
--- a/docker/entrypoint.sh
+++ b/docker/entrypoint.sh
@@ -4,4 +4,4 @@ sleep 3 &&
 composer install --prefer-source --no-interaction &&
 php ./vendor/bin/phpunit &&
 php ./vendor/bin/phpunit --coverage-clover build/logs/clover.xml &&
-php ./vendor/bin/coveralls -v
\ No newline at end of file
+php ./vendor/bin/php-coverall -v
\ No newline at end of file

From 4868a7040670fbc53593d58310fa85bcd1c4f4ce Mon Sep 17 00:00:00 2001
From: Thilanga Pitigala <thilanga.pitigala@digital360.com.au>
Date: Fri, 16 Feb 2018 23:42:25 +1100
Subject: [PATCH 34/40] Updated to create build folder for code cove

---
 .travis.yml          | 4 +---
 docker/entrypoint.sh | 3 ++-
 2 files changed, 3 insertions(+), 4 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index 8fc370c77..d775afad8 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -2,9 +2,7 @@ sudo: required
 dist: trusty
 language: php
 php:
-  - "7.2"
   - "7.1"
-  - "7.0"
 
 services:
   - docker
@@ -22,7 +20,7 @@ install:
     sudo apt-get -o Dpkg::Options::="--force-confdef" \
      -o Dpkg::Options::="--force-confold" --assume-yes install docker-engine --allow-unauthenticated
   - docker version
-  - mkdir -p build/logs
+
   # Update docker-compose via pip
   - sudo pip install docker-compose
   - docker-compose version
diff --git a/docker/entrypoint.sh b/docker/entrypoint.sh
index bd10c47f6..1c0df5b32 100755
--- a/docker/entrypoint.sh
+++ b/docker/entrypoint.sh
@@ -3,5 +3,6 @@
 sleep 3 &&
 composer install --prefer-source --no-interaction &&
 php ./vendor/bin/phpunit &&
-php ./vendor/bin/phpunit --coverage-clover build/logs/clover.xml &&
+mkdir -p ./build/logs &&
+php ./vendor/bin/phpunit --coverage-clover ./build/logs/clover.xml &&
 php ./vendor/bin/php-coverall -v
\ No newline at end of file

From 545bd04ffc8f2865436007f473754a6de2426f2b Mon Sep 17 00:00:00 2001
From: Thilanga Pitigala <thilanga.pitigala@digital360.com.au>
Date: Fri, 16 Feb 2018 23:57:13 +1100
Subject: [PATCH 35/40] Updated to remove container exit

---
 .travis.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.travis.yml b/.travis.yml
index d775afad8..e9e22ffec 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -28,4 +28,4 @@ install:
   - docker ps -a
 
 script:
-  - docker-compose up --exit-code-from php
+  - docker-compose up

From 2b7f00f6088ae89b1bd5c772a76a748c577df4cc Mon Sep 17 00:00:00 2001
From: Thilanga Pitigala <thilanga.pitigala@digital360.com.au>
Date: Sat, 17 Feb 2018 01:16:15 +1100
Subject: [PATCH 36/40] Added xdebug

---
 docker/Dockerfile | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/docker/Dockerfile b/docker/Dockerfile
index d8aab9747..62c68e45d 100644
--- a/docker/Dockerfile
+++ b/docker/Dockerfile
@@ -1,9 +1,11 @@
 FROM php:7.1-cli
 
+RUN pecl install xdebug
+
 RUN apt-get update && \
     apt-get install -y autoconf pkg-config libssl-dev git && \
     pecl install mongodb git zlib1g-dev && docker-php-ext-enable mongodb && \
-    docker-php-ext-install -j$(nproc) pdo pdo_mysql zip
+    docker-php-ext-install -j$(nproc) pdo pdo_mysql zip && docker-php-ext-enable xdebug
 
 RUN curl -sS https://getcomposer.org/installer | php \
     && mv composer.phar /usr/local/bin/ \

From e8a40cc6a1e281e5621fa7f0876fd4c7c657a073 Mon Sep 17 00:00:00 2001
From: Thilanga Pitigala <thilanga.pitigala@digital360.com.au>
Date: Sat, 17 Feb 2018 01:16:54 +1100
Subject: [PATCH 37/40] Without code-cove

---
 docker/entrypoint.sh | 7 +------
 1 file changed, 1 insertion(+), 6 deletions(-)

diff --git a/docker/entrypoint.sh b/docker/entrypoint.sh
index 1c0df5b32..c646f3917 100755
--- a/docker/entrypoint.sh
+++ b/docker/entrypoint.sh
@@ -1,8 +1,3 @@
 #!/usr/bin/env bash
 
-sleep 3 &&
-composer install --prefer-source --no-interaction &&
-php ./vendor/bin/phpunit &&
-mkdir -p ./build/logs &&
-php ./vendor/bin/phpunit --coverage-clover ./build/logs/clover.xml &&
-php ./vendor/bin/php-coverall -v
\ No newline at end of file
+sleep 3 && composer install --prefer-source --no-interaction && php ./vendor/bin/phpunit

From bb4410b8b667048b80b4c491e9da7cc6ee1cf5f6 Mon Sep 17 00:00:00 2001
From: Thilanga Pitigala <thilanga.pitigala@digital360.com.au>
Date: Sat, 17 Feb 2018 01:17:09 +1100
Subject: [PATCH 38/40] Updated with exit

---
 .travis.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.travis.yml b/.travis.yml
index e9e22ffec..d775afad8 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -28,4 +28,4 @@ install:
   - docker ps -a
 
 script:
-  - docker-compose up
+  - docker-compose up --exit-code-from php

From 4ea4e3910a07693606f57432002b577e0ba8a0f4 Mon Sep 17 00:00:00 2001
From: Thilanga Pitigala <thilanga.pitigala@digital360.com.au>
Date: Sat, 17 Feb 2018 01:27:14 +1100
Subject: [PATCH 39/40] Updated to add php 70,71 and 72

---
 .travis.yml | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/.travis.yml b/.travis.yml
index d775afad8..f8c82d916 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -2,7 +2,9 @@ sudo: required
 dist: trusty
 language: php
 php:
+  - "7.2"
   - "7.1"
+  - "7.0"
 
 services:
   - docker

From 9d5398b1fadde488802cc42947a26d2b7ab60039 Mon Sep 17 00:00:00 2001
From: Thilanga Pitigala <thilanga.pitigala@digital360.com.au>
Date: Sat, 17 Feb 2018 01:39:50 +1100
Subject: [PATCH 40/40] Style CI fix

---
 src/Jenssegers/Mongodb/Schema/Builder.php | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/src/Jenssegers/Mongodb/Schema/Builder.php b/src/Jenssegers/Mongodb/Schema/Builder.php
index eaa6ddf04..799fe8e80 100644
--- a/src/Jenssegers/Mongodb/Schema/Builder.php
+++ b/src/Jenssegers/Mongodb/Schema/Builder.php
@@ -101,8 +101,7 @@ public function create($collection, Closure $callback = null)
      */
     public function dropIfExists($collection)
     {
-        if($this->hasCollection($collection)) {
-
+        if ($this->hasCollection($collection)) {
             return $this->drop($collection);
         }