summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--bundles/.gitkeep (renamed from bundles/app/web/.gitkeep)0
-rwxr-xr-xbundles/app/assets/config/routeResolver.php17
-rwxr-xr-xbundles/app/assets/config/templateLocator.php6
-rw-r--r--bundles/app/assets/templates/greet.php3
-rwxr-xr-xbundles/app/assets/templates/layout.php10
-rwxr-xr-xbundles/app/src/Project/App.php19
-rwxr-xr-xbundles/app/src/Project/App/Builder.php54
-rw-r--r--bundles/app/src/Project/App/Console.php37
-rw-r--r--bundles/app/src/Project/App/Console/Greet.php23
-rwxr-xr-xbundles/app/src/Project/App/HTTPProcessor.php33
-rwxr-xr-xbundles/app/src/Project/App/HTTPProcessors/Greet.php35
-rwxr-xr-xbundles/app/src/Project/App/ORMWrappers.php17
-rwxr-xr-xcomposer.json5
-rwxr-xr-xsrc/Project/Framework/Bundles.php4
14 files changed, 3 insertions, 260 deletions
diff --git a/bundles/app/web/.gitkeep b/bundles/.gitkeep
index e69de29..e69de29 100644
--- a/bundles/app/web/.gitkeep
+++ b/bundles/.gitkeep
diff --git a/bundles/app/assets/config/routeResolver.php b/bundles/app/assets/config/routeResolver.php
deleted file mode 100755
index bd8b9cd..0000000
--- a/bundles/app/assets/config/routeResolver.php
+++ /dev/null
@@ -1,17 +0,0 @@
-<?php
-
-return array(
- 'type' => 'group',
- 'resolvers' => array(
-
- 'default' => array(
- 'type' => 'pattern',
- 'path' => '(<processor>(/<action>))',
- 'defaults' => array(
- 'processor' => 'greet',
- 'action' => 'default'
- )
- )
-
- )
-);
diff --git a/bundles/app/assets/config/templateLocator.php b/bundles/app/assets/config/templateLocator.php
deleted file mode 100755
index d2aceb8..0000000
--- a/bundles/app/assets/config/templateLocator.php
+++ /dev/null
@@ -1,6 +0,0 @@
-<?php
-
-return array(
- 'type' => 'directory',
- 'directory' => 'templates'
-); \ No newline at end of file
diff --git a/bundles/app/assets/templates/greet.php b/bundles/app/assets/templates/greet.php
deleted file mode 100644
index 7ee3a70..0000000
--- a/bundles/app/assets/templates/greet.php
+++ /dev/null
@@ -1,3 +0,0 @@
-<?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
deleted file mode 100755
index bc0c165..0000000
--- a/bundles/app/assets/templates/layout.php
+++ /dev/null
@@ -1,10 +0,0 @@
-<!DOCTYPE html>
-<html>
- <head>
- <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
deleted file mode 100755
index b346f94..0000000
--- a/bundles/app/src/Project/App.php
+++ /dev/null
@@ -1,19 +0,0 @@
-<?php
-
-namespace Project;
-
-/**
- * Default application bundle
- */
-class App extends \PHPixie\DefaultBundle
-{
- /**
- * Build bundle builder
- * @param \PHPixie\BundleFramework\Builder $frameworkBuilder
- * @return App\Builder
- */
- 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
deleted file mode 100755
index 0b1079f..0000000
--- a/bundles/app/src/Project/App/Builder.php
+++ /dev/null
@@ -1,54 +0,0 @@
-<?php
-
-namespace Project\App;
-
-/**
- * App bundle builder
- */
-class Builder extends \PHPixie\DefaultBundle\Builder
-{
- /**
- * Build Processor for HTTP requests
- * @return HTTPProcessor
- */
- protected function buildHttpProcessor()
- {
- return new HTTPProcessor($this);
- }
-
- /**
- * Build ORM Wrappers
- * @return ORMWrappers
- */
- protected function buildORMWrappers()
- {
- return new ORMWrappers($this);
- }
-
- /**
- * Build Console command registry
- * @return ConsoleCommands
- */
- protected function buildConsoleProvider()
- {
- return new Console($this);
- }
-
- /**
- * Get bundle root directory
- * @return string
- */
- protected function getRootDirectory()
- {
- return realpath(__DIR__.'/../../../');
- }
-
- /**
- * Get bundle name
- * @return string
- */
- public function bundleName()
- {
- return 'app';
- }
-} \ No newline at end of file
diff --git a/bundles/app/src/Project/App/Console.php b/bundles/app/src/Project/App/Console.php
deleted file mode 100644
index 26153aa..0000000
--- a/bundles/app/src/Project/App/Console.php
+++ /dev/null
@@ -1,37 +0,0 @@
-<?php
-
-namespace Project\App;
-
-class Console extends \PHPixie\DefaultBundle\Console
-{
- /**
- * @var Builder
- */
- protected $builder;
-
- /**
- * Constructor
- * @param Builder $builder
- */
- public function __construct($builder)
- {
- $this->builder = $builder;
- }
-
- public function commandNames()
- {
- return array('greet');
- }
-
- /**
- * Build 'greet' command
- *
- * @param \PHPixie\Console\Command\Config $commandConfig
- *
- * @return Console\Greet
- */
- protected function buildGreetCommand($commandConfig)
- {
- return new Console\Greet($commandConfig);
- }
-} \ No newline at end of file
diff --git a/bundles/app/src/Project/App/Console/Greet.php b/bundles/app/src/Project/App/Console/Greet.php
deleted file mode 100644
index 54e0c78..0000000
--- a/bundles/app/src/Project/App/Console/Greet.php
+++ /dev/null
@@ -1,23 +0,0 @@
-<?php
-
-namespace Project\App\Console;
-
-class Greet extends \PHPixie\Console\Command\Implementation
-{
- public function __construct($config)
- {
- $config
- ->description('Greet the user');
-
- $config->argument('message')
- ->description("Message to display");
-
- parent::__construct($config);
- }
-
- public function run($argumentData, $optionData)
- {
- $message = $argumentData->get('message', "Have fun coding!");
- $this->writeLine($message);
- }
-} \ No newline at end of file
diff --git a/bundles/app/src/Project/App/HTTPProcessor.php b/bundles/app/src/Project/App/HTTPProcessor.php
deleted file mode 100755
index f8ede3d..0000000
--- a/bundles/app/src/Project/App/HTTPProcessor.php
+++ /dev/null
@@ -1,33 +0,0 @@
-<?php
-
-namespace Project\App;
-
-class HTTPProcessor extends \PHPixie\DefaultBundle\Processor\HTTP\Builder
-{
- /**
- * @var Builder
- */
- protected $builder;
-
- /**
- * Constructor
- * @param Builder $builder
- */
- public function __construct($builder)
- {
- $this->builder = $builder;
- }
-
- /**
- * Build 'greet' processor
- * @return HTTPProcessors\Greet
- */
- protected function buildGreetProcessor()
- {
- $components = $this->builder->components();
-
- return new HTTPProcessors\Greet(
- $components->template()
- );
- }
-} \ No newline at end of file
diff --git a/bundles/app/src/Project/App/HTTPProcessors/Greet.php b/bundles/app/src/Project/App/HTTPProcessors/Greet.php
deleted file mode 100755
index 2d38205..0000000
--- a/bundles/app/src/Project/App/HTTPProcessors/Greet.php
+++ /dev/null
@@ -1,35 +0,0 @@
-<?php
-
-namespace Project\App\HTTPProcessors;
-
-use PHPixie\HTTP\Request;
-use PHPixie\Template;
-
-class Greet extends \PHPixie\DefaultBundle\Processor\HTTP\Actions
-{
- /**
- * @var Template Template component
- */
- protected $template;
-
- /**
- * Constructor
- * @param Template $template
- */
- public function __construct($template)
- {
- $this->template = $template;
- }
-
- /**
- * Default action
- * @param Request $request HTTP request
- * @return Template\Container
- */
- public function defaultAction($request)
- {
- $container = $this->template->get('app:greet');
- $container->message = "Have fun coding!";
- return $container;
- }
-} \ No newline at end of file
diff --git a/bundles/app/src/Project/App/ORMWrappers.php b/bundles/app/src/Project/App/ORMWrappers.php
deleted file mode 100755
index bb5b995..0000000
--- a/bundles/app/src/Project/App/ORMWrappers.php
+++ /dev/null
@@ -1,17 +0,0 @@
-<?php
-
-namespace Project\App;
-
-/**
- * Here you can define wrappers for the ORM to use.
- */
-class ORMWrappers extends \PHPixie\ORM\Wrappers\Implementation
-{
- /**
- * Array of model names that have custom Entity wrappers
- * @var array
- */
- protected $databaseEntities = array(
-
- );
-} \ No newline at end of file
diff --git a/composer.json b/composer.json
index 4539b34..f48b2ba 100755
--- a/composer.json
+++ b/composer.json
@@ -7,10 +7,7 @@
"psr-4": {
"": [
"src/",
- "tests/",
-
- "bundles/app/src/",
- "bundles/app/tests/"
+ "tests/"
]
}
},
diff --git a/src/Project/Framework/Bundles.php b/src/Project/Framework/Bundles.php
index 9f4cce4..bf6734a 100755
--- a/src/Project/Framework/Bundles.php
+++ b/src/Project/Framework/Bundles.php
@@ -15,8 +15,8 @@ class Bundles extends \PHPixie\BundleFramework\Bundles
protected function buildBundles()
{
return array(
- new \PHPixie\FrameworkBundle($this->builder),
- new \Project\App($this->builder)
+ new \PHPixie\FrameworkBundle($this->builder)
+ /*GeneratorPlaceholder*/
);
}
} \ No newline at end of file