Skip to content

Commit

Permalink
added framework support bundle
Browse files Browse the repository at this point in the history
  • Loading branch information
dracony committed Sep 2, 2016
1 parent 2512f69 commit d67c5cb
Show file tree
Hide file tree
Showing 3 changed files with 6 additions and 2 deletions.
6 changes: 5 additions & 1 deletion composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand All @@ -25,5 +26,8 @@
"branch-alias": {
"dev-master": "3.*-dev"
}
},
"scripts": {
"post-create-project-cmd" : "php ./console framework:installWebAssets"
}
}
1 change: 1 addition & 0 deletions src/Project/Framework/Bundles.php
Original file line number Diff line number Diff line change
Expand Up @@ -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)
);
}
Expand Down
1 change: 0 additions & 1 deletion web/bundles/app

This file was deleted.

0 comments on commit d67c5cb

Please sign in to comment.