Merge branch '5.2'

Author: phaza

composer.json

@@ -9,10 +9,10 @@
     ],
     "require": {
         "php": ">=5.5",
-        "illuminate/database": "~5.1",
-        "bosnadev/database": "~0.1",
-        "geo-io/wkb-parser": "~1.0",
-        "jmikola/geojson": "~1.0"
+        "illuminate/database": "^5.2",
+        "geo-io/wkb-parser": "^1.0",
+        "jmikola/geojson": "^1.0",
+        "phoenixgao/laravel-postgres-extended-schema": "^0.14.0"
     },
     "require-dev": {
         "phpunit/phpunit": "~4.5",

src/Connectors/ConnectionFactory.php

@@ -6,14 +6,14 @@
 class ConnectionFactory extends \Bosnadev\Database\Connectors\ConnectionFactory
 {
     /**
-     * @param string $driver
-     * @param PDO $connection
-     * @param string $database
-     * @param string $prefix
-     * @param array $config
-     * @return mixed|PostgisConnection
+     * @param string       $driver
+     * @param \Closure|PDO $connection
+     * @param string       $database
+     * @param string       $prefix
+     * @param array        $config
+     * @return \Illuminate\Database\Connection|PostgisConnection
      */
-    protected function createConnection($driver, PDO $connection, $database, $prefix = '', array $config = [])
+    protected function createConnection($driver, $connection, $database, $prefix = '', array $config = [])
     {
         if ($this->container->bound($key = "db.connection.{$driver}")) {
             return $this->container->make($key, [$connection, $database, $prefix, $config]);