Fix: #2063, update vendor dependencies

4 files changed, 31 insertions, 3 deletions

diff --git a/vendor/illuminate/container/Container.php b/vendor/illuminate/container/Container.php
index 850a2a2ba3..0f1becdfdc 100755
--- a/vendor/illuminate/container/Container.php
+++ b/vendor/illuminate/container/Container.php
@@ -196,7 +196,7 @@ class Container implements ArrayAccess, ContainerContract
     public function isShared($abstract)
     {
         return isset($this->instances[$abstract]) ||
-              (isset($this->bindings[$abstract]['shared']) &&
+               (isset($this->bindings[$abstract]['shared']) &&
                $this->bindings[$abstract]['shared'] === true);
     }
 
@@ -779,7 +779,7 @@ class Container implements ArrayAccess, ContainerContract
         $reflector = new ReflectionClass($concrete);
 
         // If the type is not instantiable, the developer is attempting to resolve
-        // an abstract type such as an Interface of Abstract Class and there is
+        // an abstract type such as an Interface or Abstract Class and there is
         // no binding registered for the abstractions so we need to bail out.
         if (! $reflector->isInstantiable()) {
             return $this->notInstantiable($concrete);
diff --git a/vendor/illuminate/database/Connection.php b/vendor/illuminate/database/Connection.php
index 1f51186020..004545c588 100755
--- a/vendor/illuminate/database/Connection.php
+++ b/vendor/illuminate/database/Connection.php
@@ -751,6 +751,8 @@ class Connection implements ConnectionInterface
     public function reconnect()
     {
         if (is_callable($this->reconnector)) {
+            $this->doctrineConnection = null;
+
             return call_user_func($this->reconnector, $this);
         }
 
diff --git a/vendor/illuminate/support/Collection.php b/vendor/illuminate/support/Collection.php
index f51ae51248..e9e073b418 100644
--- a/vendor/illuminate/support/Collection.php
+++ b/vendor/illuminate/support/Collection.php
@@ -679,6 +679,18 @@ class Collection implements ArrayAccess, Arrayable, Countable, IteratorAggregate
     }
 
     /**
+     * Filter items where the given key between values.
+     *
+     * @param  string  $key
+     * @param  array  $values
+     * @return static
+     */
+    public function whereBetween($key, $values)
+    {
+        return $this->where($key, '>=', reset($values))->where($key, '<=', end($values));
+    }
+
+    /**
      * Filter items by the given key value pair.
      *
      * @param  string  $key
@@ -800,7 +812,7 @@ class Collection implements ArrayAccess, Arrayable, Countable, IteratorAggregate
     /**
      * Group an associative array by a field or using a callback.
      *
-     * @param  callable|string  $groupBy
+     * @param  array|callable|string  $groupBy
      * @param  bool  $preserveKeys
      * @return static
      */
diff --git a/vendor/illuminate/support/Facades/Facade.php b/vendor/illuminate/support/Facades/Facade.php
index 579bd7a0f0..eda6401c01 100755
--- a/vendor/illuminate/support/Facades/Facade.php
+++ b/vendor/illuminate/support/Facades/Facade.php
@@ -2,6 +2,7 @@
 
 namespace Illuminate\Support\Facades;
 
+use Closure;
 use Mockery;
 use RuntimeException;
 use Mockery\MockInterface;
@@ -23,6 +24,19 @@ abstract class Facade
     protected static $resolvedInstance;
 
     /**
+     * Run a Closure when the facade has been resolved.
+     *
+     * @param  \Closure  $callback
+     * @return void
+     */
+    public static function resolved(Closure $callback)
+    {
+        static::$app->afterResolving(static::getFacadeAccessor(), function ($service) use ($callback) {
+            $callback($service);
+        });
+    }
+
+    /**
      * Convert the facade into a Mockery spy.
      *
      * @return \Mockery\MockInterface