@@ -20,7 +20,7 @@ |
||
20 | 20 | /** |
21 | 21 | * Read configuration from file or array'. |
22 | 22 | * |
23 | - * @param array/string $what is an array with key/value config options or a file |
|
23 | + * @param string $what is an array with key/value config options or a file |
|
24 | 24 | * to be included which returns such an array. |
25 | 25 | * @return $this for chaining. |
26 | 26 | */ |
@@ -13,7 +13,7 @@ |
||
13 | 13 | * Properties |
14 | 14 | * |
15 | 15 | */ |
16 | - private $config = []; // Store all config as an array |
|
16 | + private $config = []; // Store all config as an array |
|
17 | 17 | |
18 | 18 | |
19 | 19 |
@@ -28,11 +28,9 @@ |
||
28 | 28 | { |
29 | 29 | if (is_array($what)) { |
30 | 30 | $options = $what; |
31 | - } |
|
32 | - elseif (is_readable($what)) { |
|
31 | + } elseif (is_readable($what)) { |
|
33 | 32 | $options = include $what; |
34 | - } |
|
35 | - else { |
|
33 | + } else { |
|
36 | 34 | throw new Exception("Configure item '" . htmlentities($what) |
37 | 35 | . "' is not an array nor a readable file."); |
38 | 36 | } |
@@ -133,7 +133,7 @@ |
||
133 | 133 | * |
134 | 134 | * @param string $region which region to check |
135 | 135 | * |
136 | - * @return $this |
|
136 | + * @return boolean |
|
137 | 137 | */ |
138 | 138 | public function hasContent($region) |
139 | 139 | { |
@@ -17,8 +17,8 @@ discard block |
||
17 | 17 | * |
18 | 18 | */ |
19 | 19 | private $views = []; // Array for all views |
20 | - private $suffix; // Template file suffix |
|
21 | - private $path; // Base path for views |
|
20 | + private $suffix; // Template file suffix |
|
21 | + private $path; // Base path for views |
|
22 | 22 | |
23 | 23 | |
24 | 24 | |
@@ -155,7 +155,7 @@ discard block |
||
155 | 155 | return $this; |
156 | 156 | } |
157 | 157 | |
158 | - mergesort($this->views[$region], function ($a, $b) { |
|
158 | + mergesort($this->views[$region], function($a, $b) { |
|
159 | 159 | $sa = $a->sortOrder(); |
160 | 160 | $sb = $b->sortOrder(); |
161 | 161 |
@@ -341,6 +341,10 @@ |
||
341 | 341 | return $file; |
342 | 342 | } |
343 | 343 | |
344 | + /** |
|
345 | + * @param string $class |
|
346 | + * @param string $ext |
|
347 | + */ |
|
344 | 348 | private function findFileWithExtension($class, $ext) |
345 | 349 | { |
346 | 350 | // PSR-4 lookup |
@@ -4,11 +4,11 @@ |
||
4 | 4 | |
5 | 5 | <p>How many rolls do you want to do, <a href='<?=$this->url->create("dice/roll?roll=1")?>'>1 roll</a>, <a href='<?=$this->url->create("dice/roll?roll=3")?>'>3 rolls</a> or <a href='<?=$this->url->create("dice/roll?roll=6")?>'>6 rolls</a>? </p> |
6 | 6 | |
7 | -<?php if(isset($roll)) : ?> |
|
7 | +<?php if (isset($roll)) : ?> |
|
8 | 8 | <p>You made <?=$roll?> roll(s) and you got this serie.</p> |
9 | 9 | |
10 | 10 | <ul class='dice'> |
11 | -<?php foreach($results as $val) : ?> |
|
11 | +<?php foreach ($results as $val) : ?> |
|
12 | 12 | <li class='dice-<?=$val?>'></li> |
13 | 13 | <?php endforeach; ?> |
14 | 14 | </ul> |
@@ -10,9 +10,9 @@ |
||
10 | 10 | { |
11 | 11 | |
12 | 12 | /** |
13 | - * Properties |
|
14 | - * |
|
15 | - */ |
|
13 | + * Properties |
|
14 | + * |
|
15 | + */ |
|
16 | 16 | private $lastRoll = []; |
17 | 17 | |
18 | 18 |
@@ -14,9 +14,9 @@ |
||
14 | 14 | call_user_func(function() { |
15 | 15 | $loader = new \Anax\Loader\CPsr4Autoloader(); |
16 | 16 | $loader->addNameSpace('Anax', ANAX_INSTALL_PATH . 'src') |
17 | - ->addNameSpace('', ANAX_APP_PATH . 'src') |
|
18 | - ->addNameSpace('Michelf', ANAX_INSTALL_PATH . '3pp/php-markdown/Michelf') |
|
19 | - ->register(); |
|
17 | + ->addNameSpace('', ANAX_APP_PATH . 'src') |
|
18 | + ->addNameSpace('Michelf', ANAX_INSTALL_PATH . '3pp/php-markdown/Michelf') |
|
19 | + ->register(); |
|
20 | 20 | }); |
21 | 21 | |
22 | 22 |
@@ -26,7 +26,7 @@ |
||
26 | 26 | * |
27 | 27 | * @link https://getcomposer.org/doc/01-basic-usage.md#autoloading |
28 | 28 | */ |
29 | -if(is_file(ANAX_INSTALL_PATH . 'vendor/autoload.php')) { |
|
29 | +if (is_file(ANAX_INSTALL_PATH . 'vendor/autoload.php')) { |
|
30 | 30 | include ANAX_INSTALL_PATH . 'vendor/autoload.php'; |
31 | 31 | } |
32 | 32 |
@@ -8,8 +8,8 @@ discard block |
||
8 | 8 | * Set the error reporting. |
9 | 9 | * |
10 | 10 | */ |
11 | -error_reporting(-1); // Report all type of errors |
|
12 | -ini_set('display_errors', 1); // Display all errors |
|
11 | +error_reporting(-1); // Report all type of errors |
|
12 | +ini_set('display_errors', 1); // Display all errors |
|
13 | 13 | |
14 | 14 | |
15 | 15 | |
@@ -17,7 +17,7 @@ discard block |
||
17 | 17 | * Default exception handler. |
18 | 18 | * |
19 | 19 | */ |
20 | -set_exception_handler(function ($e) { |
|
20 | +set_exception_handler(function($e) { |
|
21 | 21 | echo "Anax: Uncaught exception: <p>" |
22 | 22 | . $e->getMessage() |
23 | 23 | . "</p><p>Code: " |
@@ -9,5 +9,5 @@ |
||
9 | 9 | * |
10 | 10 | */ |
11 | 11 | define('ANAX_INSTALL_PATH', realpath(__DIR__ . '/../../') . '/'); |
12 | -define('ANAX_APP_PATH', ANAX_INSTALL_PATH . 'app/'); |
|
12 | +define('ANAX_APP_PATH', ANAX_INSTALL_PATH . 'app/'); |
|
13 | 13 |
@@ -96,11 +96,11 @@ |
||
96 | 96 | |
97 | 97 | |
98 | 98 | |
99 | - /** |
|
99 | + /** |
|
100 | 100 | * Callback to create the url, if needed, else comment out. |
101 | 101 | * |
102 | 102 | */ |
103 | - /* |
|
103 | + /* |
|
104 | 104 | 'create_url' => function ($url) { |
105 | 105 | return $this->di->get('url')->create($url); |
106 | 106 | }, |
@@ -76,7 +76,7 @@ discard block |
||
76 | 76 | * Callback tracing the current selected menu item base on scriptname |
77 | 77 | * |
78 | 78 | */ |
79 | - 'callback' => function ($url) { |
|
79 | + 'callback' => function($url) { |
|
80 | 80 | if ($url == $this->di->get('request')->getCurrentUrl(false)) { |
81 | 81 | return true; |
82 | 82 | } |
@@ -89,7 +89,7 @@ discard block |
||
89 | 89 | * menuitems that has the setting 'mark-if-parent' set to true. |
90 | 90 | * |
91 | 91 | */ |
92 | - 'is_parent' => function ($parent) { |
|
92 | + 'is_parent' => function($parent) { |
|
93 | 93 | $route = $this->di->get('request')->getRoute(); |
94 | 94 | return !substr_compare($parent, $route, 0, strlen($parent)); |
95 | 95 | }, |