JayBizzle / Laravel-Migrations-Organiser

src/Commands/MigrateDisorganise.php

Indentation +114 added lines, -114 removed lines

@@ -9,118 +9,118 @@
 
 class MigrateDisorganise extends BaseCommand
 {
-    /**
-     * The console command name.
-     *
-     * @var string
-     */
-    protected $name = 'migrate:disorganise';
-
-    /**
-     * The console command description.
-     *
-     * @var string
-     */
-    protected $description = 'Move migrations from a yyyy/mm folder structure back to the base migrations folder';
-
-    /**
-     * The migrator instance.
-     *
-     * @var \Jaybizzle\MigrationsOrganiser\Migrator
-     */
-    protected $migrator;
-
-    /**
-     * The filesystem instance.
-     *
-     * @var \Illuminate\Filesystem\Filesystem
-     */
-    protected $files;
-
-    /**
-     * The basePath for the migrations.
-     */
-    protected $basePath;
-
-    /**
-     * Create a new migrator instance.
-     *
-     * @param \Illuminate\Filesystem\Filesystem        $files
-     * @param \Illuminate\Database\Migrations\Migrator $migrator
-     */
-    public function __construct(Filesystem $files, Migrator $migrator)
-    {
-        parent::__construct();
-        $this->migrator = $migrator;
-        $this->files = $files;
-    }
-
-    /**
-     * Create date folder structure and move migrations into.
-     *
-     * @return void
-     */
-    public function fire()
-    {
-        $this->basePath = $this->getMigrationPath();
-        $migrations = $this->migrator->getMigrationFiles($this->basePath);
-        $count = count($migrations);
-
-        if ($count == 0) {
-            $this->comment('No migrations to move');
-
-            return;
-        }
-
-        foreach ($migrations as $migration) {
-            $datePath = $this->migrator->getDateFolderStructure($migration);
-            // Move the migration into base migration folder
-            $this->files->move($this->basePath.'/'.$datePath.$migration.'.php', $this->basePath.'/'.$migration.'.php');
-        }
-
-        $this->info('Migrations disorganised successfully ('.$count.' migrations moved)');
-        $this->cleanup();
-    }
-
-    /**
-     * Decide whether or not to delete directories.
-     *
-     * @return void
-     */
-    public function cleanup()
-    {
-        if ($this->option('force')) {
-            $this->deleteDirs();
-        } elseif ($this->confirm('Delete all subdirectories in migrations folder? [yes|no]', false)) {
-            $this->deleteDirs();
-        }
-    }
-
-    /**
-     * Delete subdirectories in the migrations folder.
-     *
-     * @return void
-     */
-    public function deleteDirs()
-    {
-        $dirs = $this->files->directories($this->basePath);
-
-        foreach ($dirs as $dir) {
-            $this->files->deleteDirectory($dir);
-        }
-
-        $this->info('Subdirectories deleted');
-    }
-
-    /**
-     * Get the console command options.
-     *
-     * @return array
-     */
-    protected function getOptions()
-    {
-        return [
-            ['force', null, InputOption::VALUE_NONE, 'Force the operation to delete migration folder subdirectories without prompt.'],
-        ];
-    }
+	/**
+	 * The console command name.
+	 *
+	 * @var string
+	 */
+	protected $name = 'migrate:disorganise';
+
+	/**
+	 * The console command description.
+	 *
+	 * @var string
+	 */
+	protected $description = 'Move migrations from a yyyy/mm folder structure back to the base migrations folder';
+
+	/**
+	 * The migrator instance.
+	 *
+	 * @var \Jaybizzle\MigrationsOrganiser\Migrator
+	 */
+	protected $migrator;
+
+	/**
+	 * The filesystem instance.
+	 *
+	 * @var \Illuminate\Filesystem\Filesystem
+	 */
+	protected $files;
+
+	/**
+	 * The basePath for the migrations.
+	 */
+	protected $basePath;
+
+	/**
+	 * Create a new migrator instance.
+	 *
+	 * @param \Illuminate\Filesystem\Filesystem        $files
+	 * @param \Illuminate\Database\Migrations\Migrator $migrator
+	 */
+	public function __construct(Filesystem $files, Migrator $migrator)
+	{
+		parent::__construct();
+		$this->migrator = $migrator;
+		$this->files = $files;
+	}
+
+	/**
+	 * Create date folder structure and move migrations into.
+	 *
+	 * @return void
+	 */
+	public function fire()
+	{
+		$this->basePath = $this->getMigrationPath();
+		$migrations = $this->migrator->getMigrationFiles($this->basePath);
+		$count = count($migrations);
+
+		if ($count == 0) {
+			$this->comment('No migrations to move');
+
+			return;
+		}
+
+		foreach ($migrations as $migration) {
+			$datePath = $this->migrator->getDateFolderStructure($migration);
+			// Move the migration into base migration folder
+			$this->files->move($this->basePath.'/'.$datePath.$migration.'.php', $this->basePath.'/'.$migration.'.php');
+		}
+
+		$this->info('Migrations disorganised successfully ('.$count.' migrations moved)');
+		$this->cleanup();
+	}
+
+	/**
+	 * Decide whether or not to delete directories.
+	 *
+	 * @return void
+	 */
+	public function cleanup()
+	{
+		if ($this->option('force')) {
+			$this->deleteDirs();
+		} elseif ($this->confirm('Delete all subdirectories in migrations folder? [yes|no]', false)) {
+			$this->deleteDirs();
+		}
+	}
+
+	/**
+	 * Delete subdirectories in the migrations folder.
+	 *
+	 * @return void
+	 */
+	public function deleteDirs()
+	{
+		$dirs = $this->files->directories($this->basePath);
+
+		foreach ($dirs as $dir) {
+			$this->files->deleteDirectory($dir);
+		}
+
+		$this->info('Subdirectories deleted');
+	}
+
+	/**
+	 * Get the console command options.
+	 *
+	 * @return array
+	 */
+	protected function getOptions()
+	{
+		return [
+			['force', null, InputOption::VALUE_NONE, 'Force the operation to delete migration folder subdirectories without prompt.'],
+		];
+	}
 }

src/MigrationsOrganiserServiceProvider.php

Indentation +37 added lines, -37 removed lines

@@ -8,41 +8,41 @@
 
 class MigrationsOrganiserServiceProvider extends MSP
 {
-    public function register()
-    {
-        parent::register();
-        $this->registerMigrateOrganise();
-        $this->registerMigrateDisorganise();
-        $this->commands('command.migrate.organise', 'command.migrate.disorganise');
-    }
-
-    protected function registerCreator()
-    {
-        $this->app->singleton('migration.creator', function ($app) {
-            return new MigrationCreator($app['files']);
-        });
-    }
-
-    protected function registerMigrator()
-    {
-        $this->app->singleton('migrator', function ($app) {
-            $repository = $app['migration.repository'];
-
-            return new Migrator($repository, $app['db'], $app['files']);
-        });
-    }
-
-    protected function registerMigrateOrganise()
-    {
-        $this->app->singleton('command.migrate.organise', function ($app) {
-            return new MigrateOrganise($app['files'], $app['migrator']);
-        });
-    }
-
-    protected function registerMigrateDisorganise()
-    {
-        $this->app->singleton('command.migrate.disorganise', function ($app) {
-            return new MigrateDisorganise($app['files'], $app['migrator']);
-        });
-    }
+	public function register()
+	{
+		parent::register();
+		$this->registerMigrateOrganise();
+		$this->registerMigrateDisorganise();
+		$this->commands('command.migrate.organise', 'command.migrate.disorganise');
+	}
+
+	protected function registerCreator()
+	{
+		$this->app->singleton('migration.creator', function ($app) {
+			return new MigrationCreator($app['files']);
+		});
+	}
+
+	protected function registerMigrator()
+	{
+		$this->app->singleton('migrator', function ($app) {
+			$repository = $app['migration.repository'];
+
+			return new Migrator($repository, $app['db'], $app['files']);
+		});
+	}
+
+	protected function registerMigrateOrganise()
+	{
+		$this->app->singleton('command.migrate.organise', function ($app) {
+			return new MigrateOrganise($app['files'], $app['migrator']);
+		});
+	}
+
+	protected function registerMigrateDisorganise()
+	{
+		$this->app->singleton('command.migrate.disorganise', function ($app) {
+			return new MigrateDisorganise($app['files'], $app['migrator']);
+		});
+	}
 }

Spacing +4 added lines, -4 removed lines

@@ -18,14 +18,14 @@ 
 
     protected function registerCreator()
     {
-        $this->app->singleton('migration.creator', function ($app) {
+        $this->app->singleton('migration.creator', function($app) {
             return new MigrationCreator($app['files']);
         });
     }
 
     protected function registerMigrator()
     {
-        $this->app->singleton('migrator', function ($app) {
+        $this->app->singleton('migrator', function($app) {
             $repository = $app['migration.repository'];
 
             return new Migrator($repository, $app['db'], $app['files']);
@@ -34,14 +34,14 @@ 
 
     protected function registerMigrateOrganise()
     {
-        $this->app->singleton('command.migrate.organise', function ($app) {
+        $this->app->singleton('command.migrate.organise', function($app) {
             return new MigrateOrganise($app['files'], $app['migrator']);
         });
     }
 
     protected function registerMigrateDisorganise()
     {
-        $this->app->singleton('command.migrate.disorganise', function ($app) {
+        $this->app->singleton('command.migrate.disorganise', function($app) {
             return new MigrateDisorganise($app['files'], $app['migrator']);
         });
     }

src/MigrationCreator.php

Indentation +8 added lines, -8 removed lines

@@ -6,14 +6,14 @@
 
 class MigrationCreator extends MC
 {
-    protected function getPath($name, $path)
-    {
-        $path = $path.'/'.date('Y').'/'.date('m');
+	protected function getPath($name, $path)
+	{
+		$path = $path.'/'.date('Y').'/'.date('m');
 
-        if (! $this->files->exists($path)) {
-            $this->files->makeDirectory($path, 0775, true);
-        }
+		if (! $this->files->exists($path)) {
+			$this->files->makeDirectory($path, 0775, true);
+		}
 
-        return $path.'/'.$this->getDatePrefix().'_'.$name.'.php';
-    }
+		return $path.'/'.$this->getDatePrefix().'_'.$name.'.php';
+	}
 }

Spacing +1 added lines, -1 removed lines

@@ -10,7 +10,7 @@
     {
         $path = $path.'/'.date('Y').'/'.date('m');
 
-        if (! $this->files->exists($path)) {
+        if ( ! $this->files->exists($path)) {
             $this->files->makeDirectory($path, 0775, true);
         }
 

src/Commands/MigrateOrganise.php

Indentation +61 added lines, -61 removed lines

@@ -8,76 +8,76 @@
 
 class MigrateOrganise extends BaseCommand
 {
-    /**
-     * The console command name.
-     *
-     * @var string
-     */
-    protected $name = 'migrate:organise';
+	/**
+	 * The console command name.
+	 *
+	 * @var string
+	 */
+	protected $name = 'migrate:organise';
 
-    /**
-     * The console command description.
-     *
-     * @var string
-     */
-    protected $description = 'Move migrations into a yyyy/mm folder structure';
+	/**
+	 * The console command description.
+	 *
+	 * @var string
+	 */
+	protected $description = 'Move migrations into a yyyy/mm folder structure';
 
-    /**
-     * The migrator instance.
-     *
-     * @var \Jaybizzle\MigrationsOrganiser\Migrator
-     */
-    protected $migrator;
+	/**
+	 * The migrator instance.
+	 *
+	 * @var \Jaybizzle\MigrationsOrganiser\Migrator
+	 */
+	protected $migrator;
 
-    /**
-     * The filesystem instance.
-     *
-     * @var \Illuminate\Filesystem\Filesystem
-     */
-    protected $files;
+	/**
+	 * The filesystem instance.
+	 *
+	 * @var \Illuminate\Filesystem\Filesystem
+	 */
+	protected $files;
 
-    /**
-     * Create a new migrator instance.
-     *
-     * @param \Illuminate\Filesystem\Filesystem        $files
-     * @param \Illuminate\Database\Migrations\Migrator $migrator
-     */
-    public function __construct(Filesystem $files, Migrator $migrator)
-    {
-        parent::__construct();
-        $this->migrator = $migrator;
-        $this->files = $files;
-    }
+	/**
+	 * Create a new migrator instance.
+	 *
+	 * @param \Illuminate\Filesystem\Filesystem        $files
+	 * @param \Illuminate\Database\Migrations\Migrator $migrator
+	 */
+	public function __construct(Filesystem $files, Migrator $migrator)
+	{
+		parent::__construct();
+		$this->migrator = $migrator;
+		$this->files = $files;
+	}
 
-    /**
-     * Create date folder structure and move migrations into.
-     *
-     * @return void
-     */
-    public function fire()
-    {
-        $basePath = $this->getMigrationPath();
-        $migrations = $this->migrator->getMigrationFiles($basePath, false);
-        $count = count($migrations);
+	/**
+	 * Create date folder structure and move migrations into.
+	 *
+	 * @return void
+	 */
+	public function fire()
+	{
+		$basePath = $this->getMigrationPath();
+		$migrations = $this->migrator->getMigrationFiles($basePath, false);
+		$count = count($migrations);
 
-        if ($count == 0) {
-            $this->comment('No migrations to move');
+		if ($count == 0) {
+			$this->comment('No migrations to move');
 
-            return;
-        }
+			return;
+		}
 
-        foreach ($migrations as $migration) {
-            $datePath = $this->migrator->getDateFolderStructure($migration);
+		foreach ($migrations as $migration) {
+			$datePath = $this->migrator->getDateFolderStructure($migration);
 
-            // Create folder if it does not already exist
-            if (! $this->files->exists($basePath.'/'.$datePath)) {
-                $this->files->makeDirectory($basePath.'/'.$datePath, 0775, true);
-            }
+			// Create folder if it does not already exist
+			if (! $this->files->exists($basePath.'/'.$datePath)) {
+				$this->files->makeDirectory($basePath.'/'.$datePath, 0775, true);
+			}
 
-            // Move the migration into its new folder
-            $this->files->move($basePath.'/'.$migration.'.php', $basePath.'/'.$datePath.$migration.'.php');
-        }
+			// Move the migration into its new folder
+			$this->files->move($basePath.'/'.$migration.'.php', $basePath.'/'.$datePath.$migration.'.php');
+		}
 
-        $this->info('Migrations organised successfully ('.$count.' migrations moved)');
-    }
+		$this->info('Migrations organised successfully ('.$count.' migrations moved)');
+	}
 }

Spacing +1 added lines, -1 removed lines

@@ -70,7 +70,7 @@
             $datePath = $this->migrator->getDateFolderStructure($migration);
 
             // Create folder if it does not already exist
-            if (! $this->files->exists($basePath.'/'.$datePath)) {
+            if ( ! $this->files->exists($basePath.'/'.$datePath)) {
                 $this->files->makeDirectory($basePath.'/'.$datePath, 0775, true);
             }
 

src/Migrator.php

Indentation +160 added lines, -160 removed lines

@@ -6,167 +6,167 @@
 
 class Migrator extends M
 {
-    /**
-     * Fully qualified path to the application's migration directory
-     *
-     * @var string
-     */
-    private $path;
+	/**
+	 * Fully qualified path to the application's migration directory
+	 *
+	 * @var string
+	 */
+	private $path;
     
-    /**
-     * Get all of the migration files in a given path.
-     *
-     * @param string $path
-     * @param bool   $recursive
-     *
-     * @return array
-     */
-    public function getMigrationFiles($path, $recursive = true)
-    {
-        $this->setPath($path);
+	/**
+	 * Get all of the migration files in a given path.
+	 *
+	 * @param string $path
+	 * @param bool   $recursive
+	 *
+	 * @return array
+	 */
+	public function getMigrationFiles($path, $recursive = true)
+	{
+		$this->setPath($path);
         
-        if ($recursive === true) {
-            $files = $this->rglob($this->path.'/*_*.php', 0, true);
-        } else {
-            $files = $this->files->glob($this->path.'/*_*.php');
-        }
-
-        // Once we have the array of files in the directory we will just remove the
-        // extension and take the basename of the file which is all we need when
-        // finding the migrations that haven't been run against the databases.
-        if ($files === false) {
-            return [];
-        }
-
-        $files = array_map(function ($file) {
-            return str_replace('.php', '', basename($file));
-
-        }, $files);
-
-        // Once we have all of the formatted file names we will sort them and since
-        // they all start with a timestamp this should give us the migrations in
-        // the order they were actually created by the application developers.
-        sort($files);
-
-        return $files;
-    }
-
-    /**
-     * Require in all the migration files in a given path.
-     *
-     * @param array  $files
-     *
-     * @return void
-     */
-    public function requireFiles(array $files)
-    {
-        foreach ($files as $file) {
-            $newPath = $this->getFilePathWithFolders($file).'.php';
-            $this->files->requireOnce($newPath);
-        }
-    }
-
-    /**
-     * Run "up" a migration instance.
-     *
-     * @param string $file
-     * @param int    $batch
-     * @param bool   $pretend
-     *
-     * @return void
-     */
-    protected function runUp($file, $batch, $pretend)
-    {
-        // First we will resolve a "real" instance of the migration class from this
-        // migration file name. Once we have the instances we can run the actual
-        // command such as "up" or "down", or we can just simulate the action.
-        $migration = $this->resolve($file);
-
-        if ($pretend) {
-            return $this->pretendToRun($migration, 'up');
-        }
-
-        $migration->up();
-
-        // Once we have run a migrations class, we will log that it was run in this
-        // repository so that we don't try to run it next time we do a migration
-        // in the application. A migration repository keeps the migrate order.
-        $this->repository->log($this->getFilePathWithoutFolders($file), $batch);
-
-        $this->note("<info>Migrated:</info> $file");
-    }
-
-    /**
-     * Recursive glob.
-     *
-     * @param string $pattern
-     * @param int    $flags
-     * @param bool   $ignore
-     *
-     * @return array
-     */
-    public function rglob($pattern, $flags = 0, $ignore = false)
-    {
-        if ($ignore === false) {
-            $files = glob($pattern, $flags);
-        } else {
-            $files = [];
-        }
-
-        foreach (glob(dirname($pattern).'/*', GLOB_ONLYDIR | GLOB_NOSORT) as $dir) {
-            $files = array_merge($files, $this->rglob($dir.'/'.basename($pattern), $flags));
-        }
-
-        return $files;
-    }
-
-    /**
-     * Get the migration file path with our injected date folder.
-     *
-     * @param string $file
-     *
-     * @return string
-     */
-    public function getFilePathWithFolders($file)
-    {
-        $datePath = $this->getDateFolderStructure($file);
-
-        return $this->path . '/' . $datePath . $file;
-    }
-
-    /**
-     * Remove folders from file path.
-     *
-     * @param string $file
-     *
-     * @return string
-     */
-    public function getFilePathWithoutFolders($file)
-    {
-        return basename($file);
-    }
-
-    /**
-     * Add date folders to migrations path.
-     *
-     * @param string $file
-     *
-     * @return string
-     */
-    public function getDateFolderStructure($file)
-    {
-        $parts = explode('_', $file);
-
-        return $parts[0].'/'.$parts[1].'/';
-    }
+		if ($recursive === true) {
+			$files = $this->rglob($this->path.'/*_*.php', 0, true);
+		} else {
+			$files = $this->files->glob($this->path.'/*_*.php');
+		}
+
+		// Once we have the array of files in the directory we will just remove the
+		// extension and take the basename of the file which is all we need when
+		// finding the migrations that haven't been run against the databases.
+		if ($files === false) {
+			return [];
+		}
+
+		$files = array_map(function ($file) {
+			return str_replace('.php', '', basename($file));
+
+		}, $files);
+
+		// Once we have all of the formatted file names we will sort them and since
+		// they all start with a timestamp this should give us the migrations in
+		// the order they were actually created by the application developers.
+		sort($files);
+
+		return $files;
+	}
+
+	/**
+	 * Require in all the migration files in a given path.
+	 *
+	 * @param array  $files
+	 *
+	 * @return void
+	 */
+	public function requireFiles(array $files)
+	{
+		foreach ($files as $file) {
+			$newPath = $this->getFilePathWithFolders($file).'.php';
+			$this->files->requireOnce($newPath);
+		}
+	}
+
+	/**
+	 * Run "up" a migration instance.
+	 *
+	 * @param string $file
+	 * @param int    $batch
+	 * @param bool   $pretend
+	 *
+	 * @return void
+	 */
+	protected function runUp($file, $batch, $pretend)
+	{
+		// First we will resolve a "real" instance of the migration class from this
+		// migration file name. Once we have the instances we can run the actual
+		// command such as "up" or "down", or we can just simulate the action.
+		$migration = $this->resolve($file);
+
+		if ($pretend) {
+			return $this->pretendToRun($migration, 'up');
+		}
+
+		$migration->up();
+
+		// Once we have run a migrations class, we will log that it was run in this
+		// repository so that we don't try to run it next time we do a migration
+		// in the application. A migration repository keeps the migrate order.
+		$this->repository->log($this->getFilePathWithoutFolders($file), $batch);
+
+		$this->note("<info>Migrated:</info> $file");
+	}
+
+	/**
+	 * Recursive glob.
+	 *
+	 * @param string $pattern
+	 * @param int    $flags
+	 * @param bool   $ignore
+	 *
+	 * @return array
+	 */
+	public function rglob($pattern, $flags = 0, $ignore = false)
+	{
+		if ($ignore === false) {
+			$files = glob($pattern, $flags);
+		} else {
+			$files = [];
+		}
+
+		foreach (glob(dirname($pattern).'/*', GLOB_ONLYDIR | GLOB_NOSORT) as $dir) {
+			$files = array_merge($files, $this->rglob($dir.'/'.basename($pattern), $flags));
+		}
+
+		return $files;
+	}
+
+	/**
+	 * Get the migration file path with our injected date folder.
+	 *
+	 * @param string $file
+	 *
+	 * @return string
+	 */
+	public function getFilePathWithFolders($file)
+	{
+		$datePath = $this->getDateFolderStructure($file);
+
+		return $this->path . '/' . $datePath . $file;
+	}
+
+	/**
+	 * Remove folders from file path.
+	 *
+	 * @param string $file
+	 *
+	 * @return string
+	 */
+	public function getFilePathWithoutFolders($file)
+	{
+		return basename($file);
+	}
+
+	/**
+	 * Add date folders to migrations path.
+	 *
+	 * @param string $file
+	 *
+	 * @return string
+	 */
+	public function getDateFolderStructure($file)
+	{
+		$parts = explode('_', $file);
+
+		return $parts[0].'/'.$parts[1].'/';
+	}
     
-    /**
-     * Set the path
-     *
-     * @param array|string $path
-     */
-    private function setPath($path)
-    {
-        $this->path = is_array($path) ? $path[0] : $path;
-    }
+	/**
+	 * Set the path
+	 *
+	 * @param array|string $path
+	 */
+	private function setPath($path)
+	{
+		$this->path = is_array($path) ? $path[0] : $path;
+	}
 }

Spacing +2 added lines, -2 removed lines

@@ -38,7 +38,7 @@ 
             return [];
         }
 
-        $files = array_map(function ($file) {
+        $files = array_map(function($file) {
             return str_replace('.php', '', basename($file));
 
         }, $files);
@@ -131,7 +131,7 @@ 
     {
         $datePath = $this->getDateFolderStructure($file);
 
-        return $this->path . '/' . $datePath . $file;
+        return $this->path.'/'.$datePath.$file;
     }
 
     /**