Fix installation

This commit is contained in:
Toby Zerner 2015-10-03 17:38:23 +09:30
parent dab6db7907
commit b667cd4d0c
18 changed files with 36 additions and 22 deletions

View File

@ -8,7 +8,7 @@
* file that was distributed with this source code.
*/
namespace Flarum\Migrations\Core;
namespace Flarum\Core\Migrations;
use Flarum\Migrations\Migration;
use Illuminate\Database\Schema\Blueprint;

View File

@ -8,7 +8,7 @@
* file that was distributed with this source code.
*/
namespace Flarum\Migrations\Core;
namespace Flarum\Core\Migrations;
use Flarum\Migrations\Migration;
use Illuminate\Database\Schema\Blueprint;

View File

@ -8,7 +8,7 @@
* file that was distributed with this source code.
*/
namespace Flarum\Migrations\Core;
namespace Flarum\Core\Migrations;
use Flarum\Migrations\Migration;
use Illuminate\Database\Schema\Blueprint;

View File

@ -8,7 +8,7 @@
* file that was distributed with this source code.
*/
namespace Flarum\Migrations\Core;
namespace Flarum\Core\Migrations;
use Flarum\Migrations\Migration;
use Illuminate\Database\Schema\Blueprint;

View File

@ -8,7 +8,7 @@
* file that was distributed with this source code.
*/
namespace Flarum\Migrations\Core;
namespace Flarum\Core\Migrations;
use Flarum\Migrations\Migration;
use Illuminate\Database\Schema\Blueprint;

View File

@ -8,7 +8,7 @@
* file that was distributed with this source code.
*/
namespace Flarum\Migrations\Core;
namespace Flarum\Core\Migrations;
use Flarum\Migrations\Migration;
use Illuminate\Database\Schema\Blueprint;

View File

@ -8,7 +8,7 @@
* file that was distributed with this source code.
*/
namespace Flarum\Migrations\Core;
namespace Flarum\Core\Migrations;
use Flarum\Migrations\Migration;
use Illuminate\Database\Schema\Blueprint;

View File

@ -8,7 +8,7 @@
* file that was distributed with this source code.
*/
namespace Flarum\Migrations\Core;
namespace Flarum\Core\Migrations;
use Flarum\Migrations\Migration;
use Illuminate\Database\Schema\Blueprint;

View File

@ -8,7 +8,7 @@
* file that was distributed with this source code.
*/
namespace Flarum\Migrations\Core;
namespace Flarum\Core\Migrations;
use Flarum\Migrations\Migration;
use Illuminate\Database\Schema\Blueprint;

View File

@ -8,7 +8,7 @@
* file that was distributed with this source code.
*/
namespace Flarum\Migrations\Core;
namespace Flarum\Core\Migrations;
use Flarum\Migrations\Migration;
use Illuminate\Database\Schema\Blueprint;

View File

@ -8,7 +8,7 @@
* file that was distributed with this source code.
*/
namespace Flarum\Migrations\Core;
namespace Flarum\Core\Migrations;
use Flarum\Migrations\Migration;
use Illuminate\Database\Schema\Blueprint;

View File

@ -8,7 +8,7 @@
* file that was distributed with this source code.
*/
namespace Flarum\Migrations\Core;
namespace Flarum\Core\Migrations;
use Flarum\Migrations\Migration;
use Illuminate\Database\Schema\Blueprint;

View File

@ -8,7 +8,7 @@
* file that was distributed with this source code.
*/
namespace Flarum\Migrations\Core;
namespace Flarum\Core\Migrations;
use Flarum\Migrations\Migration;
use Illuminate\Database\Schema\Blueprint;

View File

@ -8,7 +8,7 @@
* file that was distributed with this source code.
*/
namespace Flarum\Migrations\Core;
namespace Flarum\Core\Migrations;
use Flarum\Migrations\Migration;
use Illuminate\Database\Schema\Blueprint;

View File

@ -1,6 +1,14 @@
<?php
/*
* This file is part of Flarum.
*
* (c) Toby Zerner <toby.zerner@gmail.com>
*
* For the full copyright and license information, please view the LICENSE
* file that was distributed with this source code.
*/
namespace Flarum\Migrations\Core;
namespace Flarum\Core\Migrations;
use Illuminate\Database\Schema\Blueprint;
use Flarum\Migrations\Migration;

View File

@ -1,6 +1,14 @@
<?php
/*
* This file is part of Flarum.
*
* (c) Toby Zerner <toby.zerner@gmail.com>
*
* For the full copyright and license information, please view the LICENSE
* file that was distributed with this source code.
*/
namespace Flarum\Migrations\Core;
namespace Flarum\Core\Migrations;
use Illuminate\Database\Schema\Blueprint;
use Flarum\Migrations\Migration;

View File

@ -310,10 +310,8 @@ class InstallCommand extends Command
$migrator = $extensions->getMigrator();
foreach ($extensions->getInfo() as $extension) {
$name = $extension->name;
if ($name === 'pusher') {
foreach ($extensions->getInfo() as $name => $extension) {
if ($name === 'flarum-pusher') {
continue;
}
@ -329,7 +327,7 @@ class InstallCommand extends Command
protected function getConfigFile()
{
return base_path('../config.php');
return base_path('config.php');
}
/**

View File

@ -246,7 +246,7 @@ class Migrator
{
$file = implode('_', array_slice(explode('_', $file), 4));
$class = ($extension ? str_replace('-', '\\', $extension) : 'Core') . '\\Migrations\\';
$class = ($extension ? str_replace('-', '\\', $extension) : 'Flarum\\Core') . '\\Migrations\\';
$class .= Str::studly($file);