Updates to app builder stuff.

Danzabar · Nov 16, 2015 · 266ec86 · 266ec86
1 parent 4007f33
commit 266ec86
Show file tree

Hide file tree

Showing 4 changed files with 5 additions and 7 deletions.
diff --git a/src/Application/AppBuilder.php b/src/Application/AppBuilder.php
@@ -139,7 +139,7 @@ protected function createCoreFiles()
     {
         // Environment Class
         $this->fs->dumpFile(
-            sprintf('%s/%sEnvironment.php', $this->appDir, $this->appName),
+            sprintf('%s/%sEnvironment.php', $this->appSrcDir, $this->appName),
             $this->getFileContents(__DIR__ . '/AppTemplates/environment')
         );
 

diff --git a/src/Application/AppTemplates/Config/extensions b/src/Application/AppTemplates/Config/extensions
@@ -5,8 +5,6 @@
  *
  */
 return array(
-
-    'Wasp\Core\Extensions\Forms\FormExtension',
     'Wasp\Core\Extensions\Filters\FilterExtension',
     'Wasp\Core\Extensions\ShieldWall\ShieldWallExtension'
 );
diff --git a/src/Application/AppTemplates/environment b/src/Application/AppTemplates/environment
@@ -13,10 +13,10 @@ class [AppName]Environment extends AbstractEnvironment
 
     public function config()
     {
-        $profiles = require_once dirname(__DIR__) . '/profiles.php';
+        $profiles = require_once '[BaseDir]/profiles.php';
 
         $this->config->add('profiles',  $profiles);
-        $this->config->add('config_dir', __DIR__ . '/src/Config/');
+        $this->config->add('config_dir', __DIR__ . '/Config/');
         $this->config->add('config_files', array(
             'application',
             'assets',
@@ -40,6 +40,6 @@ class [AppName]Environment extends AbstractEnvironment
         $this->connect();
 
         // Start templating engine
-        $this->setupTemplates( __DIR__ . '/src/Views/');
+        $this->setupTemplates( __DIR__ . '/Views/');
     }
 }
diff --git a/tests/Application/AppBuilderTest.php b/tests/Application/AppBuilderTest.php
@@ -40,7 +40,7 @@ public function test_build()
         $fs = new Filesystem;
 
         $this->assertTrue($fs->exists(__DIR__ . '/App/wasp'));
-        $this->assertTrue($fs->exists(__DIR__ . '/App/wasp/WaspEnvironment.php'));
+        $this->assertTrue($fs->exists(__DIR__ . '/App/wasp/src/WaspEnvironment.php'));
         $this->assertTrue($fs->exists(__DIR__ . '/App/wasp/Routes.php'));
         $this->assertTrue($fs->exists(__DIR__ . '/App/wasp/src'));
         $this->assertTrue($fs->exists(__DIR__ . '/App/wasp/bootstrap'));