@@ -7,7 +7,7 @@ |
||
7 | 7 | |
8 | 8 | if (!function_exists('read_json_file')) { |
9 | 9 | function read_json_file($path) { |
10 | - return json_decode(file_get_contents($path), true); |
|
10 | + return json_decode(file_get_contents($path), true); |
|
11 | 11 | } |
12 | 12 | } |
13 | 13 |
@@ -13,13 +13,13 @@ |
||
13 | 13 | */ |
14 | 14 | class HttpService implements Provider |
15 | 15 | { |
16 | - public function register(Container $container) |
|
17 | - { |
|
16 | + public function register(Container $container) |
|
17 | + { |
|
18 | 18 | $container->register(array( |
19 | - 'Darya\Http\Request' => function ($container) { |
|
20 | - return Request::createFromGlobals($container->resolve('Darya\Http\Session')); |
|
21 | - }, |
|
22 | - 'Darya\Http\Session' => new PhpSession |
|
23 | - )); |
|
24 | - } |
|
19 | + 'Darya\Http\Request' => function ($container) { |
|
20 | + return Request::createFromGlobals($container->resolve('Darya\Http\Session')); |
|
21 | + }, |
|
22 | + 'Darya\Http\Session' => new PhpSession |
|
23 | + )); |
|
24 | + } |
|
25 | 25 | } |
@@ -16,7 +16,7 @@ |
||
16 | 16 | public function register(Container $container) |
17 | 17 | { |
18 | 18 | $container->register(array( |
19 | - 'Darya\Http\Request' => function ($container) { |
|
19 | + 'Darya\Http\Request' => function($container) { |
|
20 | 20 | return Request::createFromGlobals($container->resolve('Darya\Http\Session')); |
21 | 21 | }, |
22 | 22 | 'Darya\Http\Session' => new PhpSession |
@@ -14,23 +14,23 @@ |
||
14 | 14 | */ |
15 | 15 | class MySqlService implements Provider |
16 | 16 | { |
17 | - public function register(Container $container) |
|
18 | - { |
|
19 | - $container->register(array( |
|
20 | - 'Darya\Database\Connection' => function ($container) { |
|
21 | - $config = $container->config; |
|
17 | + public function register(Container $container) |
|
18 | + { |
|
19 | + $container->register(array( |
|
20 | + 'Darya\Database\Connection' => function ($container) { |
|
21 | + $config = $container->config; |
|
22 | 22 | |
23 | - $connection = new MySql( |
|
24 | - $config['database.hostname'], |
|
25 | - $config['database.username'], |
|
26 | - $config['database.password'], |
|
27 | - $config['database.database'] |
|
28 | - ); |
|
23 | + $connection = new MySql( |
|
24 | + $config['database.hostname'], |
|
25 | + $config['database.username'], |
|
26 | + $config['database.password'], |
|
27 | + $config['database.database'] |
|
28 | + ); |
|
29 | 29 | |
30 | - $connection->setEventDispatcher($container->event); |
|
30 | + $connection->setEventDispatcher($container->event); |
|
31 | 31 | |
32 | - return $connection; |
|
33 | - } |
|
34 | - )); |
|
35 | - } |
|
32 | + return $connection; |
|
33 | + } |
|
34 | + )); |
|
35 | + } |
|
36 | 36 | } |
@@ -17,7 +17,7 @@ |
||
17 | 17 | public function register(Container $container) |
18 | 18 | { |
19 | 19 | $container->register(array( |
20 | - 'Darya\Database\Connection' => function ($container) { |
|
20 | + 'Darya\Database\Connection' => function($container) { |
|
21 | 21 | $config = $container->config; |
22 | 22 | |
23 | 23 | $connection = new MySql( |
@@ -16,22 +16,22 @@ |
||
16 | 16 | */ |
17 | 17 | class DatabaseStorageService implements Provider |
18 | 18 | { |
19 | - public function register(Container $container) |
|
20 | - { |
|
21 | - $container->register(array( |
|
22 | - 'Darya\Database\Storage' => function ($container) { |
|
23 | - return new Storage($container->resolve('Darya\Database\Connection')); |
|
24 | - }, |
|
25 | - 'Darya\Storage\Readable' => 'Darya\Database\Storage', |
|
26 | - 'Darya\Storage\Modifiable' => 'Darya\Database\Storage', |
|
27 | - 'Darya\Storage\Searchable' => 'Darya\Database\Storage', |
|
28 | - 'Darya\Storage\Queryable' => 'Darya\Database\Storage', |
|
29 | - 'Darya\Storage\Aggregational' => 'Darya\Database\Storage' |
|
30 | - )); |
|
31 | - } |
|
19 | + public function register(Container $container) |
|
20 | + { |
|
21 | + $container->register(array( |
|
22 | + 'Darya\Database\Storage' => function ($container) { |
|
23 | + return new Storage($container->resolve('Darya\Database\Connection')); |
|
24 | + }, |
|
25 | + 'Darya\Storage\Readable' => 'Darya\Database\Storage', |
|
26 | + 'Darya\Storage\Modifiable' => 'Darya\Database\Storage', |
|
27 | + 'Darya\Storage\Searchable' => 'Darya\Database\Storage', |
|
28 | + 'Darya\Storage\Queryable' => 'Darya\Database\Storage', |
|
29 | + 'Darya\Storage\Aggregational' => 'Darya\Database\Storage' |
|
30 | + )); |
|
31 | + } |
|
32 | 32 | |
33 | - public function boot(Storage $storage) |
|
34 | - { |
|
35 | - Record::setSharedStorage($storage); |
|
36 | - } |
|
33 | + public function boot(Storage $storage) |
|
34 | + { |
|
35 | + Record::setSharedStorage($storage); |
|
36 | + } |
|
37 | 37 | } |
@@ -19,7 +19,7 @@ |
||
19 | 19 | public function register(Container $container) |
20 | 20 | { |
21 | 21 | $container->register(array( |
22 | - 'Darya\Database\Storage' => function ($container) { |
|
22 | + 'Darya\Database\Storage' => function($container) { |
|
23 | 23 | return new Storage($container->resolve('Darya\Database\Connection')); |
24 | 24 | }, |
25 | 25 | 'Darya\Storage\Readable' => 'Darya\Database\Storage', |
@@ -12,29 +12,29 @@ |
||
12 | 12 | */ |
13 | 13 | class SmartyViewService implements Provider |
14 | 14 | { |
15 | - public function register(Container $container) |
|
16 | - { |
|
15 | + public function register(Container $container) |
|
16 | + { |
|
17 | 17 | $container->register(array( |
18 | - 'Darya\Smarty\ViewResolver' => function ($container) { |
|
18 | + 'Darya\Smarty\ViewResolver' => function ($container) { |
|
19 | 19 | $config = $container->config; |
20 | 20 | $basePath = $config['project.base_path']; |
21 | 21 | $realBasePath = realpath("{$basePath}/views"); |
22 | 22 | |
23 | - $viewResolver = new ViewResolver('Darya\Smarty\View', $realBasePath); |
|
23 | + $viewResolver = new ViewResolver('Darya\Smarty\View', $realBasePath); |
|
24 | 24 | |
25 | - $viewResolver->shareConfig(array( |
|
26 | - 'base' => $realBasePath, |
|
27 | - 'cache' => '../storage/cache', |
|
28 | - 'compile' => '../storage/views' |
|
29 | - )); |
|
25 | + $viewResolver->shareConfig(array( |
|
26 | + 'base' => $realBasePath, |
|
27 | + 'cache' => '../storage/cache', |
|
28 | + 'compile' => '../storage/views' |
|
29 | + )); |
|
30 | 30 | |
31 | - $viewResolver->share(array( |
|
32 | - 'config' => $container->config |
|
33 | - )); |
|
31 | + $viewResolver->share(array( |
|
32 | + 'config' => $container->config |
|
33 | + )); |
|
34 | 34 | |
35 | - return $viewResolver; |
|
36 | - }, |
|
37 | - 'Darya\View\Resolver' => 'Darya\Smarty\ViewResolver' |
|
38 | - )); |
|
39 | - } |
|
35 | + return $viewResolver; |
|
36 | + }, |
|
37 | + 'Darya\View\Resolver' => 'Darya\Smarty\ViewResolver' |
|
38 | + )); |
|
39 | + } |
|
40 | 40 | } |
41 | 41 | \ No newline at end of file |
@@ -15,7 +15,7 @@ |
||
15 | 15 | public function register(Container $container) |
16 | 16 | { |
17 | 17 | $container->register(array( |
18 | - 'Darya\Smarty\ViewResolver' => function ($container) { |
|
18 | + 'Darya\Smarty\ViewResolver' => function($container) { |
|
19 | 19 | $config = $container->config; |
20 | 20 | $basePath = $config['project.base_path']; |
21 | 21 | $realBasePath = realpath("{$basePath}/views"); |
@@ -12,35 +12,35 @@ |
||
12 | 12 | */ |
13 | 13 | class RoutingService implements Provider |
14 | 14 | { |
15 | - public function register(Container $container) |
|
16 | - { |
|
17 | - $container->register(array( |
|
18 | - 'Darya\Routing\Router' => function ($container) { |
|
19 | - $config = $container->config; |
|
15 | + public function register(Container $container) |
|
16 | + { |
|
17 | + $container->register(array( |
|
18 | + 'Darya\Routing\Router' => function ($container) { |
|
19 | + $config = $container->config; |
|
20 | 20 | |
21 | - $routes = $config['routes'] ?: array( |
|
22 | - '/:controller/:action/:params' => null, |
|
23 | - '/:controller/:params' => null, |
|
24 | - '/:action/:params' => null, |
|
25 | - '/' => null |
|
26 | - ); |
|
21 | + $routes = $config['routes'] ?: array( |
|
22 | + '/:controller/:action/:params' => null, |
|
23 | + '/:controller/:params' => null, |
|
24 | + '/:action/:params' => null, |
|
25 | + '/' => null |
|
26 | + ); |
|
27 | 27 | |
28 | - $projectNamespace = $config['project.namespace'] ?: 'Application'; |
|
28 | + $projectNamespace = $config['project.namespace'] ?: 'Application'; |
|
29 | 29 | |
30 | - $defaultNamespace = "{$projectNamespace}\Controllers"; |
|
30 | + $defaultNamespace = "{$projectNamespace}\Controllers"; |
|
31 | 31 | |
32 | - $router = new Router($routes, array( |
|
33 | - 'namespace' => $defaultNamespace |
|
34 | - )); |
|
32 | + $router = new Router($routes, array( |
|
33 | + 'namespace' => $defaultNamespace |
|
34 | + )); |
|
35 | 35 | |
36 | - $router->base($config['base_url']); |
|
36 | + $router->base($config['base_url']); |
|
37 | 37 | |
38 | - $router->setServiceContainer($container); |
|
38 | + $router->setServiceContainer($container); |
|
39 | 39 | |
40 | - $router->setEventDispatcher($container->resolve('Darya\Events\Dispatchable')); |
|
40 | + $router->setEventDispatcher($container->resolve('Darya\Events\Dispatchable')); |
|
41 | 41 | |
42 | - return $router; |
|
43 | - } |
|
44 | - )); |
|
45 | - } |
|
42 | + return $router; |
|
43 | + } |
|
44 | + )); |
|
45 | + } |
|
46 | 46 | } |
@@ -15,7 +15,7 @@ |
||
15 | 15 | public function register(Container $container) |
16 | 16 | { |
17 | 17 | $container->register(array( |
18 | - 'Darya\Routing\Router' => function ($container) { |
|
18 | + 'Darya\Routing\Router' => function($container) { |
|
19 | 19 | $config = $container->config; |
20 | 20 | |
21 | 21 | $routes = $config['routes'] ?: array( |
@@ -15,39 +15,39 @@ |
||
15 | 15 | */ |
16 | 16 | class ErrorHandlerService implements Provider |
17 | 17 | { |
18 | - /** |
|
19 | - * @var ViewResolver |
|
20 | - */ |
|
21 | - protected $view; |
|
18 | + /** |
|
19 | + * @var ViewResolver |
|
20 | + */ |
|
21 | + protected $view; |
|
22 | 22 | |
23 | - public function __construct(ViewResolver $view) |
|
24 | - { |
|
25 | - $this->view = $view; |
|
26 | - } |
|
23 | + public function __construct(ViewResolver $view) |
|
24 | + { |
|
25 | + $this->view = $view; |
|
26 | + } |
|
27 | 27 | |
28 | - public function handle(Request $request, Response $response) |
|
29 | - { |
|
30 | - $status = $response->status(); |
|
28 | + public function handle(Request $request, Response $response) |
|
29 | + { |
|
30 | + $status = $response->status(); |
|
31 | 31 | |
32 | - if ($this->view->exists("error/$status")) { |
|
32 | + if ($this->view->exists("error/$status")) { |
|
33 | 33 | $response->content($this->view->create("error/$status", array( |
34 | 34 | 'http_host' => $request->host(), |
35 | 35 | 'request_uri' => $request->path(), |
36 | 36 | 'signature' => $request->server('server_signature') |
37 | 37 | ))); |
38 | - } else { |
|
39 | - $response->content("$status error."); |
|
40 | - } |
|
38 | + } else { |
|
39 | + $response->content("$status error."); |
|
40 | + } |
|
41 | 41 | |
42 | - return $response; |
|
43 | - } |
|
42 | + return $response; |
|
43 | + } |
|
44 | 44 | |
45 | - public function register(Container $container) |
|
46 | - { |
|
47 | - } |
|
45 | + public function register(Container $container) |
|
46 | + { |
|
47 | + } |
|
48 | 48 | |
49 | - public function boot(Router $router) |
|
50 | - { |
|
51 | - $router->setErrorHandler(array($this, 'handle')); |
|
52 | - } |
|
49 | + public function boot(Router $router) |
|
50 | + { |
|
51 | + $router->setErrorHandler(array($this, 'handle')); |
|
52 | + } |
|
53 | 53 | } |