@@ -25,7 +25,7 @@ |
||
25 | 25 | ]; |
26 | 26 | |
27 | 27 | $items = array(); |
28 | - for($i = 0; $i < $args['count']; $i++) { |
|
28 | + for ($i = 0; $i < $args['count']; $i++) { |
|
29 | 29 | $item['name'] = "Item $i"; |
30 | 30 | $items[] = $item; |
31 | 31 | } |
@@ -3,10 +3,10 @@ discard block |
||
3 | 3 | |
4 | 4 | class Grid extends \erdiko\Controller |
5 | 5 | { |
6 | - public function __invoke($request, $response, $args) |
|
7 | - { |
|
6 | + public function __invoke($request, $response, $args) |
|
7 | + { |
|
8 | 8 | $this->container->logger->debug("/controller"); |
9 | - $view = 'pages/grid.html'; |
|
9 | + $view = 'pages/grid.html'; |
|
10 | 10 | |
11 | 11 | // Get erdiko config, this gets application.json and loads the theme specified |
12 | 12 | $config = \erdiko\theme\Config::get(); |
@@ -29,6 +29,6 @@ discard block |
||
29 | 29 | } |
30 | 30 | $config['items'] = $items; |
31 | 31 | |
32 | - return $this->container->theme->render($response, $view, $config); |
|
33 | - } |
|
32 | + return $this->container->theme->render($response, $view, $config); |
|
33 | + } |
|
34 | 34 | } |
35 | 35 | \ No newline at end of file |
@@ -60,10 +60,10 @@ |
||
60 | 60 | 'name' => "Item" |
61 | 61 | ]; |
62 | 62 | $items = array(); |
63 | - $max = (int)$args['param']; |
|
63 | + $max = (int) $args['param']; |
|
64 | 64 | $this->container->logger->debug("param: ".$max); |
65 | 65 | |
66 | - for($i = 0; $i < $max; $i++) { |
|
66 | + for ($i = 0; $i < $max; $i++) { |
|
67 | 67 | $item['name'] = "Item $i"; |
68 | 68 | $items[] = $item; |
69 | 69 | } |
@@ -12,8 +12,8 @@ discard block |
||
12 | 12 | $response = $this->runApp('GET', '/'); |
13 | 13 | |
14 | 14 | $this->assertEquals(200, $response->getStatusCode()); |
15 | - $this->assertContains('SlimFramework', (string)$response->getBody()); |
|
16 | - $this->assertNotContains('Hello', (string)$response->getBody()); |
|
15 | + $this->assertContains('SlimFramework', (string) $response->getBody()); |
|
16 | + $this->assertNotContains('Hello', (string) $response->getBody()); |
|
17 | 17 | } |
18 | 18 | |
19 | 19 | /** |
@@ -24,7 +24,7 @@ discard block |
||
24 | 24 | $response = $this->runApp('GET', '/name'); |
25 | 25 | |
26 | 26 | $this->assertEquals(200, $response->getStatusCode()); |
27 | - $this->assertContains('Hello name!', (string)$response->getBody()); |
|
27 | + $this->assertContains('Hello name!', (string) $response->getBody()); |
|
28 | 28 | } |
29 | 29 | |
30 | 30 | /** |
@@ -35,6 +35,6 @@ discard block |
||
35 | 35 | $response = $this->runApp('POST', '/', ['test']); |
36 | 36 | |
37 | 37 | $this->assertEquals(405, $response->getStatusCode()); |
38 | - $this->assertContains('Method not allowed', (string)$response->getBody()); |
|
38 | + $this->assertContains('Method not allowed', (string) $response->getBody()); |
|
39 | 39 | } |
40 | 40 | } |
41 | 41 | \ No newline at end of file |
@@ -52,21 +52,21 @@ |
||
52 | 52 | $response = new Response(); |
53 | 53 | |
54 | 54 | // Use the application settings |
55 | - $settings = require __DIR__ . '/../../src/settings.php'; |
|
55 | + $settings = require __DIR__.'/../../src/settings.php'; |
|
56 | 56 | |
57 | 57 | // Instantiate the application |
58 | 58 | $app = new App($settings); |
59 | 59 | |
60 | 60 | // Set up dependencies |
61 | - require __DIR__ . '/../../src/dependencies.php'; |
|
61 | + require __DIR__.'/../../src/dependencies.php'; |
|
62 | 62 | |
63 | 63 | // Register middleware |
64 | 64 | if ($this->withMiddleware) { |
65 | - require __DIR__ . '/../../src/middleware.php'; |
|
65 | + require __DIR__.'/../../src/middleware.php'; |
|
66 | 66 | } |
67 | 67 | |
68 | 68 | // Register routes |
69 | - require __DIR__ . '/../../src/routes.php'; |
|
69 | + require __DIR__.'/../../src/routes.php'; |
|
70 | 70 | |
71 | 71 | // Process the application |
72 | 72 | $response = $app->process($request, $response); |
@@ -3,10 +3,10 @@ discard block |
||
3 | 3 | |
4 | 4 | class Config extends \erdiko\Controller |
5 | 5 | { |
6 | - public function __invoke($request, $response, $args) |
|
7 | - { |
|
6 | + public function __invoke($request, $response, $args) |
|
7 | + { |
|
8 | 8 | $this->container->logger->debug("route: /config"); |
9 | - $view = 'pages/config.html'; |
|
9 | + $view = 'pages/config.html'; |
|
10 | 10 | |
11 | 11 | // Get erdiko config, this gets application.json and loads the theme specified |
12 | 12 | $config = \erdiko\theme\Config::get(); |
@@ -16,6 +16,6 @@ discard block |
||
16 | 16 | // $theme->title = "Dump Config"; |
17 | 17 | // (array)$theme; Config::get(), ['page'] = array(); |
18 | 18 | |
19 | - return $this->container->theme->render($response, $view, $config); |
|
20 | - } |
|
19 | + return $this->container->theme->render($response, $view, $config); |
|
20 | + } |
|
21 | 21 | } |
22 | 22 | \ No newline at end of file |
@@ -10,8 +10,8 @@ |
||
10 | 10 | |
11 | 11 | // Bootstrap erdiko (& composer) |
12 | 12 | define('ERDIKO_ROOT', dirname(__DIR__)); // @todo move, perhaps use a setenv? |
13 | -require ERDIKO_ROOT . '/vendor/erdiko/core/bootstrap.php'; |
|
14 | -require ERDIKO_ROOT . '/vendor/erdiko/core/session.php'; // @todo put somewhere else? |
|
13 | +require ERDIKO_ROOT.'/vendor/erdiko/core/bootstrap.php'; |
|
14 | +require ERDIKO_ROOT.'/vendor/erdiko/core/session.php'; // @todo put somewhere else? |
|
15 | 15 | |
16 | 16 | // Instantiate the app (autoloads the context settings) |
17 | 17 | $app = new \erdiko\App(); |
@@ -1,9 +1,9 @@ |
||
1 | 1 | <?php |
2 | 2 | // Set up dependencies |
3 | -require_once __DIR__ . '/bootstrap/dependencies.php'; |
|
3 | +require_once __DIR__.'/bootstrap/dependencies.php'; |
|
4 | 4 | |
5 | 5 | // Register middleware |
6 | -require_once __DIR__ . '/bootstrap/middleware.php'; |
|
6 | +require_once __DIR__.'/bootstrap/middleware.php'; |
|
7 | 7 | |
8 | 8 | // Register routes |
9 | -require_once __DIR__ . '/bootstrap/routes.php'; |
|
9 | +require_once __DIR__.'/bootstrap/routes.php'; |
@@ -13,7 +13,7 @@ |
||
13 | 13 | // Monolog settings |
14 | 14 | 'logger' => [ |
15 | 15 | 'name' => 'erdiko-default', |
16 | - 'path' => ERDIKO_ROOT . '/var/logs/app.log', |
|
16 | + 'path' => ERDIKO_ROOT.'/var/logs/app.log', |
|
17 | 17 | 'level' => \Monolog\Logger::DEBUG, |
18 | 18 | ], |
19 | 19 |
@@ -3,7 +3,7 @@ discard block |
||
3 | 3 | $container = $app->getContainer(); |
4 | 4 | |
5 | 5 | // Monolog |
6 | -$container['logger'] = function ($container) { |
|
6 | +$container['logger'] = function($container) { |
|
7 | 7 | $settings = $container->get('settings')['logger']; |
8 | 8 | $logger = new Monolog\Logger($settings['name']); |
9 | 9 | $logger->pushProcessor(new Monolog\Processor\UidProcessor()); |
@@ -12,12 +12,12 @@ discard block |
||
12 | 12 | }; |
13 | 13 | |
14 | 14 | // Register flash provider |
15 | -$container['flash'] = function () { |
|
15 | +$container['flash'] = function() { |
|
16 | 16 | return new \Slim\Flash\Messages(); |
17 | 17 | }; |
18 | 18 | |
19 | 19 | // Theme view (erdiko, twig) |
20 | -$container['theme'] = function ($container) { |
|
20 | +$container['theme'] = function($container) { |
|
21 | 21 | $settings = $container->get('settings')['theme']; |
22 | 22 | $view = new \Slim\Views\Twig($settings['templates'], [ |
23 | 23 | 'debug' => $settings['debug'], |
@@ -34,15 +34,15 @@ discard block |
||
34 | 34 | new Slim\Flash\Messages |
35 | 35 | )); |
36 | 36 | |
37 | - if($settings['debug'] == true) |
|
37 | + if ($settings['debug'] == true) |
|
38 | 38 | $view->addExtension(new \Twig_Extension_Debug()); |
39 | 39 | |
40 | 40 | return $view; |
41 | 41 | }; |
42 | 42 | |
43 | 43 | // 404 Handler |
44 | -$container['notFoundHandler'] = function ($container) { |
|
45 | - return function ($request, $response) use ($container) { |
|
44 | +$container['notFoundHandler'] = function($container) { |
|
45 | + return function($request, $response) use ($container) { |
|
46 | 46 | $themeData = \erdiko\theme\Config::get(); |
47 | 47 | return $container['theme']->render($response->withStatus(404), '404.html', $themeData); |
48 | 48 | }; |
@@ -34,8 +34,9 @@ |
||
34 | 34 | new Slim\Flash\Messages |
35 | 35 | )); |
36 | 36 | |
37 | - if($settings['debug'] == true) |
|
38 | - $view->addExtension(new \Twig_Extension_Debug()); |
|
37 | + if($settings['debug'] == true) { |
|
38 | + $view->addExtension(new \Twig_Extension_Debug()); |
|
39 | + } |
|
39 | 40 | |
40 | 41 | return $view; |
41 | 42 | }; |