summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDracony <draconyster@gmail.com>2015-10-21 13:31:56 +0200
committerDracony <draconyster@gmail.com>2015-10-21 13:31:56 +0200
commitb805739d15473a393168c54185d611e690b7977f (patch)
tree8a9baf0a50c890c066e60c8b5e747431ec1dbc00
parentfe8bb979bc9c6d3099c574a92f254b170fa1a021 (diff)
downloadPHPixie-b805739d15473a393168c54185d611e690b7977f.zip
PHPixie-b805739d15473a393168c54185d611e690b7977f.tar.gz
PHPixie-b805739d15473a393168c54185d611e690b7977f.tar.bz2
bundle refactor3.1
-rwxr-xr-xbundles/app/src/Project/App.php5
-rwxr-xr-xbundles/app/src/Project/App/Builder.php5
-rwxr-xr-xcomposer.json4
3 files changed, 7 insertions, 7 deletions
diff --git a/bundles/app/src/Project/App.php b/bundles/app/src/Project/App.php
index 6c86cd7..468bb35 100755
--- a/bundles/app/src/Project/App.php
+++ b/bundles/app/src/Project/App.php
@@ -8,9 +8,4 @@ class App extends \PHPixie\DefaultBundle
{
return new App\Builder($frameworkBuilder);
}
-
- public function name()
- {
- return 'app';
- }
} \ No newline at end of file
diff --git a/bundles/app/src/Project/App/Builder.php b/bundles/app/src/Project/App/Builder.php
index 2170b55..bad2370 100755
--- a/bundles/app/src/Project/App/Builder.php
+++ b/bundles/app/src/Project/App/Builder.php
@@ -18,4 +18,9 @@ class Builder extends \PHPixie\DefaultBundle\Builder
{
return realpath(__DIR__.'/../../../');
}
+
+ public function bundleName()
+ {
+ return 'app';
+ }
} \ No newline at end of file
diff --git a/composer.json b/composer.json
index 6a42109..f6e471e 100755
--- a/composer.json
+++ b/composer.json
@@ -15,8 +15,8 @@
}
},
"require": {
- "phpixie/default-bundle": "~3.0",
- "phpixie/bundle-framework": "~3.0"
+ "phpixie/default-bundle": "~3.1",
+ "phpixie/bundle-framework": "~3.1"
},
"require-dev": {
"phpixie/test": "~3.0"