JayBizzle / Laravel-Migrations-Organiser

src/Migrator.php

Spacing +1 added lines, -1 removed lines

@@ -37,7 +37,7 @@
      */
     public function getRecursiveFolders($folders)
     {
-        if (! is_array($folders)) {
+        if ( ! is_array($folders)) {
             $folders = [$folders];
         }
 

Indentation +54 added lines, -54 removed lines

@@ -8,68 +8,68 @@
 
 class Migrator extends M
 {
-    /**
-     * Get all of the migration files in a given path.
-     *
-     * @param  string|array  $paths
-     * @param  bool  $recursive
-     * @return array
-     */
-    public function getMigrationFiles($paths = [], $recursive = true)
-    {
-        if ($recursive) {
-            $paths = $this->getRecursiveFolders($paths);
-        }
+	/**
+	 * Get all of the migration files in a given path.
+	 *
+	 * @param  string|array  $paths
+	 * @param  bool  $recursive
+	 * @return array
+	 */
+	public function getMigrationFiles($paths = [], $recursive = true)
+	{
+		if ($recursive) {
+			$paths = $this->getRecursiveFolders($paths);
+		}
 
-        $files = parent::getMigrationFiles($paths);
+		$files = parent::getMigrationFiles($paths);
 
-        return $files;
-    }
+		return $files;
+	}
 
-    /**
-     * Get all subdirectories located in an array of folders.
-     *
-     * @param  string|array  $folders
-     * @return array
-     */
-    public function getRecursiveFolders($folders)
-    {
-        if (! is_array($folders)) {
-            $folders = [$folders];
-        }
+	/**
+	 * Get all subdirectories located in an array of folders.
+	 *
+	 * @param  string|array  $folders
+	 * @return array
+	 */
+	public function getRecursiveFolders($folders)
+	{
+		if (! is_array($folders)) {
+			$folders = [$folders];
+		}
 
-        $paths = [];
+		$paths = [];
 
-        foreach ($folders as $folder) {
-            $iter = new Iterator(
-                new DirectoryIterator($folder, DirectoryIterator::SKIP_DOTS),
-                Iterator::SELF_FIRST,
-                Iterator::CATCH_GET_CHILD // Ignore "Permission denied"
-            );
+		foreach ($folders as $folder) {
+			$iter = new Iterator(
+				new DirectoryIterator($folder, DirectoryIterator::SKIP_DOTS),
+				Iterator::SELF_FIRST,
+				Iterator::CATCH_GET_CHILD // Ignore "Permission denied"
+			);
 
-            $subPaths = [$folder];
-            foreach ($iter as $path => $dir) {
-                if ($dir->isDir()) {
-                    $subPaths[] = $path;
-                }
-            }
+			$subPaths = [$folder];
+			foreach ($iter as $path => $dir) {
+				if ($dir->isDir()) {
+					$subPaths[] = $path;
+				}
+			}
 
-            $paths = array_merge($paths, $subPaths);
-        }
+			$paths = array_merge($paths, $subPaths);
+		}
 
-        return $paths;
-    }
+		return $paths;
+	}
 
-    /**
-     * Add date folders to migrations path.
-     *
-     * @param  string  $file
-     * @return string
-     */
-    public function getDateFolderStructure($file)
-    {
-        $parts = explode('_', $file);
+	/**
+	 * Add date folders to migrations path.
+	 *
+	 * @param  string  $file
+	 * @return string
+	 */
+	public function getDateFolderStructure($file)
+	{
+		$parts = explode('_', $file);
 
-        return $parts[0].'/'.$parts[1].'/';
-    }
+		return $parts[0].'/'.$parts[1].'/';
+	}
 }

src/Commands/MigrateOrganise.php

Spacing +1 added lines, -1 removed lines

@@ -70,7 +70,7 @@
             $datePath = $this->migrator->getDateFolderStructure($migration_name);
 
             // 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);
             }
 

Indentation +68 added lines, -68 removed lines

@@ -8,84 +8,84 @@
 
 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 Migrator
-     */
-    protected $migrator;
+	/**
+	 * The migrator instance.
+	 *
+	 * @var Migrator
+	 */
+	protected $migrator;
 
-    /**
-     * The filesystem instance.
-     *
-     * @var Filesystem
-     */
-    protected $files;
+	/**
+	 * The filesystem instance.
+	 *
+	 * @var Filesystem
+	 */
+	protected $files;
 
-    /**
-     * Create a new migrator instance.
-     *
-     * @param  Filesystem  $files
-     * @param  Migrator  $migrator
-     */
-    public function __construct(Filesystem $files, Migrator $migrator)
-    {
-        parent::__construct();
-        $this->migrator = $migrator;
-        $this->files = $files;
-    }
+	/**
+	 * Create a new migrator instance.
+	 *
+	 * @param  Filesystem  $files
+	 * @param  Migrator  $migrator
+	 */
+	public function __construct(Filesystem $files, Migrator $migrator)
+	{
+		parent::__construct();
+		$this->migrator = $migrator;
+		$this->files = $files;
+	}
 
-    /**
-     * Fire the command. (Compatibility for < 5.5).
-     */
-    public function fire()
-    {
-        $this->handle();
-    }
+	/**
+	 * Fire the command. (Compatibility for < 5.5).
+	 */
+	public function fire()
+	{
+		$this->handle();
+	}
 
-    /**
-     * Create date folder structure and move migrations into.
-     *
-     * @return void
-     */
-    public function handle()
-    {
-        $basePath = $this->getMigrationPath();
-        $migrations = $this->migrator->getMigrationFiles($basePath, false);
-        $count = count($migrations);
+	/**
+	 * Create date folder structure and move migrations into.
+	 *
+	 * @return void
+	 */
+	public function handle()
+	{
+		$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_name => $migration_path) {
-            $datePath = $this->migrator->getDateFolderStructure($migration_name);
+		foreach ($migrations as $migration_name => $migration_path) {
+			$datePath = $this->migrator->getDateFolderStructure($migration_name);
 
-            // 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_name.'.php', $basePath.'/'.$datePath.$migration_name.'.php');
-        }
+			// Move the migration into its new folder
+			$this->files->move($basePath.'/'.$migration_name.'.php', $basePath.'/'.$datePath.$migration_name.'.php');
+		}
 
-        $this->info('Migrations organised successfully ('.$count.' migrations moved)');
-    }
+		$this->info('Migrations organised successfully ('.$count.' migrations moved)');
+	}
 }

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'], $app->path('stubs'));
-        });
-    }
-
-    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'], $app->path('stubs'));
+		});
+	}
+
+	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'], $app->path('stubs'));
         });
     }
 
     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 +26 added lines, -26 removed lines

@@ -7,30 +7,30 @@
 
 class MigrationCreator extends MC
 {
-    protected function ensureMigrationDoesntAlreadyExist($name, $migrationPath = null)
-    {
-        if (! empty($migrationPath)) {
-            $migrationPath = $migrationPath.'/'.date('Y').'/'.date('m');
-            $migrationFiles = $this->files->glob($migrationPath.'/*.php');
-
-            foreach ($migrationFiles as $migrationFile) {
-                $this->files->requireOnce($migrationFile);
-            }
-        }
-
-        if (class_exists($className = $this->getClassName($name))) {
-            throw new InvalidArgumentException("A {$className} class already exists.");
-        }
-    }
-
-    protected function getPath($name, $path)
-    {
-        $path = $path.'/'.date('Y').'/'.date('m');
-
-        if (! $this->files->exists($path)) {
-            $this->files->makeDirectory($path, 0775, true);
-        }
-
-        return $path.'/'.$this->getDatePrefix().'_'.$name.'.php';
-    }
+	protected function ensureMigrationDoesntAlreadyExist($name, $migrationPath = null)
+	{
+		if (! empty($migrationPath)) {
+			$migrationPath = $migrationPath.'/'.date('Y').'/'.date('m');
+			$migrationFiles = $this->files->glob($migrationPath.'/*.php');
+
+			foreach ($migrationFiles as $migrationFile) {
+				$this->files->requireOnce($migrationFile);
+			}
+		}
+
+		if (class_exists($className = $this->getClassName($name))) {
+			throw new InvalidArgumentException("A {$className} class already exists.");
+		}
+	}
+
+	protected function getPath($name, $path)
+	{
+		$path = $path.'/'.date('Y').'/'.date('m');
+
+		if (! $this->files->exists($path)) {
+			$this->files->makeDirectory($path, 0775, true);
+		}
+
+		return $path.'/'.$this->getDatePrefix().'_'.$name.'.php';
+	}
 }

Spacing +2 added lines, -2 removed lines

@@ -9,7 +9,7 @@ 
 {
     protected function ensureMigrationDoesntAlreadyExist($name, $migrationPath = null)
     {
-        if (! empty($migrationPath)) {
+        if ( ! empty($migrationPath)) {
             $migrationPath = $migrationPath.'/'.date('Y').'/'.date('m');
             $migrationFiles = $this->files->glob($migrationPath.'/*.php');
 
@@ -27,7 +27,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/MigrateDisorganise.php

Indentation +122 added lines, -122 removed lines

@@ -9,126 +9,126 @@
 
 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 Migrator
-     */
-    protected $migrator;
-
-    /**
-     * The filesystem instance.
-     *
-     * @var Filesystem
-     */
-    protected $files;
-
-    /**
-     * The basePath for the migrations.
-     */
-    protected $basePath;
-
-    /**
-     * Create a new migrator instance.
-     *
-     * @param  Filesystem  $files
-     * @param  Migrator  $migrator
-     */
-    public function __construct(Filesystem $files, Migrator $migrator)
-    {
-        parent::__construct();
-        $this->migrator = $migrator;
-        $this->files = $files;
-    }
-
-    /**
-     * Fire the command. (Compatibility for < 5.5).
-     */
-    public function fire()
-    {
-        $this->handle();
-    }
-
-    /**
-     * Create date folder structure and move migrations into.
-     *
-     * @return void
-     */
-    public function handle()
-    {
-        $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_name => $migration_path) {
-            $datePath = $this->migrator->getDateFolderStructure($migration_name);
-            // Move the migration into base migration folder
-            $this->files->move($this->basePath.'/'.$datePath.$migration_name.'.php', $this->basePath.'/'.$migration_name.'.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?', true)) {
-            $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 Migrator
+	 */
+	protected $migrator;
+
+	/**
+	 * The filesystem instance.
+	 *
+	 * @var Filesystem
+	 */
+	protected $files;
+
+	/**
+	 * The basePath for the migrations.
+	 */
+	protected $basePath;
+
+	/**
+	 * Create a new migrator instance.
+	 *
+	 * @param  Filesystem  $files
+	 * @param  Migrator  $migrator
+	 */
+	public function __construct(Filesystem $files, Migrator $migrator)
+	{
+		parent::__construct();
+		$this->migrator = $migrator;
+		$this->files = $files;
+	}
+
+	/**
+	 * Fire the command. (Compatibility for < 5.5).
+	 */
+	public function fire()
+	{
+		$this->handle();
+	}
+
+	/**
+	 * Create date folder structure and move migrations into.
+	 *
+	 * @return void
+	 */
+	public function handle()
+	{
+		$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_name => $migration_path) {
+			$datePath = $this->migrator->getDateFolderStructure($migration_name);
+			// Move the migration into base migration folder
+			$this->files->move($this->basePath.'/'.$datePath.$migration_name.'.php', $this->basePath.'/'.$migration_name.'.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?', true)) {
+			$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.'],
+		];
+	}
 }