Merge pull request #5 from Naouak/uri-generic

The uri param should be a generic PSR UriInterface
byjg · Mar 5, 2018 · 092af17 · 092af17
2 parents 424df69 + a32c1a9
commit 092af17
Show file tree

Hide file tree

Showing 6 changed files with 15 additions and 12 deletions.
diff --git a/src/Database/DatabaseInterface.php b/src/Database/DatabaseInterface.php
@@ -2,11 +2,11 @@
 
 namespace ByJG\DbMigration\Database;
 
-use ByJG\Util\Uri;
+use Psr\Http\Message\UriInterface;
 
 interface DatabaseInterface
 {
-    public static function prepareEnvironment(Uri $dbDriver);
+    public static function prepareEnvironment(UriInterface $dbDriver);
 
     public function createDatabase();
 

diff --git a/src/Database/DblibDatabase.php b/src/Database/DblibDatabase.php
@@ -4,11 +4,12 @@
 
 use ByJG\AnyDataset\Factory;
 use ByJG\Util\Uri;
+use Psr\Http\Message\UriInterface;
 
 class DblibDatabase extends AbstractDatabase
 {
 
-    public static function prepareEnvironment(Uri $uri)
+    public static function prepareEnvironment(UriInterface $uri)
     {
         $database = preg_replace('~^/~', '', $uri->getPath());
 

diff --git a/src/Database/MysqlDatabase.php b/src/Database/MysqlDatabase.php
@@ -4,11 +4,12 @@
 
 use ByJG\AnyDataset\Factory;
 use ByJG\Util\Uri;
+use Psr\Http\Message\UriInterface;
 
 class MySqlDatabase extends AbstractDatabase
 {
 
-    public static function prepareEnvironment(Uri $uri)
+    public static function prepareEnvironment(UriInterface $uri)
     {
         $database = preg_replace('~^/~', '', $uri->getPath());
 

diff --git a/src/Database/PgsqlDatabase.php b/src/Database/PgsqlDatabase.php
@@ -4,18 +4,19 @@
 
 use ByJG\AnyDataset\Factory;
 use ByJG\Util\Uri;
+use Psr\Http\Message\UriInterface;
 
 class PgsqlDatabase extends AbstractDatabase
 {
 
-    public static function prepareEnvironment(Uri $uri)
+    public static function prepareEnvironment(UriInterface $uri)
     {
         $database = preg_replace('~^/~', '', $uri->getPath());
         $dbDriver = self::getDbDriverWithoutDatabase($uri);
         self::createDatabaseIfNotExists($dbDriver, $database);
     }
 
-    protected static function getDbDriverWithoutDatabase(Uri $uri)
+    protected static function getDbDriverWithoutDatabase(UriInterface $uri)
     {
         $customUri = new Uri($uri->__toString());
         return Factory::getDbRelationalInstance($customUri->withPath('/')->__toString());

diff --git a/src/Database/SqliteDatabase.php b/src/Database/SqliteDatabase.php
@@ -2,12 +2,12 @@
 
 namespace ByJG\DbMigration\Database;
 
-use ByJG\Util\Uri;
+use Psr\Http\Message\UriInterface;
 
 class SqliteDatabase extends AbstractDatabase
 {
 
-    public static function prepareEnvironment(Uri $uri)
+    public static function prepareEnvironment(UriInterface $uri)
     {
     }
 

diff --git a/src/Migration.php b/src/Migration.php
@@ -7,12 +7,12 @@
 use ByJG\DbMigration\Database\DatabaseInterface;
 use ByJG\DbMigration\Exception\DatabaseIsIncompleteException;
 use ByJG\DbMigration\Exception\InvalidMigrationFile;
-use ByJG\Util\Uri;
+use Psr\Http\Message\UriInterface;
 
 class Migration
 {
     /**
-     * @var Uri
+     * @var UriInterface
      */
     protected $uri;
 
@@ -39,11 +39,11 @@ class Migration
     /**
      * Migration constructor.
      *
-     * @param Uri $uri
+     * @param UriInterface $uri
      * @param string $folder
      * @throws \ByJG\DbMigration\Exception\InvalidMigrationFile
      */
-    public function __construct(Uri $uri, $folder)
+    public function __construct(UriInterface $uri, $folder)
     {
         $this->uri = $uri;
         $this->folder = $folder;