summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDracony <draconyster@gmail.com>2015-07-07 19:29:55 +0200
committerDracony <draconyster@gmail.com>2015-07-07 19:29:55 +0200
commit9f4ccefd027e24372d605d4779315e64504e32c6 (patch)
treec32399c74f8b3a3e0b5673133c21f1ccf64c905c
parent9ba4b94abce2013a015bf76dcb0356b0dd224c3e (diff)
downloadPHPixie-9f4ccefd027e24372d605d4779315e64504e32c6.zip
PHPixie-9f4ccefd027e24372d605d4779315e64504e32c6.tar.gz
PHPixie-9f4ccefd027e24372d605d4779315e64504e32c6.tar.bz2
bundle
-rwxr-xr-x[-rw-r--r--]assets/config.php (renamed from bundles/hello/assets/config/filesystem.php)0
-rw-r--r--assets/config/database.php8
-rwxr-xr-xassets/config/http.php7
-rw-r--r--assets/config/locator.php24
-rw-r--r--assets/config/orm.php5
-rwxr-xr-xassets/config/routeResolver.php6
-rw-r--r--assets/config/routes.php16
-rwxr-xr-xbundles/app/assets/templates/hello.php3
-rwxr-xr-xbundles/app/assets/templates/layout.php9
-rwxr-xr-xbundles/app/src/Project/App.php11
-rwxr-xr-xbundles/app/src/Project/App/Builder.php11
-rwxr-xr-xbundles/app/src/Project/App/HTTPProcessor.php11
-rwxr-xr-xbundles/app/src/Project/App/HTTPProcessors/Hello.php20
-rw-r--r--bundles/hello/assets/config/route.php12
-rw-r--r--bundles/hello/assets/templates/greet/index.php6
-rw-r--r--bundles/hello/src/Project/Hello.php11
-rw-r--r--bundles/hello/src/Project/Hello/ORM/Entities/.gitignore0
-rw-r--r--bundles/hello/src/Project/Hello/ORM/Wrappers.php0
-rw-r--r--bundles/hello/src/Project/Hello/Processors.php13
-rw-r--r--bundles/hello/src/Project/Hello/Processors/Hello.php14
-rwxr-xr-xcomposer.json13
-rwxr-xr-xcomposer.lock257
-rwxr-xr-xsrc/Project.php9
-rwxr-xr-x[-rw-r--r--]src/Project/Builder.php (renamed from bundles/hello/assets/templates/layout.php)0
-rwxr-xr-xsrc/Project/Bundles.php18
-rw-r--r--src/Project/PHPixie.php8
-rw-r--r--src/Project/PHPixie/Bundles.php11
-rw-r--r--src/Project/PHPixie/ORM/Wrappers.php0
28 files changed, 340 insertions, 163 deletions
diff --git a/bundles/hello/assets/config/filesystem.php b/assets/config.php
index e69de29..e69de29 100644..100755
--- a/bundles/hello/assets/config/filesystem.php
+++ b/assets/config.php
diff --git a/assets/config/database.php b/assets/config/database.php
deleted file mode 100644
index e34da02..0000000
--- a/assets/config/database.php
+++ /dev/null
@@ -1,8 +0,0 @@
-<?php
-
-return array(
- 'default' => array(
- 'driver' => 'PDO',
- 'connection' => ''
- )
-); \ No newline at end of file
diff --git a/assets/config/http.php b/assets/config/http.php
new file mode 100755
index 0000000..455e975
--- /dev/null
+++ b/assets/config/http.php
@@ -0,0 +1,7 @@
+<?php
+
+return array(
+ 'translator' => array(
+ 'basePath' => '/'
+ )
+); \ No newline at end of file
diff --git a/assets/config/locator.php b/assets/config/locator.php
deleted file mode 100644
index 11410bb..0000000
--- a/assets/config/locator.php
+++ /dev/null
@@ -1,24 +0,0 @@
-<?php
-
-return array(
- 'type' => 'prefix',
- 'locators' => array(
-
- //templates locator
- 'templates' => array(
- array(
- 'type' => 'prefix',
- 'locators' => array(
-
- //Mount Hello templates
- 'hello' => array(
- 'type' => 'mount',
- 'name' => 'hello:templates'
- ),
-
- )
- )
- )
- //end templates locator
- )
-); \ No newline at end of file
diff --git a/assets/config/orm.php b/assets/config/orm.php
deleted file mode 100644
index d34a4cb..0000000
--- a/assets/config/orm.php
+++ /dev/null
@@ -1,5 +0,0 @@
-<?php
-
-return array(
-
-); \ No newline at end of file
diff --git a/assets/config/routeResolver.php b/assets/config/routeResolver.php
new file mode 100755
index 0000000..d54c36e
--- /dev/null
+++ b/assets/config/routeResolver.php
@@ -0,0 +1,6 @@
+<?php
+
+return array(
+ 'type' => 'mount',
+ 'name' => 'app'
+); \ No newline at end of file
diff --git a/assets/config/routes.php b/assets/config/routes.php
deleted file mode 100644
index b1de7f4..0000000
--- a/assets/config/routes.php
+++ /dev/null
@@ -1,16 +0,0 @@
-<?php
-
-return array(
- 'translator' => array(
- 'basePath' => '/'
- ),
- 'resolver' => array(
- 'type' => 'group',
- 'resolvers' => array(
- array(
- 'type' => 'mount',
- 'name' => 'app'
- )
- )
- )
-); \ No newline at end of file
diff --git a/bundles/app/assets/templates/hello.php b/bundles/app/assets/templates/hello.php
new file mode 100755
index 0000000..234ddb7
--- /dev/null
+++ b/bundles/app/assets/templates/hello.php
@@ -0,0 +1,3 @@
+<?php $this->layout('app:layout');?>
+
+<h1><?=$_($message); ?></h1> \ No newline at end of file
diff --git a/bundles/app/assets/templates/layout.php b/bundles/app/assets/templates/layout.php
new file mode 100755
index 0000000..b5d65d4
--- /dev/null
+++ b/bundles/app/assets/templates/layout.php
@@ -0,0 +1,9 @@
+<!DOCTYPE html>
+<html>
+ <head>
+ <title>PHPixie</title>
+ </head>
+ <body>
+ <?php $this->childContent();?>
+ </body>
+</html> \ No newline at end of file
diff --git a/bundles/app/src/Project/App.php b/bundles/app/src/Project/App.php
new file mode 100755
index 0000000..468bb35
--- /dev/null
+++ b/bundles/app/src/Project/App.php
@@ -0,0 +1,11 @@
+<?php
+
+namespace Project;
+
+class App extends \PHPixie\DefaultBundle
+{
+ protected function buildBuilder($frameworkBuilder)
+ {
+ return new App\Builder($frameworkBuilder);
+ }
+} \ No newline at end of file
diff --git a/bundles/app/src/Project/App/Builder.php b/bundles/app/src/Project/App/Builder.php
new file mode 100755
index 0000000..83b5a99
--- /dev/null
+++ b/bundles/app/src/Project/App/Builder.php
@@ -0,0 +1,11 @@
+<?php
+
+namespace Project\App;
+
+class Builder extends \PHPixie\DefaultBundle\Builder
+{
+ protected function httpProcessor()
+ {
+ return new HTTPPRocessor();
+ }
+} \ No newline at end of file
diff --git a/bundles/app/src/Project/App/HTTPProcessor.php b/bundles/app/src/Project/App/HTTPProcessor.php
new file mode 100755
index 0000000..7d7b19f
--- /dev/null
+++ b/bundles/app/src/Project/App/HTTPProcessor.php
@@ -0,0 +1,11 @@
+<?php
+
+namespace Project\App;
+
+class HTTPProcessor extends \PHPixie\DefaultBundle\Builder
+{
+ protected function buildHelloProcessor()
+ {
+ new HTTPProcessors\Hello();
+ }
+} \ No newline at end of file
diff --git a/bundles/app/src/Project/App/HTTPProcessors/Hello.php b/bundles/app/src/Project/App/HTTPProcessors/Hello.php
new file mode 100755
index 0000000..cb0d181
--- /dev/null
+++ b/bundles/app/src/Project/App/HTTPProcessors/Hello.php
@@ -0,0 +1,20 @@
+<?php
+
+namespace Project\App\Processors\HTTP;
+
+class Hello extends PHPixie\DefaultBundle\Processor\HTTP\Actions
+{
+ protected $builder;
+
+ public function __construct($builder)
+ {
+ $this->builder = $builder;
+ }
+
+ public function process($request)
+ {
+ $template = $this->template->container('app:hello');
+ $template->message = "Have fun coding!";
+ return $template;
+ }
+} \ No newline at end of file
diff --git a/bundles/hello/assets/config/route.php b/bundles/hello/assets/config/route.php
deleted file mode 100644
index 1bbfbc6..0000000
--- a/bundles/hello/assets/config/route.php
+++ /dev/null
@@ -1,12 +0,0 @@
-<?php
-
-return array(
- array(
- 'type' => 'pattern',
- 'url' => '(/<processor>(/<action>))',
- 'defaults' => array(
- 'processor' => 'hello',
- 'action' => 'index'
- )
- )
-); \ No newline at end of file
diff --git a/bundles/hello/assets/templates/greet/index.php b/bundles/hello/assets/templates/greet/index.php
deleted file mode 100644
index 9d10287..0000000
--- a/bundles/hello/assets/templates/greet/index.php
+++ /dev/null
@@ -1,6 +0,0 @@
-<?php $this->layout('layout'); ?>
-
-<?php $this->block('content'); ?>
- <h1>Hello</h1>
- <?=$_($message)?>
-<?php $this->endBlock(); ?> \ No newline at end of file
diff --git a/bundles/hello/src/Project/Hello.php b/bundles/hello/src/Project/Hello.php
deleted file mode 100644
index eeb7a63..0000000
--- a/bundles/hello/src/Project/Hello.php
+++ /dev/null
@@ -1,11 +0,0 @@
-<?php
-
-namespace Project;
-
-class Hello extends \PHPixie\Framework\Bundle\Implementation
-{
- public function rootDirectory()
- {
- return realpath(__DIR__.'/../../');
- }
-} \ No newline at end of file
diff --git a/bundles/hello/src/Project/Hello/ORM/Entities/.gitignore b/bundles/hello/src/Project/Hello/ORM/Entities/.gitignore
deleted file mode 100644
index e69de29..0000000
--- a/bundles/hello/src/Project/Hello/ORM/Entities/.gitignore
+++ /dev/null
diff --git a/bundles/hello/src/Project/Hello/ORM/Wrappers.php b/bundles/hello/src/Project/Hello/ORM/Wrappers.php
deleted file mode 100644
index e69de29..0000000
--- a/bundles/hello/src/Project/Hello/ORM/Wrappers.php
+++ /dev/null
diff --git a/bundles/hello/src/Project/Hello/Processors.php b/bundles/hello/src/Project/Hello/Processors.php
deleted file mode 100644
index 6826b7f..0000000
--- a/bundles/hello/src/Project/Hello/Processors.php
+++ /dev/null
@@ -1,13 +0,0 @@
-<?php
-
-namespace Hello;
-
-class Processors
-{
- protected $http = array('hello');
-
- public function hello()
- {
-
- }
-} \ No newline at end of file
diff --git a/bundles/hello/src/Project/Hello/Processors/Hello.php b/bundles/hello/src/Project/Hello/Processors/Hello.php
deleted file mode 100644
index 2f181c0..0000000
--- a/bundles/hello/src/Project/Hello/Processors/Hello.php
+++ /dev/null
@@ -1,14 +0,0 @@
-<?php
-
-class Hello
-{
- public function __construct($template)
- {
-
- }
-
- public function greet()
- {
- $
- }
-} \ No newline at end of file
diff --git a/composer.json b/composer.json
index 9c2d4d3..1db2908 100755
--- a/composer.json
+++ b/composer.json
@@ -1,8 +1,11 @@
{
"require": {
+ "phpixie/default-bundle": "3.*@dev",
+ "phpixie/bundle-framework": "3.*@dev",
+ "phpixie/bundles": "3.*@dev",
"phpixie/framework": "3.*@dev",
"phpixie/debug": "3.*@dev",
- "phpixie/router": "3.*@dev",
+ "phpixie/route": "3.*@dev",
"phpixie/template": "3.*@dev",
"phpixie/filesystem": "3.*@dev",
"phpixie/database": "3.*@dev",
@@ -16,5 +19,13 @@
},
"require-dev": {
"phpixie/test": "3.*@dev"
+ },
+ "autoload": {
+ "psr-4": {
+ "Project\\": [
+ "src/Project",
+ "bundles/app/src/Project"
+ ]
+ }
}
}
diff --git a/composer.lock b/composer.lock
index 704a202..7d1e1f2 100755
--- a/composer.lock
+++ b/composer.lock
@@ -1,12 +1,133 @@
{
"_readme": [
"This file locks the dependencies of your project to a known state",
- "Read more about it at http://getcomposer.org/doc/01-basic-usage.md#composer-lock-the-lock-file",
+ "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#composer-lock-the-lock-file",
"This file is @generated automatically"
],
- "hash": "6210d1b9b08db036457544a43c1d69ba",
+ "hash": "da17fa6ca194e96aa05ec4358bd370ba",
"packages": [
{
+ "name": "phpixie/bundle-framework",
+ "version": "dev-master",
+ "source": {
+ "type": "git",
+ "url": "https://github.com/PHPixie/Bundle-Framework.git",
+ "reference": "8092f6d50ee31b70a14ec418fe5d9d1209afa3c3"
+ },
+ "dist": {
+ "type": "zip",
+ "url": "https://api.github.com/repos/PHPixie/Bundle-Framework/zipball/8092f6d50ee31b70a14ec418fe5d9d1209afa3c3",
+ "reference": "8092f6d50ee31b70a14ec418fe5d9d1209afa3c3",
+ "shasum": ""
+ },
+ "require": {
+ "phpixie/bundles": "3.*@dev",
+ "phpixie/config": "3.*@dev",
+ "phpixie/database": "3.*@dev",
+ "phpixie/debug": "3.*@dev",
+ "phpixie/filesystem": "3.*@dev",
+ "phpixie/framework": "3.*@dev",
+ "phpixie/http": "3.*@dev",
+ "phpixie/http-processors": "3.*@dev",
+ "phpixie/orm": "3.*@dev",
+ "phpixie/processors": "3.*@dev",
+ "phpixie/route": "3.*@dev",
+ "phpixie/slice": "3.*@dev",
+ "phpixie/template": "3.*@dev",
+ "psr/http-message": "1.*@dev"
+ },
+ "require-dev": {
+ "phpixie/test": "3.*@dev"
+ },
+ "type": "library",
+ "extra": {
+ "branch-alias": {
+ "dev-master": "3.x-dev"
+ }
+ },
+ "autoload": {
+ "psr-4": {
+ "PHPixie\\": "src/PHPixie",
+ "PHPixie\\Tests\\": "tests/PHPixie/Tests"
+ }
+ },
+ "notification-url": "https://packagist.org/downloads/",
+ "license": [
+ "BSD"
+ ],
+ "authors": [
+ {
+ "name": "Roman Tsiupa",
+ "email": "draconyster@gmail.com",
+ "homepage": "http://dracony.org"
+ }
+ ],
+ "description": "PHPixie Bundle Framework",
+ "homepage": "http://phpixie.com",
+ "keywords": [
+ "framework"
+ ],
+ "time": "2015-07-07 16:08:43"
+ },
+ {
+ "name": "phpixie/bundles",
+ "version": "dev-master",
+ "source": {
+ "type": "git",
+ "url": "https://github.com/PHPixie/Bundles.git",
+ "reference": "1a063c4837a5466c3731a309974d7546e9f586c9"
+ },
+ "dist": {
+ "type": "zip",
+ "url": "https://api.github.com/repos/PHPixie/Bundles/zipball/1a063c4837a5466c3731a309974d7546e9f586c9",
+ "reference": "1a063c4837a5466c3731a309974d7546e9f586c9",
+ "shasum": ""
+ },
+ "require": {
+ "phpixie/database": "3.*@dev",
+ "phpixie/filesystem": "3.*@dev",
+ "phpixie/http": "3.*@dev",
+ "phpixie/orm": "3.*@dev",
+ "phpixie/processors": "3.*@dev",
+ "phpixie/route": "3.*@dev",
+ "phpixie/slice": "3.*@dev",
+ "psr/http-message": "1.0.*@dev"
+ },
+ "require-dev": {
+ "phpixie/test": "3.*@dev"
+ },
+ "type": "library",
+ "extra": {
+ "branch-alias": {
+ "dev-master": "3.x-dev"
+ }
+ },
+ "autoload": {
+ "psr-4": {
+ "PHPixie\\": "src/PHPixie",
+ "PHPixie\\Tests\\": "tests/PHPixie/Tests"
+ }
+ },
+ "notification-url": "https://packagist.org/downloads/",
+ "license": [
+ "BSD"
+ ],
+ "authors": [
+ {
+ "name": "Roman Tsiupa",
+ "email": "draconyster@gmail.com",
+ "homepage": "http://dracony.org"
+ }
+ ],
+ "description": "Bundle library for PHPixie",
+ "homepage": "http://phpixie.com",
+ "keywords": [
+ "http",
+ "psr-7"
+ ],
+ "time": "2015-07-07 16:21:01"
+ },
+ {
"name": "phpixie/config",
"version": "dev-master",
"source": {
@@ -161,6 +282,71 @@
"time": "2015-05-10 10:48:46"
},
{
+ "name": "phpixie/default-bundle",
+ "version": "dev-master",
+ "source": {
+ "type": "git",
+ "url": "https://github.com/PHPixie/Default-Bundle.git",
+ "reference": "93c2f1320a94fca49736158c13199d7cad1fdfaa"
+ },
+ "dist": {
+ "type": "zip",
+ "url": "https://api.github.com/repos/PHPixie/Default-Bundle/zipball/93c2f1320a94fca49736158c13199d7cad1fdfaa",
+ "reference": "93c2f1320a94fca49736158c13199d7cad1fdfaa",
+ "shasum": ""
+ },
+ "require": {
+ "phpixie/bundle-framework": "3.*@dev",
+ "phpixie/bundles": "3.*@dev",
+ "phpixie/config": "3.*@dev",
+ "phpixie/database": "3.*@dev",
+ "phpixie/debug": "3.*@dev",
+ "phpixie/filesystem": "3.*@dev",
+ "phpixie/framework": "3.*@dev",
+ "phpixie/http": "3.*@dev",
+ "phpixie/http-processors": "3.*@dev",
+ "phpixie/orm": "3.*@dev",
+ "phpixie/processors": "3.*@dev",
+ "phpixie/route": "3.*@dev",
+ "phpixie/slice": "3.*@dev",
+ "phpixie/template": "3.*@dev",
+ "psr/http-message": "1.0.*@dev"
+ },
+ "require-dev": {
+ "phpixie/test": "3.*@dev"
+ },
+ "type": "library",
+ "extra": {
+ "branch-alias": {
+ "dev-master": "3.x-dev"
+ }
+ },
+ "autoload": {
+ "psr-4": {
+ "PHPixie\\": "src/PHPixie",
+ "PHPixie\\Tests\\": "tests/PHPixie/Tests"
+ }
+ },
+ "notification-url": "https://packagist.org/downloads/",
+ "license": [
+ "BSD"
+ ],
+ "authors": [
+ {
+ "name": "Roman Tsiupa",
+ "email": "draconyster@gmail.com",
+ "homepage": "http://dracony.org"
+ }
+ ],
+ "description": "Bundle library for PHPixie",
+ "homepage": "http://phpixie.com",
+ "keywords": [
+ "http",
+ "psr-7"
+ ],
+ "time": "2015-07-05 18:58:59"
+ },
+ {
"name": "phpixie/filesystem",
"version": "dev-master",
"source": {
@@ -217,12 +403,12 @@
"source": {
"type": "git",
"url": "https://github.com/PHPixie/Framework.git",
- "reference": "c76d35248da53c222e87840ebab96292ba6cb4bf"
+ "reference": "af45ef23d7edaf0fb3c95d68f96ffa6e2b71754d"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/PHPixie/Framework/zipball/c76d35248da53c222e87840ebab96292ba6cb4bf",
- "reference": "c76d35248da53c222e87840ebab96292ba6cb4bf",
+ "url": "https://api.github.com/repos/PHPixie/Framework/zipball/af45ef23d7edaf0fb3c95d68f96ffa6e2b71754d",
+ "reference": "af45ef23d7edaf0fb3c95d68f96ffa6e2b71754d",
"shasum": ""
},
"require": {
@@ -234,7 +420,7 @@
"phpixie/http-processors": "3.*@dev",
"phpixie/orm": "3.*@dev",
"phpixie/processors": "3.*@dev",
- "phpixie/router": "3.*@dev",
+ "phpixie/route": "3.*@dev",
"phpixie/slice": "3.*@dev",
"phpixie/template": "3.*@dev",
"psr/http-message": "1.*@dev"
@@ -270,7 +456,7 @@
"keywords": [
"processors"
],
- "time": "2015-05-31 13:20:55"
+ "time": "2015-07-07 16:08:01"
},
{
"name": "phpixie/http",
@@ -278,12 +464,12 @@
"source": {
"type": "git",
"url": "https://github.com/PHPixie/HTTP.git",
- "reference": "5cd4db4d4e92df79f5670913f728fe49563500dd"
+ "reference": "b2696997b385eef9c2333a749e325e76d51bd970"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/PHPixie/HTTP/zipball/5cd4db4d4e92df79f5670913f728fe49563500dd",
- "reference": "5cd4db4d4e92df79f5670913f728fe49563500dd",
+ "url": "https://api.github.com/repos/PHPixie/HTTP/zipball/b2696997b385eef9c2333a749e325e76d51bd970",
+ "reference": "b2696997b385eef9c2333a749e325e76d51bd970",
"shasum": ""
},
"require": {
@@ -322,7 +508,7 @@
"http",
"psr-7"
],
- "time": "2015-05-30 13:03:15"
+ "time": "2015-06-24 16:01:18"
},
{
"name": "phpixie/http-processors",
@@ -330,12 +516,12 @@
"source": {
"type": "git",
"url": "https://github.com/PHPixie/HTTP-Processors.git",
- "reference": "bc72c4c9fe72f45365163fca9f90aab5b7c71b5f"
+ "reference": "0a7ed23ee1957a5f5d8de8861f87acc0dee3db89"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/PHPixie/HTTP-Processors/zipball/bc72c4c9fe72f45365163fca9f90aab5b7c71b5f",
- "reference": "bc72c4c9fe72f45365163fca9f90aab5b7c71b5f",
+ "url": "https://api.github.com/repos/PHPixie/HTTP-Processors/zipball/0a7ed23ee1957a5f5d8de8861f87acc0dee3db89",
+ "reference": "0a7ed23ee1957a5f5d8de8861f87acc0dee3db89",
"shasum": ""
},
"require": {
@@ -375,7 +561,7 @@
"keywords": [
"processors"
],
- "time": "2015-05-13 10:25:02"
+ "time": "2015-07-01 11:37:00"
},
{
"name": "phpixie/orm",
@@ -383,12 +569,12 @@
"source": {
"type": "git",
"url": "https://github.com/PHPixie/ORM.git",
- "reference": "c37ca0a7756961107c686df4f0f6c822751b9bc9"
+ "reference": "5e8fa70c16800773bae066246d27e68f304add76"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/PHPixie/ORM/zipball/c37ca0a7756961107c686df4f0f6c822751b9bc9",
- "reference": "c37ca0a7756961107c686df4f0f6c822751b9bc9",
+ "url": "https://api.github.com/repos/PHPixie/ORM/zipball/5e8fa70c16800773bae066246d27e68f304add76",
+ "reference": "5e8fa70c16800773bae066246d27e68f304add76",
"shasum": ""
},
"require": {
@@ -427,7 +613,7 @@
"database",
"orm"
],
- "time": "2015-03-25 10:18:31"
+ "time": "2015-06-12 15:15:33"
},
{
"name": "phpixie/processors",
@@ -435,12 +621,12 @@
"source": {
"type": "git",
"url": "https://github.com/PHPixie/Processors.git",
- "reference": "df40bca7a1e6f8d33ccd0369eec0b9d77a0c889a"
+ "reference": "2aa1be44ac034f38b959d307d4e32f8dcb736601"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/PHPixie/Processors/zipball/df40bca7a1e6f8d33ccd0369eec0b9d77a0c889a",
- "reference": "df40bca7a1e6f8d33ccd0369eec0b9d77a0c889a",
+ "url": "https://api.github.com/repos/PHPixie/Processors/zipball/2aa1be44ac034f38b959d307d4e32f8dcb736601",
+ "reference": "2aa1be44ac034f38b959d307d4e32f8dcb736601",
"shasum": ""
},
"require-dev": {
@@ -475,20 +661,20 @@
"Chain",
"processors"
],
- "time": "2015-05-06 00:59:49"
+ "time": "2015-06-30 11:38:39"
},
{
- "name": "phpixie/router",
+ "name": "phpixie/route",
"version": "dev-master",
"source": {
"type": "git",
- "url": "https://github.com/PHPixie/Router.git",
- "reference": "d4a0669281bfa598981db4bbe64e79f4366d3283"
+ "url": "https://github.com/PHPixie/Route.git",
+ "reference": "6f64c58d02789e67d4aa81b6be434934e3394b83"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/PHPixie/Router/zipball/d4a0669281bfa598981db4bbe64e79f4366d3283",
- "reference": "d4a0669281bfa598981db4bbe64e79f4366d3283",
+ "url": "https://api.github.com/repos/PHPixie/Route/zipball/6f64c58d02789e67d4aa81b6be434934e3394b83",
+ "reference": "6f64c58d02789e67d4aa81b6be434934e3394b83",
"shasum": ""
},
"require": {
@@ -529,7 +715,7 @@
"router",
"routing"
],
- "time": "2015-06-05 14:36:11"
+ "time": "2015-06-05 15:29:19"
},
{
"name": "phpixie/slice",
@@ -586,12 +772,12 @@
"source": {
"type": "git",
"url": "https://github.com/PHPixie/Template.git",
- "reference": "0ffc4064e341c0f7adbc6e65245d1f9c1180b96f"
+ "reference": "a8db854c8ecff3ed7d65c932c0473b5bd914a757"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/PHPixie/Template/zipball/0ffc4064e341c0f7adbc6e65245d1f9c1180b96f",
- "reference": "0ffc4064e341c0f7adbc6e65245d1f9c1180b96f",
+ "url": "https://api.github.com/repos/PHPixie/Template/zipball/a8db854c8ecff3ed7d65c932c0473b5bd914a757",
+ "reference": "a8db854c8ecff3ed7d65c932c0473b5bd914a757",
"shasum": ""
},
"require": {
@@ -630,7 +816,7 @@
"template",
"templating"
],
- "time": "2015-06-03 09:39:39"
+ "time": "2015-07-02 20:31:04"
},
{
"name": "psr/http-message",
@@ -731,9 +917,12 @@
"aliases": [],
"minimum-stability": "stable",
"stability-flags": {
+ "phpixie/default-bundle": 20,
+ "phpixie/bundle-framework": 20,
+ "phpixie/bundles": 20,
"phpixie/framework": 20,
"phpixie/debug": 20,
- "phpixie/router": 20,
+ "phpixie/route": 20,
"phpixie/template": 20,
"phpixie/filesystem": 20,
"phpixie/database": 20,
diff --git a/src/Project.php b/src/Project.php
new file mode 100755
index 0000000..491fe1f
--- /dev/null
+++ b/src/Project.php
@@ -0,0 +1,9 @@
+<?php
+
+class Project extends \PHPixie\BundleFramework
+{
+ protected function buildBuilder()
+ {
+ return new Project\Builder();
+ }
+} \ No newline at end of file
diff --git a/bundles/hello/assets/templates/layout.php b/src/Project/Builder.php
index e69de29..e69de29 100644..100755
--- a/bundles/hello/assets/templates/layout.php
+++ b/src/Project/Builder.php
diff --git a/src/Project/Bundles.php b/src/Project/Bundles.php
new file mode 100755
index 0000000..06e5a02
--- /dev/null
+++ b/src/Project/Bundles.php
@@ -0,0 +1,18 @@
+<?php
+
+namespace Project;
+
+class Bundles extends \PHPixie\BundleFramework\Bundles
+{
+ protected function buildBundles()
+ {
+ return array(
+ new Project\App($this->builder);
+ );
+ }
+
+ protected function getRootFolder()
+ {
+ return realpath(__DIR__.'/../../');
+ }
+} \ No newline at end of file
diff --git a/src/Project/PHPixie.php b/src/Project/PHPixie.php
deleted file mode 100644
index 95defe2..0000000
--- a/src/Project/PHPixie.php
+++ /dev/null
@@ -1,8 +0,0 @@
-<?php
-
-namespace Project;
-
-class PHPixie extends \PHPixie\Framework
-{
-
-} \ No newline at end of file
diff --git a/src/Project/PHPixie/Bundles.php b/src/Project/PHPixie/Bundles.php
deleted file mode 100644
index a33947b..0000000
--- a/src/Project/PHPixie/Bundles.php
+++ /dev/null
@@ -1,11 +0,0 @@
-<?php
-
-namespace Project;
-
-class Bundles extends \PHPixie\Framework\Bundles
-{
- protected function buildHello()
- {
- return new \Project\Hello($this->);
- }
-} \ No newline at end of file
diff --git a/src/Project/PHPixie/ORM/Wrappers.php b/src/Project/PHPixie/ORM/Wrappers.php
deleted file mode 100644
index e69de29..0000000
--- a/src/Project/PHPixie/ORM/Wrappers.php
+++ /dev/null