diff options
| -rwxr-xr-x | .gitignore | 5 | ||||
| -rwxr-xr-x | assets/config.php | 0 | ||||
| -rwxr-xr-x | assets/config/http.php | 22 | ||||
| -rwxr-xr-x | assets/config/routeResolver.php | 6 | ||||
| -rwxr-xr-x | bundles/app/assets/config/routeResolver.php | 10 | ||||
| -rwxr-xr-x | bundles/app/assets/config/templateLocator.php | 6 | ||||
| -rwxr-xr-x | bundles/app/assets/templates/hello/greet.php (renamed from bundles/app/assets/templates/hello.php) | 6 | ||||
| -rwxr-xr-x | bundles/app/assets/templates/layout.php | 3 | ||||
| -rwxr-xr-x | bundles/app/src/Project/App.php | 5 | ||||
| -rwxr-xr-x | bundles/app/src/Project/App/Builder.php | 9 | ||||
| -rwxr-xr-x | bundles/app/src/Project/App/HTTPProcessor.php | 16 | ||||
| -rwxr-xr-x | bundles/app/src/Project/App/HTTPProcessors/Hello.php | 19 | ||||
| -rwxr-xr-x | composer.json | 27 | ||||
| -rwxr-xr-x | composer.lock | 942 | ||||
| -rwxr-xr-x | src/Project.php | 9 | ||||
| -rwxr-xr-x | src/Project/Builder.php | 0 | ||||
| -rw-r--r-- | src/Project/Framework.php | 10 | ||||
| -rw-r--r-- | src/Project/Framework/Builder.php | 16 | ||||
| -rw-r--r--[-rwxr-xr-x] | src/Project/Framework/Bundles.php (renamed from src/Project/Bundles.php) | 4 | ||||
| -rw-r--r-- | web/.htaccess | 4 | ||||
| l--------- | web/bundles/app | 1 | ||||
| -rwxr-xr-x | web/index.php | 6 |
22 files changed, 137 insertions, 989 deletions
@@ -1,6 +1,3 @@ composer.phar vendor/ - -# Commit your application's lock file http://getcomposer.org/doc/01-basic-usage.md#composer-lock-the-lock-file -# You may choose to ignore a library lock file http://getcomposer.org/doc/02-libraries.md#lock-file -# composer.lock +composer.lock diff --git a/assets/config.php b/assets/config.php deleted file mode 100755 index e69de29..0000000 --- a/assets/config.php +++ /dev/null diff --git a/assets/config/http.php b/assets/config/http.php index 455e975..f23f231 100755 --- a/assets/config/http.php +++ b/assets/config/http.php @@ -3,5 +3,27 @@ return array( 'translator' => array( 'basePath' => '/' + ), + 'resolver' => array( + 'type' => 'group', + 'resolvers' => array( + 'app' => array( + 'type' => 'prefix', + 'pattern' => '/', + 'defaults' => array( + 'bundle' => 'app' + ), + 'resolver' => array( + 'type' => 'mount', + 'name' => 'app' + ) + ) + ) + ), + 'exceptionResponse' => array( + 'template' => 'framework:http/exception' + ), + 'notFoundResponse' => array( + 'template' => 'framework:http/notFound' ) );
\ No newline at end of file diff --git a/assets/config/routeResolver.php b/assets/config/routeResolver.php deleted file mode 100755 index d54c36e..0000000 --- a/assets/config/routeResolver.php +++ /dev/null @@ -1,6 +0,0 @@ -<?php - -return array( - 'type' => 'mount', - 'name' => 'app' -);
\ No newline at end of file diff --git a/bundles/app/assets/config/routeResolver.php b/bundles/app/assets/config/routeResolver.php new file mode 100755 index 0000000..3f369a9 --- /dev/null +++ b/bundles/app/assets/config/routeResolver.php @@ -0,0 +1,10 @@ +<?php
+
+return array(
+ 'type' => 'pattern',
+ 'path' => '(<processor>(/<action>))',
+ 'defaults' => array(
+ 'processor' => 'hello',
+ 'action' => 'greet'
+ )
+);
\ No newline at end of file diff --git a/bundles/app/assets/config/templateLocator.php b/bundles/app/assets/config/templateLocator.php new file mode 100755 index 0000000..d2aceb8 --- /dev/null +++ b/bundles/app/assets/config/templateLocator.php @@ -0,0 +1,6 @@ +<?php
+
+return array(
+ 'type' => 'directory',
+ 'directory' => 'templates'
+);
\ No newline at end of file diff --git a/bundles/app/assets/templates/hello.php b/bundles/app/assets/templates/hello/greet.php index 234ddb7..bbb1ca0 100755 --- a/bundles/app/assets/templates/hello.php +++ b/bundles/app/assets/templates/hello/greet.php @@ -1,3 +1,3 @@ -<?php $this->layout('app:layout');?> - -<h1><?=$_($message); ?></h1>
\ No newline at end of file +<?php $this->layout('app:layout');?>
+
+<h2><?=$_($message); ?></h2>
\ No newline at end of file diff --git a/bundles/app/assets/templates/layout.php b/bundles/app/assets/templates/layout.php index b5d65d4..bc0c165 100755 --- a/bundles/app/assets/templates/layout.php +++ b/bundles/app/assets/templates/layout.php @@ -1,9 +1,10 @@ <!DOCTYPE html> <html> <head> - <title>PHPixie</title> + <title>PHPixie 3.0</title> </head> <body> + <h1>PHPixie 3.0</h1> <?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 index 468bb35..6c86cd7 100755 --- a/bundles/app/src/Project/App.php +++ b/bundles/app/src/Project/App.php @@ -8,4 +8,9 @@ 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 83b5a99..028724c 100755 --- a/bundles/app/src/Project/App/Builder.php +++ b/bundles/app/src/Project/App/Builder.php @@ -4,8 +4,13 @@ namespace Project\App; class Builder extends \PHPixie\DefaultBundle\Builder { - protected function httpProcessor() + protected function buildHttpProcessor() { - return new HTTPPRocessor(); + return new HTTPProcessor($this); + } + + protected function getRootDirectory() + { + return realpath(__DIR__.'/../../../'); } }
\ No newline at end of file diff --git a/bundles/app/src/Project/App/HTTPProcessor.php b/bundles/app/src/Project/App/HTTPProcessor.php index 7d7b19f..13aac9c 100755 --- a/bundles/app/src/Project/App/HTTPProcessor.php +++ b/bundles/app/src/Project/App/HTTPProcessor.php @@ -2,10 +2,22 @@ namespace Project\App; -class HTTPProcessor extends \PHPixie\DefaultBundle\Builder +class HTTPProcessor extends \PHPixie\DefaultBundle\Processor\HTTP\Builder { + protected $builder; + protected $attribute = 'processor'; + + public function __construct($builder) + { + $this->builder = $builder; + } + protected function buildHelloProcessor() { - new HTTPProcessors\Hello(); + $components = $this->builder->components(); + + return new HTTPProcessors\Hello( + $components->template() + ); } }
\ 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 index cb0d181..b0bb56a 100755 --- a/bundles/app/src/Project/App/HTTPProcessors/Hello.php +++ b/bundles/app/src/Project/App/HTTPProcessors/Hello.php @@ -1,20 +1,21 @@ <?php -namespace Project\App\Processors\HTTP; +namespace Project\App\HTTPProcessors; -class Hello extends PHPixie\DefaultBundle\Processor\HTTP\Actions +class Hello extends \PHPixie\DefaultBundle\Processor\HTTP\Actions { - protected $builder; + protected $template; + protected $attribute = 'action'; - public function __construct($builder) + public function __construct($template) { - $this->builder = $builder; + $this->template = $template; } - public function process($request) + public function greetAction($request) { - $template = $this->template->container('app:hello'); - $template->message = "Have fun coding!"; - return $template; + $container = $this->template->get('app:hello/greet'); + $container->message = "Have fun coding!"; + return $container; } }
\ No newline at end of file diff --git a/composer.json b/composer.json index 1db2908..4f0f38b 100755 --- a/composer.json +++ b/composer.json @@ -1,4 +1,16 @@ { + "name": "phpixie/project", + "type": "project", + "description" : "PHPixie skeleton project", + "license" : "BSD", + "autoload": { + "psr-4": { + "": [ + "src/", + "bundles/app/src/" + ] + } + }, "require": { "phpixie/default-bundle": "3.*@dev", "phpixie/bundle-framework": "3.*@dev", @@ -20,12 +32,9 @@ "require-dev": { "phpixie/test": "3.*@dev" }, - "autoload": { - "psr-4": { - "Project\\": [ - "src/Project", - "bundles/app/src/Project" - ] - } - } -} + "extra": { + "branch-alias": { + "dev-master": "3.*-dev" + } + } +}
\ No newline at end of file diff --git a/composer.lock b/composer.lock deleted file mode 100755 index 7d1e1f2..0000000 --- a/composer.lock +++ /dev/null @@ -1,942 +0,0 @@ -{ - "_readme": [ - "This file locks the dependencies of your project to a known state", - "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#composer-lock-the-lock-file", - "This file is @generated automatically" - ], - "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": { - "type": "git", - "url": "https://github.com/PHPixie/Config.git", - "reference": "87386ef0bbc7ce961826b23b195bb1b9e9b42f20" - }, - "dist": { - "type": "zip", - "url": "https://api.github.com/repos/PHPixie/Config/zipball/87386ef0bbc7ce961826b23b195bb1b9e9b42f20", - "reference": "87386ef0bbc7ce961826b23b195bb1b9e9b42f20", - "shasum": "" - }, - "require": { - "phpixie/slice": "3.*@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 Configuration library", - "homepage": "http://phpixie.com", - "keywords": [ - "config", - "configuration" - ], - "time": "2015-04-26 00:32:50" - }, - { - "name": "phpixie/database", - "version": "dev-master", - "source": { - "type": "git", - "url": "https://github.com/PHPixie/Database.git", - "reference": "514bdbaec35a22281c70f71c5b50370a6e5434c3" - }, - "dist": { - "type": "zip", - "url": "https://api.github.com/repos/PHPixie/Database/zipball/514bdbaec35a22281c70f71c5b50370a6e5434c3", - "reference": "514bdbaec35a22281c70f71c5b50370a6e5434c3", - "shasum": "" - }, - "require": { - "phpixie/slice": "3.*@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 Database library", - "homepage": "http://phpixie.com", - "keywords": [ - "database", - "mysql", - "postgresql", - "sqlite" - ], - "time": "2015-03-15 22:04:35" - }, - { - "name": "phpixie/debug", - "version": "dev-master", - "source": { - "type": "git", - "url": "https://github.com/PHPixie/Debug.git", - "reference": "6d44fc346e1041fca3d599de79f791cd58de49fa" - }, - "dist": { - "type": "zip", - "url": "https://api.github.com/repos/PHPixie/Debug/zipball/6d44fc346e1041fca3d599de79f791cd58de49fa", - "reference": "6d44fc346e1041fca3d599de79f791cd58de49fa", - "shasum": "" - }, - "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": "Debugging library for PHPixie with support for logging and tracing", - "homepage": "http://phpixie.com", - "keywords": [ - "debug", - "dump", - "log", - "trace" - ], - "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": { - "type": "git", - "url": "https://github.com/PHPixie/Filesystem.git", - "reference": "4bf8ef5c5690bb30a5554226df44545a82d736b1" - }, - "dist": { - "type": "zip", - "url": "https://api.github.com/repos/PHPixie/Filesystem/zipball/4bf8ef5c5690bb30a5554226df44545a82d736b1", - "reference": "4bf8ef5c5690bb30a5554226df44545a82d736b1", - "shasum": "" - }, - "require": { - "phpixie/slice": "3.*@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": "Filesystem wrappers for PHPixie", - "homepage": "http://phpixie.com", - "keywords": [ - "file", - "filesystem" - ], - "time": "2015-06-05 15:23:54" - }, - { - "name": "phpixie/framework", - "version": "dev-master", - "source": { - "type": "git", - "url": "https://github.com/PHPixie/Framework.git", - "reference": "af45ef23d7edaf0fb3c95d68f96ffa6e2b71754d" - }, - "dist": { - "type": "zip", - "url": "https://api.github.com/repos/PHPixie/Framework/zipball/af45ef23d7edaf0fb3c95d68f96ffa6e2b71754d", - "reference": "af45ef23d7edaf0fb3c95d68f96ffa6e2b71754d", - "shasum": "" - }, - "require": { - "phpixie/config": "3.*@dev", - "phpixie/database": "3.*@dev", - "phpixie/debug": "3.*@dev", - "phpixie/filesystem": "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 Framework", - "homepage": "http://phpixie.com", - "keywords": [ - "processors" - ], - "time": "2015-07-07 16:08:01" - }, - { - "name": "phpixie/http", - "version": "dev-master", - "source": { - "type": "git", - "url": "https://github.com/PHPixie/HTTP.git", - "reference": "b2696997b385eef9c2333a749e325e76d51bd970" - }, - "dist": { - "type": "zip", - "url": "https://api.github.com/repos/PHPixie/HTTP/zipball/b2696997b385eef9c2333a749e325e76d51bd970", - "reference": "b2696997b385eef9c2333a749e325e76d51bd970", - "shasum": "" - }, - "require": { - "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": "HTTP library for PHPixie, implements the PSR-7 standard", - "homepage": "http://phpixie.com", - "keywords": [ - "http", - "psr-7" - ], - "time": "2015-06-24 16:01:18" - }, - { - "name": "phpixie/http-processors", - "version": "dev-master", - "source": { - "type": "git", - "url": "https://github.com/PHPixie/HTTP-Processors.git", - "reference": "0a7ed23ee1957a5f5d8de8861f87acc0dee3db89" - }, - "dist": { - "type": "zip", - "url": "https://api.github.com/repos/PHPixie/HTTP-Processors/zipball/0a7ed23ee1957a5f5d8de8861f87acc0dee3db89", - "reference": "0a7ed23ee1957a5f5d8de8861f87acc0dee3db89", - "shasum": "" - }, - "require": { - "phpixie/http": "3.*@dev", - "phpixie/processors": "3.*@dev", - "phpixie/slice": "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": "Processors library for PHPixie", - "homepage": "http://phpixie.com", - "keywords": [ - "processors" - ], - "time": "2015-07-01 11:37:00" - }, - { - "name": "phpixie/orm", - "version": "dev-master", - "source": { - "type": "git", - "url": "https://github.com/PHPixie/ORM.git", - "reference": "5e8fa70c16800773bae066246d27e68f304add76" - }, - "dist": { - "type": "zip", - "url": "https://api.github.com/repos/PHPixie/ORM/zipball/5e8fa70c16800773bae066246d27e68f304add76", - "reference": "5e8fa70c16800773bae066246d27e68f304add76", - "shasum": "" - }, - "require": { - "phpixie/database": "3.*@dev", - "phpixie/slice": "3.*@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": "ORM library for PHPixie", - "homepage": "http://phpixie.com", - "keywords": [ - "database", - "orm" - ], - "time": "2015-06-12 15:15:33" - }, - { - "name": "phpixie/processors", - "version": "dev-master", - "source": { - "type": "git", - "url": "https://github.com/PHPixie/Processors.git", - "reference": "2aa1be44ac034f38b959d307d4e32f8dcb736601" - }, - "dist": { - "type": "zip", - "url": "https://api.github.com/repos/PHPixie/Processors/zipball/2aa1be44ac034f38b959d307d4e32f8dcb736601", - "reference": "2aa1be44ac034f38b959d307d4e32f8dcb736601", - "shasum": "" - }, - "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": "Processors library for PHPixie", - "homepage": "http://phpixie.com", - "keywords": [ - "Chain", - "processors" - ], - "time": "2015-06-30 11:38:39" - }, - { - "name": "phpixie/route", - "version": "dev-master", - "source": { - "type": "git", - "url": "https://github.com/PHPixie/Route.git", - "reference": "6f64c58d02789e67d4aa81b6be434934e3394b83" - }, - "dist": { - "type": "zip", - "url": "https://api.github.com/repos/PHPixie/Route/zipball/6f64c58d02789e67d4aa81b6be434934e3394b83", - "reference": "6f64c58d02789e67d4aa81b6be434934e3394b83", - "shasum": "" - }, - "require": { - "phpixie/http": "3.*@dev", - "phpixie/slice": "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": "Routing library for PHPixie", - "homepage": "http://phpixie.com", - "keywords": [ - "route", - "router", - "routing" - ], - "time": "2015-06-05 15:29:19" - }, - { - "name": "phpixie/slice", - "version": "dev-master", - "source": { - "type": "git", - "url": "https://github.com/PHPixie/Slice.git", - "reference": "ab9d4b4eaac1f948ebb93a71849dbfe44cbea1f6" - }, - "dist": { - "type": "zip", - "url": "https://api.github.com/repos/PHPixie/Slice/zipball/ab9d4b4eaac1f948ebb93a71849dbfe44cbea1f6", - "reference": "ab9d4b4eaac1f948ebb93a71849dbfe44cbea1f6", - "shasum": "" - }, - "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": "Slice library for PHPixie", - "homepage": "http://phpixie.com", - "keywords": [ - "array", - "data", - "parameters" - ], - "time": "2015-04-19 00:49:02" - }, - { - "name": "phpixie/template", - "version": "dev-master", - "source": { - "type": "git", - "url": "https://github.com/PHPixie/Template.git", - "reference": "a8db854c8ecff3ed7d65c932c0473b5bd914a757" - }, - "dist": { - "type": "zip", - "url": "https://api.github.com/repos/PHPixie/Template/zipball/a8db854c8ecff3ed7d65c932c0473b5bd914a757", - "reference": "a8db854c8ecff3ed7d65c932c0473b5bd914a757", - "shasum": "" - }, - "require": { - "phpixie/filesystem": "3.*@dev", - "phpixie/slice": "3.*@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": "Templating library for PHPixie", - "homepage": "http://phpixie.com", - "keywords": [ - "template", - "templating" - ], - "time": "2015-07-02 20:31:04" - }, - { - "name": "psr/http-message", - "version": "dev-master", - "source": { - "type": "git", - "url": "https://github.com/php-fig/http-message.git", - "reference": "85d63699f0dbedb190bbd4b0d2b9dc707ea4c298" - }, - "dist": { - "type": "zip", - "url": "https://api.github.com/repos/php-fig/http-message/zipball/85d63699f0dbedb190bbd4b0d2b9dc707ea4c298", - "reference": "85d63699f0dbedb190bbd4b0d2b9dc707ea4c298", - "shasum": "" - }, - "require": { - "php": ">=5.3.0" - }, - "type": "library", - "extra": { - "branch-alias": { - "dev-master": "1.0.x-dev" - } - }, - "autoload": { - "psr-4": { - "Psr\\Http\\Message\\": "src/" - } - }, - "notification-url": "https://packagist.org/downloads/", - "license": [ - "MIT" - ], - "authors": [ - { - "name": "PHP-FIG", - "homepage": "http://www.php-fig.org/" - } - ], - "description": "Common interface for HTTP messages", - "keywords": [ - "http", - "http-message", - "psr", - "psr-7", - "request", - "response" - ], - "time": "2015-05-04 20:22:00" - } - ], - "packages-dev": [ - { - "name": "phpixie/test", - "version": "dev-master", - "source": { - "type": "git", - "url": "https://github.com/PHPixie/Test.git", - "reference": "9663d651392185ace889fef15e7809a7bd302348" - }, - "dist": { - "type": "zip", - "url": "https://api.github.com/repos/PHPixie/Test/zipball/9663d651392185ace889fef15e7809a7bd302348", - "reference": "9663d651392185ace889fef15e7809a7bd302348", - "shasum": "" - }, - "type": "library", - "extra": { - "branch-alias": { - "dev-master": "3.x-dev" - } - }, - "autoload": { - "psr-0": { - "PHPixie": "src/" - } - }, - "notification-url": "https://packagist.org/downloads/", - "license": [ - "BSD" - ], - "authors": [ - { - "name": "Roman Tsiupa", - "email": "draconyster@gmail.com", - "homepage": "http://dracony.org" - } - ], - "description": "Testing library for PHPixie", - "homepage": "http://phpixie.com", - "keywords": [ - "phpunit", - "test" - ], - "time": "2015-03-09 13:46:41" - } - ], - "aliases": [], - "minimum-stability": "stable", - "stability-flags": { - "phpixie/default-bundle": 20, - "phpixie/bundle-framework": 20, - "phpixie/bundles": 20, - "phpixie/framework": 20, - "phpixie/debug": 20, - "phpixie/route": 20, - "phpixie/template": 20, - "phpixie/filesystem": 20, - "phpixie/database": 20, - "phpixie/config": 20, - "phpixie/orm": 20, - "phpixie/slice": 20, - "phpixie/processors": 20, - "phpixie/http": 20, - "psr/http-message": 20, - "phpixie/http-processors": 20, - "phpixie/test": 20 - }, - "prefer-stable": false, - "prefer-lowest": false, - "platform": [], - "platform-dev": [] -} diff --git a/src/Project.php b/src/Project.php deleted file mode 100755 index 491fe1f..0000000 --- a/src/Project.php +++ /dev/null @@ -1,9 +0,0 @@ -<?php - -class Project extends \PHPixie\BundleFramework -{ - protected function buildBuilder() - { - return new Project\Builder(); - } -}
\ No newline at end of file diff --git a/src/Project/Builder.php b/src/Project/Builder.php deleted file mode 100755 index e69de29..0000000 --- a/src/Project/Builder.php +++ /dev/null diff --git a/src/Project/Framework.php b/src/Project/Framework.php new file mode 100644 index 0000000..c71b85a --- /dev/null +++ b/src/Project/Framework.php @@ -0,0 +1,10 @@ +<?php +namespace Project; + +class Framework extends \PHPixie\BundleFramework +{ + protected function buildBuilder() + { + return new Framework\Builder(); + } +}
\ No newline at end of file diff --git a/src/Project/Framework/Builder.php b/src/Project/Framework/Builder.php new file mode 100644 index 0000000..a6654f9 --- /dev/null +++ b/src/Project/Framework/Builder.php @@ -0,0 +1,16 @@ +<?php + +namespace Project\Framework; + +class Builder extends \PHPixie\BundleFramework\Builder +{ + protected function buildBundles() + { + return new Bundles($this); + } + + protected function getRootDirectory() + { + return realpath(__DIR__.'/../../../'); + } +}
\ No newline at end of file diff --git a/src/Project/Bundles.php b/src/Project/Framework/Bundles.php index 06e5a02..52a7c31 100755..100644 --- a/src/Project/Bundles.php +++ b/src/Project/Framework/Bundles.php @@ -1,13 +1,13 @@ <?php -namespace Project; +namespace Project\Framework; class Bundles extends \PHPixie\BundleFramework\Bundles { protected function buildBundles() { return array( - new Project\App($this->builder); + new \Project\App($this->builder) ); } diff --git a/web/.htaccess b/web/.htaccess new file mode 100644 index 0000000..7a997c4 --- /dev/null +++ b/web/.htaccess @@ -0,0 +1,4 @@ +RewriteEngine On +RewriteBase / +RewriteCond %{REQUEST_FILENAME} !-f +RewriteRule .* index.php [PT,L,QSA]
\ No newline at end of file diff --git a/web/bundles/app b/web/bundles/app new file mode 120000 index 0000000..0f32a9c --- /dev/null +++ b/web/bundles/app @@ -0,0 +1 @@ +../../bundles/app/web
\ No newline at end of file diff --git a/web/index.php b/web/index.php new file mode 100755 index 0000000..48c1dd7 --- /dev/null +++ b/web/index.php @@ -0,0 +1,6 @@ +<?php
+
+require_once(__DIR__.'/../vendor/autoload.php');
+
+$framework = new Project\Framework();
+$framework->processHttpSapiRequest();
\ No newline at end of file |