From ed5733ed417bc78554d11fc2df78b36283899fd5 Mon Sep 17 00:00:00 2001
From: Toby Zerner <toby.zerner@gmail.com>
Date: Thu, 23 Jul 2015 20:24:28 +0930
Subject: [PATCH] Various fixes to extension generator/stub

---
 framework/core/src/Console/GenerateExtensionCommand.php | 2 --
 framework/core/stubs/extension/js/forum/src/main.js     | 2 +-
 framework/core/stubs/extension/src/Extension.php        | 2 +-
 3 files changed, 2 insertions(+), 4 deletions(-)

diff --git a/framework/core/src/Console/GenerateExtensionCommand.php b/framework/core/src/Console/GenerateExtensionCommand.php
index d42e77e8c..ee2a97969 100644
--- a/framework/core/src/Console/GenerateExtensionCommand.php
+++ b/framework/core/src/Console/GenerateExtensionCommand.php
@@ -73,8 +73,6 @@ class GenerateExtensionCommand extends Command
 
         $this->copyStub($dir, $replacements);
 
-        rename($dir.'/src/ServiceProvider.php', $dir.'/src/'.ucfirst($package).'ServiceProvider.php');
-
         $manifest = [
             'name' => $name,
             'title' => $title,
diff --git a/framework/core/stubs/extension/js/forum/src/main.js b/framework/core/stubs/extension/js/forum/src/main.js
index d9f28e508..d91d90e70 100644
--- a/framework/core/stubs/extension/js/forum/src/main.js
+++ b/framework/core/stubs/extension/js/forum/src/main.js
@@ -1,6 +1,6 @@
 import { extend } from 'flarum/extend';
 import app from 'flarum/app';
 
-app.initializers.add('{name}', function() {
+app.initializers.add('{{name}}', function() {
   // TODO
 });
diff --git a/framework/core/stubs/extension/src/Extension.php b/framework/core/stubs/extension/src/Extension.php
index a64d047d1..17c459e0f 100644
--- a/framework/core/stubs/extension/src/Extension.php
+++ b/framework/core/stubs/extension/src/Extension.php
@@ -1,6 +1,6 @@
 <?php namespace {{namespace}};
 
-use Flarum\Support\Extension;
+use Flarum\Support\Extension as BaseExtension;
 use Illuminate\Events\Dispatcher;
 
 class Extension extends BaseExtension