From 0b888ea3422467c0a78342344a8748eb20bb912c Mon Sep 17 00:00:00 2001
From: Toby Zerner <toby.zerner@gmail.com>
Date: Sun, 11 Oct 2015 10:05:40 +1030
Subject: [PATCH] Fix installation

---
 src/Database/Migrator.php              | 2 +-
 src/Install/Console/InstallCommand.php | 4 ++--
 src/Locale/LocaleServiceProvider.php   | 2 ++
 3 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/src/Database/Migrator.php b/src/Database/Migrator.php
index 9619a0e9c..0b5a0d71f 100755
--- a/src/Database/Migrator.php
+++ b/src/Database/Migrator.php
@@ -246,7 +246,7 @@ class Migrator
     {
         $file = implode('_', array_slice(explode('_', $file), 4));
 
-        $class = ($extension ? Str::studly($extension) : 'Flarum\\Core') . '\\Migration\\';
+        $class = ($extension ? str_replace('-', '\\', $extension) : 'Flarum\\Core') . '\\Migration\\';
 
         $class .= Str::studly($file);
 
diff --git a/src/Install/Console/InstallCommand.php b/src/Install/Console/InstallCommand.php
index e8a6b256e..fe644a758 100644
--- a/src/Install/Console/InstallCommand.php
+++ b/src/Install/Console/InstallCommand.php
@@ -42,7 +42,7 @@ class InstallCommand extends AbstractCommand
     {
         $this->application = $application;
 
-        \Flarum\Console\Command\parent::__construct();
+        parent::__construct();
     }
 
     protected function configure()
@@ -342,7 +342,7 @@ class InstallCommand extends AbstractCommand
      */
     protected function getPrerequisites()
     {
-        return $this->application->make('Flarum\Install\Prerequisites\Prerequisite');
+        return $this->application->make('Flarum\Install\Prerequisite\PrerequisiteInterface');
     }
 
     /**
diff --git a/src/Locale/LocaleServiceProvider.php b/src/Locale/LocaleServiceProvider.php
index b90d99bc5..f9495fbbe 100644
--- a/src/Locale/LocaleServiceProvider.php
+++ b/src/Locale/LocaleServiceProvider.php
@@ -36,5 +36,7 @@ class LocaleServiceProvider extends AbstractServiceProvider
         $this->app->alias('Flarum\Locale\LocaleManager', 'flarum.localeManager');
 
         $this->app->instance('translator', new Translator);
+
+        $this->app->alias('translator', 'Symfony\Component\Translation\TranslatorInterface');
     }
 }