diff --git a/composer.json b/composer.json index 68d667a..4539b34 100755 --- a/composer.json +++ b/composer.json @@ -16,7 +16,8 @@ }, "require": { "phpixie/default-bundle": "~3.2", - "phpixie/bundle-framework": "~3.6" + "phpixie/bundle-framework": "~3.6", + "phpixie/framework-bundle": "~3.0" }, "require-dev": { "phpixie/test": "~3.0" @@ -25,5 +26,8 @@ "branch-alias": { "dev-master": "3.*-dev" } + }, + "scripts": { + "post-create-project-cmd" : "php ./console framework:installWebAssets" } } diff --git a/src/Project/Framework/Bundles.php b/src/Project/Framework/Bundles.php index d98eb88..9f4cce4 100755 --- a/src/Project/Framework/Bundles.php +++ b/src/Project/Framework/Bundles.php @@ -15,6 +15,7 @@ class Bundles extends \PHPixie\BundleFramework\Bundles protected function buildBundles() { return array( + new \PHPixie\FrameworkBundle($this->builder), new \Project\App($this->builder) ); } diff --git a/web/bundles/app b/web/bundles/app deleted file mode 120000 index 0f32a9c..0000000 --- a/web/bundles/app +++ /dev/null @@ -1 +0,0 @@ -../../bundles/app/web \ No newline at end of file