Merge pull request #15 from byjg/4.0

4.0
byjg · Nov 24, 2018 · 8b4b1a2 · 8b4b1a2
2 parents 0b78c0f + 1a6bb80
commit 8b4b1a2
Show file tree

Hide file tree

Showing 7 changed files with 11 additions and 15 deletions.
diff --git a/README.md b/README.md
@@ -30,7 +30,7 @@ Because of that this is an agnostic project (independent of framework and Progra
 ## Installing
 
 ```
-composer require 'byjg/migration=2.0.*'
+composer require 'byjg/migration=4.0.*'
 ```
 
 ## Supported databases:

diff --git a/composer.json b/composer.json
@@ -10,7 +10,7 @@
   "minimum-stability": "dev",
   "prefer-stable": true,
   "require": {
-    "byjg/anydataset": "^3.0",
+    "byjg/anydataset-db": "4.0.*",
     "byjg/uri": "^1.0",
     "symfony/console": "^3.1"
   },

diff --git a/src/Database/AbstractDatabase.php b/src/Database/AbstractDatabase.php
@@ -2,8 +2,8 @@
 
 namespace ByJG\DbMigration\Database;
 
-use ByJG\AnyDataset\DbDriverInterface;
-use ByJG\AnyDataset\Factory;
+use ByJG\AnyDataset\Db\DbDriverInterface;
+use ByJG\AnyDataset\Db\Factory;
 use ByJG\DbMigration\Exception\DatabaseNotVersionedException;
 use ByJG\DbMigration\Exception\OldVersionSchemaException;
 use Psr\Http\Message\UriInterface;
@@ -16,7 +16,7 @@ abstract class AbstractDatabase implements DatabaseInterface
     private $dbDriver;
 
     /**
-     * @var \Psr\Http\Message\UriInterface
+     * @var UriInterface
      */
     private $uri;
     /**

diff --git a/src/Database/DblibDatabase.php b/src/Database/DblibDatabase.php
@@ -2,7 +2,7 @@
 
 namespace ByJG\DbMigration\Database;
 
-use ByJG\AnyDataset\Factory;
+use ByJG\AnyDataset\Db\Factory;
 use ByJG\Util\Uri;
 use Psr\Http\Message\UriInterface;
 

diff --git a/src/Database/MySqlDatabase.php b/src/Database/MySqlDatabase.php
@@ -2,7 +2,7 @@
 
 namespace ByJG\DbMigration\Database;
 
-use ByJG\AnyDataset\Factory;
+use ByJG\AnyDataset\Db\Factory;
 use ByJG\Util\Uri;
 use Psr\Http\Message\UriInterface;
 

diff --git a/src/Database/PgsqlDatabase.php b/src/Database/PgsqlDatabase.php
@@ -2,7 +2,7 @@
 
 namespace ByJG\DbMigration\Database;
 
-use ByJG\AnyDataset\Factory;
+use ByJG\AnyDataset\Db\Factory;
 use ByJG\Util\Uri;
 use Psr\Http\Message\UriInterface;
 
@@ -23,7 +23,7 @@ protected static function getDbDriverWithoutDatabase(UriInterface $uri)
     }
 
     /**
-     * @param \ByJG\AnyDataset\DbDriverInterface $dbDriver
+     * @param \ByJG\AnyDataset\Db\DbDriverInterface $dbDriver
      * @param $database
      */
     protected static function createDatabaseIfNotExists($dbDriver, $database)

diff --git a/src/Migration.php b/src/Migration.php
@@ -2,7 +2,7 @@
 
 namespace ByJG\DbMigration;
 
-use ByJG\AnyDataset\DbDriverInterface;
+use ByJG\AnyDataset\Db\DbDriverInterface;
 use ByJG\DbMigration\Database\DatabaseInterface;
 use ByJG\DbMigration\Exception\DatabaseDoesNotRegistered;
 use ByJG\DbMigration\Exception\DatabaseIsIncompleteException;
@@ -241,11 +241,7 @@ protected function canContinue($currentVersion, $upVersion, $increment)
         $compareVersion =
             intval($currentVersion) < intval($upVersion)
                 ? -1
-                : (
-                    intval($currentVersion) > intval($upVersion)
-                        ? 1
-                        : 0
-                );
+                : (intval($currentVersion) > intval($upVersion) ? 1 : 0);
 
         return !($existsUpVersion && ($compareVersion === intval($increment)));
     }