Fix migrate command and generated migration namespace

This commit is contained in:
Toby Zerner 2015-10-19 16:48:16 +10:30
parent 96c42ed337
commit 7490709af8
2 changed files with 5 additions and 3 deletions

View File

@ -30,12 +30,12 @@ class Server extends AbstractServer
{
$app = $this->getApp();
$console = new Application('Flarum', $app::VERSION);
$console = new Application('Flarum', $app->version());
$app->register('Flarum\Install\InstallServiceProvider');
$console->add($app->make('Flarum\Install\Console\InstallCommand'));
$console->add($app->make('Flarum\Console\Command\UpgradeCommand'));
$console->add($app->make('Flarum\Update\Console\MigrateCommand'));
$console->add($app->make('Flarum\Console\Command\GenerateExtensionCommand'));
$console->add($app->make('Flarum\Console\Command\GenerateMigrationCommand'));

View File

@ -92,8 +92,10 @@ class MigrationCreator
*/
protected function populateStub($extension, $name, $stub, $table)
{
list($vendor, $package) = explode('-', $extension, 2);
$replacements = [
'{{namespace}}' => Str::studly($extension) ?: 'Flarum\Core',
'{{namespace}}' => Str::studly($vendor).'\\'.Str::studly($package) ?: 'Flarum\Core',
'{{name}}' => Str::studly($name),
'{{table}}' => $table
];