Refactoring

src/Helpers.php

@@ -0,0 +1,18 @@
+<?php
+
+namespace Vados\MigrationRunner;
+
+/**
+ * Class Helpers
+ */
+class Helpers
+{
+    /**
+     * @var bool $value
+     * @return string
+     */
+    public static function boolToString(bool $value): string
+    {
+        return $value ? 'true' : 'false';
+    }
+}

src/Start.php

@@ -1,10 +1,4 @@
 <?php
-/**
- * Created by PhpStorm.
- * User: vladyslavpozdnyakov
- * Date: 17.03.2018
- * Time: 12:18
- */
 
 namespace Vados\MigrationRunner;
 

src/command/Create.php

@@ -1,10 +1,4 @@
 <?php
-/**
- * Created by PhpStorm.
- * User: vladyslavpozdnyakov
- * Date: 17.03.2018
- * Time: 12:58
- */
 
 namespace Vados\MigrationRunner\command;
 
@@ -33,7 +27,7 @@ class Create implements ICommand
     public function __construct(array $params)
     {
         $this->params = $params;
-        if (array_key_exists(0, $params)) {
+        if (isset($params[0])) {
             $this->migrationName = $params[0];
         }
     }

src/command/Down.php

@@ -1,12 +1,8 @@
 <?php
-/**
- * Created by PhpStorm.
- * User: vladyslavpozdnyakov
- * Date: 22.03.2018
- * Time: 20:03
- */
 
 namespace Vados\MigrationRunner\command;
+
+use Vados\MigrationRunner\Helpers;
 use Vados\MigrationRunner\migration\Migration;
 use Vados\MigrationRunner\models\TblMigration;
 use Vados\MigrationRunner\providers\PathProvider;
@@ -36,7 +32,7 @@ public function __construct(array $params)
     {
         parent::__construct();
         $this->params = $params;
-        if (array_key_exists(0, $params)) {
+        if (isset($params[0])) {
             $this->runCount = (int)$params[0];
         }
     }
@@ -58,8 +54,7 @@ public function run()
                     /** @var TblMigration $migration */
                     echo "Migration {$migration->getMigration()}: ";
                     $result = $this->down($migration);
-                    echo $result ? 'true' : 'false';
-                    echo PHP_EOL;
+                    echo Helpers::boolToString($result) . PHP_EOL;
                     if (!$result) {
                         break;
                     }

src/command/GenerateConfigWizard.php

@@ -1,10 +1,4 @@
 <?php
-/**
- * Created by PhpStorm.
- * User: vladyslavpozdnyakov
- * Date: 19.03.2018
- * Time: 21:46
- */
 
 namespace Vados\MigrationRunner\command;
 
@@ -16,38 +10,34 @@
  */
 class GenerateConfigWizard implements ICommand
 {
-
     public function run()
     {
         $config = [];
         echo 'Enter database adapter (default: sqlite): ';
-        $config['adapter'] = trim(fgets(STDIN));
-        if (!$config['adapter']) {
-            $config['adapter'] = 'sqlite';
-        }
-        if ($config['adapter'] !== 'sqlite') {
+        $this->getFromStdin($config['adapter'], 'sqlite');
+        if ('sqlite' !== $config['adapter']) {
             echo 'Enter database host (default: localhost): ';
-            $config['host'] = trim(fgets(STDIN));
-            if (!$config['host']) {
-                $config['host'] = 'localhost';
-            }
+            $this->getFromStdin($config['host'], 'localhost');
             echo 'Enter username (default: root): ';
-            $config['username'] = trim(fgets(STDIN));
-            if (!$config['username']) {
-                $config['username'] = 'root';
-            }
+            $this->getFromStdin($config['username'], 'root');
             echo 'Enter password (default: root): ';
-            $config['password'] = trim(fgets(STDIN));
-            if (!$config['password']) {
-                $config['password'] = 'root';
-            }
+            $this->getFromStdin($config['password'], 'root');
         }
         echo 'Enter database name (default: phalcon): ';
-        $config['dbname'] = trim(fgets(STDIN));
-        if (!$config['dbname']) {
-            $config['dbname'] = 'phalcon';
-        }
+        $this->getFromStdin($config['dbname'], 'phalcon');
         file_put_contents(PathProvider::getConfig(), '<?php return ' . var_export($config, true) . ';');
         echo 'Config generated in ' . PathProvider::getConfig() . PHP_EOL;
     }
+
+    /**
+     * @var $field
+     * @var $default
+     */
+    protected function getFromStdin(&$field, $default = null)
+    {
+        $field = trim(fgets(STDIN));
+        if (!$field) {
+            $field = $default;
+        }
+    }
 }

src/command/Help.php

@@ -1,10 +1,4 @@
 <?php
-/**
- * Created by PhpStorm.
- * User: vladyslavpozdnyakov
- * Date: 17.03.2018
- * Time: 12:27
- */
 
 namespace Vados\MigrationRunner\command;
 

src/command/ICommand.php

@@ -1,10 +1,4 @@
 <?php
-/**
- * Created by PhpStorm.
- * User: vladyslavpozdnyakov
- * Date: 17.03.2018
- * Time: 12:27
- */
 
 namespace Vados\MigrationRunner\command;
 

src/command/MigrationRun.php

@@ -1,10 +1,4 @@
 <?php
-/**
- * Created by PhpStorm.
- * User: vladyslavpozdnyakov
- * Date: 17.03.2018
- * Time: 14:45
- */
 
 namespace Vados\MigrationRunner\command;
 
@@ -70,6 +64,9 @@ protected function getAppliedMigrations(): array
      */
     protected function getExistingMigrations(): array
     {
+        if (!is_dir(PathProvider::getMigrationDir())) {
+            return [];
+        }
         $migrations = scandir(PathProvider::getMigrationDir());
         $ignore = ['.', '..'];
         return array_filter($migrations, function($item) use ($ignore) {

src/command/Up.php

@@ -1,12 +1,8 @@
 <?php
-/**
- * Created by PhpStorm.
- * User: vladyslavpozdnyakov
- * Date: 17.03.2018
- * Time: 13:39
- */
 
 namespace Vados\MigrationRunner\command;
+
+use Vados\MigrationRunner\Helpers;
 use Vados\MigrationRunner\migration\Migration;
 use Vados\MigrationRunner\models\TblMigration;
 use Vados\MigrationRunner\providers\PathProvider;
@@ -35,27 +31,21 @@ public function __construct(array $params)
     {
         parent::__construct();
         $this->params = $params;
-        if (array_key_exists(0, $params)) {
+        if (isset($params[0])) {
             $this->runCount = (int)$params[0];
         }
     }
 
     public function run()
     {
-        $migrations = $this->getNewMigrations();
-        if ($this->runCount !== 0) {
-            $migrations = array_slice($migrations, 0, $this->runCount);
-        }
+        $migrations = $this->getMigrationsList();
         if (!empty($migrations)) {
-            foreach ($migrations as $migration) {
-                echo $migration . PHP_EOL;
-            }
+            echo implode(PHP_EOL, $migrations);
             if ($this->actionConfirmation('Apply the above migrations?')) {
                 foreach ($migrations as $migration) {
                     echo "Migration $migration: ";
                     $result = $this->up($migration);
-                    echo $result ? 'true' : 'false';
-                    echo PHP_EOL;
+                    echo Helpers::boolToString($result) . PHP_EOL;
                     if (!$result) {
                         break;
                     }
@@ -64,6 +54,18 @@ public function run()
         }
     }
 
+    /**
+     * @return array
+     */
+    protected function getMigrationsList(): array
+    {
+        $migrations = $this->getNewMigrations();
+        if (0 !== $this->runCount) {
+            $migrations = array_slice($migrations, 0, $this->runCount);
+        }
+        return $migrations;
+    }
+
     /**
      * @param string $migration
      * @return bool

src/enum/Command.php

@@ -1,10 +1,4 @@
 <?php
-/**
- * Created by PhpStorm.
- * User: vladyslavpozdnyakov
- * Date: 17.03.2018
- * Time: 12:25
- */
 
 namespace Vados\MigrationRunner\enum;
 

src/enum/TableName.php

@@ -1,10 +1,4 @@
 <?php
-/**
- * Created by PhpStorm.
- * User: vladyslavpozdnyakov
- * Date: 17.03.2018
- * Time: 14:50
- */
 
 namespace Vados\MigrationRunner\enum;
 

src/migration/Migration.php

@@ -1,10 +1,4 @@
 <?php
-/**
- * Created by PhpStorm.
- * User: vladyslavpozdnyakov
- * Date: 17.03.2018
- * Time: 13:20
- */
 
 namespace Vados\MigrationRunner\migration;
 
@@ -47,11 +41,7 @@ public function safeRun(string $action): bool
                     $result = $this->down();
                     break;
             }
-            if ($result) {
-                $this->dbInstance->commit();
-            } else {
-                $this->dbInstance->rollback();
-            }
+            $result ? $this->dbInstance->commit() : $this->dbInstance->rollback();
             return $result;
         } catch (\Exception $e) {
             echo $e->getMessage() . PHP_EOL;

src/providers/PathProvider.php

@@ -1,10 +1,4 @@
 <?php
-/**
- * Created by PhpStorm.
- * User: vladyslavpozdnyakov
- * Date: 17.03.2018
- * Time: 14:19
- */
 
 namespace Vados\MigrationRunner\providers;
 

tests/HelpersTest.php

@@ -0,0 +1,27 @@
+<?php
+
+namespace Vados\MigrationRunner\Tests;
+
+use PHPUnit\Framework\TestCase;
+use Vados\MigrationRunner\Helpers;
+
+/**
+ * Class HelpersTest
+ * @package Vados\MigrationRunner\Tests
+ */
+class HelpersTest extends TestCase
+{
+    public function testBoolToStringTrue()
+    {
+        $result = Helpers::boolToString(true);
+        $this->assertIsString($result);
+        $this->assertEquals('true', $result);
+    }
+
+    public function testBoolToStringFalse()
+    {
+        $result = Helpers::boolToString(false);
+        $this->assertIsString($result);
+        $this->assertEquals('false', $result);
+    }
+}

tests/command/UpTest.php

@@ -5,6 +5,7 @@
 use PHPUnit\Framework\TestCase;
 use Vados\MigrationRunner\command\ICommand;
 use Vados\MigrationRunner\command\Up;
+use Vados\MigrationRunner\Tests\proxy\Up as UpProxy;
 
 /**
  * Class UpTest
@@ -46,4 +47,11 @@ public function testUpMigrationDoesntExist()
         $upMethod->setAccessible(true);
         $this->assertFalse($upMethod->invokeArgs($instance, ['not_exist']));
     }
+
+    public function testGetMigrationList()
+    {
+        $instance = new UpProxy([]);
+        $list = $instance->runGetMigrationList();
+        $this->assertIsArray($list);
+    }
 }

tests/proxy/Up.php

@@ -0,0 +1,15 @@
+<?php
+
+namespace Vados\MigrationRunner\Tests\proxy;
+
+/**
+ * Class UpTest
+ * @package Vados\MigrationRunner\Tests\proxy
+ */
+class Up extends \Vados\MigrationRunner\command\Up
+{
+    public function runGetMigrationList(): array
+    {
+        return $this->getMigrationsList();
+    }
+}