github-mirror/framework
2
0
Fork 0
mirror of https://github.com/flarum/framework.git synced 2024-12-05 09:03:36 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

Fix migrate command and generated migration namespace

Browse Source
This commit is contained in:
Toby Zerner 2015-10-19 16:48:16 +10:30
parent 1dd847bd36
commit 0952651cf3
2 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
framework/core/src/Console/Server.php
View File

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

4
framework/core/src/Database/MigrationCreator.php
View File

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