diff options
author | Dracony <draconyster@gmail.com> | 2016-09-02 15:41:11 +0200 |
---|---|---|
committer | Dracony <draconyster@gmail.com> | 2016-09-02 15:41:11 +0200 |
commit | d67c5cbc16e0a082ca717986a3499ef81553a93a (patch) | |
tree | f281e49ac32f9d05ba6b8a53976d28fededd5c80 | |
parent | 2512f696d272d127371825b78bbaad18ad54ed2a (diff) | |
download | PHPixie-d67c5cbc16e0a082ca717986a3499ef81553a93a.zip PHPixie-d67c5cbc16e0a082ca717986a3499ef81553a93a.tar.gz PHPixie-d67c5cbc16e0a082ca717986a3499ef81553a93a.tar.bz2 |
added framework support bundle3.3.3
-rwxr-xr-x | composer.json | 6 | ||||
-rwxr-xr-x | src/Project/Framework/Bundles.php | 1 | ||||
l--------- | web/bundles/app | 1 |
3 files changed, 6 insertions, 2 deletions
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 |