@@ -19,6 +19,6 @@ |
||
19 | 19 | { |
20 | 20 | $config = $serviceLocator->getServiceLocator()->get('Config'); |
21 | 21 | |
22 | - return new IndexController(isset($config['pagination_data']) ? $config['pagination_data'] : []); |
|
22 | + return new IndexController(isset($config[ 'pagination_data' ]) ? $config[ 'pagination_data' ] : [ ]); |
|
23 | 23 | } |
24 | 24 | } |
@@ -38,7 +38,7 @@ discard block |
||
38 | 38 | $this->request = $request; |
39 | 39 | } |
40 | 40 | |
41 | - public function __invoke($name = null, $params = [], $options = [], $reuseMatchedParams = false) |
|
41 | + public function __invoke($name = null, $params = [ ], $options = [ ], $reuseMatchedParams = false) |
|
42 | 42 | { |
43 | 43 | if (null === $this->router) { |
44 | 44 | throw new Exception\RuntimeException('No RouteStackInterface instance provided'); |
@@ -46,14 +46,14 @@ discard block |
||
46 | 46 | |
47 | 47 | if (3 === func_num_args() && is_bool($options)) { |
48 | 48 | $reuseMatchedParams = $options; |
49 | - $options = []; |
|
49 | + $options = [ ]; |
|
50 | 50 | } |
51 | 51 | |
52 | 52 | // Inherit query parameters |
53 | 53 | if ($reuseMatchedParams) { |
54 | - $providedQueryParams = isset($options['query']) ? $options['query'] : []; |
|
54 | + $providedQueryParams = isset($options[ 'query' ]) ? $options[ 'query' ] : [ ]; |
|
55 | 55 | $currentQueryParams = $this->request->getQuery()->toArray(); |
56 | - $options['query'] = array_merge($currentQueryParams, $providedQueryParams); |
|
56 | + $options[ 'query' ] = array_merge($currentQueryParams, $providedQueryParams); |
|
57 | 57 | } |
58 | 58 | |
59 | 59 | return parent::__invoke($name, $params, $options, $reuseMatchedParams); |
@@ -45,7 +45,7 @@ |
||
45 | 45 | 'reloadService' => 'LearnZF2Themes\Service\ReloadService', |
46 | 46 | ], |
47 | 47 | ], |
48 | - 'theme' => [ |
|
48 | + 'theme' => [ |
|
49 | 49 | 'name' => 'default', |
50 | 50 | ], |
51 | 51 | ]; |
@@ -33,14 +33,14 @@ |
||
33 | 33 | { |
34 | 34 | $path = __DIR__.'/../../../themes/'; |
35 | 35 | $dir = new DirectoryIterator($path); |
36 | - $themesConfig = []; |
|
36 | + $themesConfig = [ ]; |
|
37 | 37 | |
38 | 38 | foreach ($dir as $file) { |
39 | 39 | if (!$file->isDot()) { |
40 | 40 | $hasConfig = $path.$file->getBasename().'/config/module.config.php'; |
41 | 41 | |
42 | 42 | if (is_file($hasConfig)) { |
43 | - $themesConfig['themes'][$file->getBasename()] = include $hasConfig; |
|
43 | + $themesConfig[ 'themes' ][ $file->getBasename() ] = include $hasConfig; |
|
44 | 44 | } |
45 | 45 | } |
46 | 46 | } |
@@ -35,7 +35,7 @@ discard block |
||
35 | 35 | $config = $serviceLocator->get('Config'); |
36 | 36 | $headScript = $serviceLocator->get('ViewHelperManager')->get('HeadScript'); |
37 | 37 | $headLink = $serviceLocator->get('ViewHelperManager')->get('headLink'); |
38 | - $publicDir = '/themes/'.$config['theme']['name'].DIRECTORY_SEPARATOR; |
|
38 | + $publicDir = '/themes/'.$config[ 'theme' ][ 'name' ].DIRECTORY_SEPARATOR; |
|
39 | 39 | |
40 | 40 | /* |
41 | 41 | * Get theme name from config and load it. |
@@ -44,22 +44,22 @@ discard block |
||
44 | 44 | * from indexAction. |
45 | 45 | */ |
46 | 46 | $viewTemplate = $serviceLocator->get('ViewTemplatePathStack'); |
47 | - $themes = $themesConfig['themes'][$config['theme']['name']]; |
|
47 | + $themes = $themesConfig[ 'themes' ][ $config[ 'theme' ][ 'name' ] ]; |
|
48 | 48 | |
49 | - if (isset($themes['template_path_stack'])) { |
|
50 | - $viewTemplate->addPaths($themes['template_path_stack']); |
|
49 | + if (isset($themes[ 'template_path_stack' ])) { |
|
50 | + $viewTemplate->addPaths($themes[ 'template_path_stack' ]); |
|
51 | 51 | } |
52 | 52 | |
53 | - if (isset($themes['template_map'])) { |
|
53 | + if (isset($themes[ 'template_map' ])) { |
|
54 | 54 | $viewTemplate = $serviceLocator->get('ViewTemplateMapResolver'); |
55 | - $viewTemplate->merge($themes['template_map']); |
|
55 | + $viewTemplate->merge($themes[ 'template_map' ]); |
|
56 | 56 | } |
57 | 57 | |
58 | - foreach ($themes['css'] as $key => $file) { |
|
58 | + foreach ($themes[ 'css' ] as $key => $file) { |
|
59 | 59 | $headLink->prependStylesheet($publicDir.$file); |
60 | 60 | } |
61 | 61 | |
62 | - foreach ($themes['js'] as $key => $file) { |
|
62 | + foreach ($themes[ 'js' ] as $key => $file) { |
|
63 | 63 | $headScript->prependFile($publicDir.$file); |
64 | 64 | } |
65 | 65 |
@@ -1,3 +1,3 @@ |
||
1 | 1 | <?php |
2 | 2 | |
3 | -return []; |
|
3 | +return [ ]; |
@@ -1,3 +1,3 @@ |
||
1 | 1 | <?php |
2 | 2 | |
3 | -return []; |
|
3 | +return [ ]; |
@@ -1,3 +1,3 @@ |
||
1 | 1 | <?php |
2 | 2 | |
3 | -return []; |
|
3 | +return [ ]; |
@@ -1,10 +1,10 @@ |
||
1 | 1 | <?php |
2 | 2 | /** |
3 | - * Configuration file generated by ZFTool |
|
4 | - * The previous configuration file is stored in application.config.old |
|
5 | - * |
|
6 | - * @see https://github.com/zendframework/ZFTool |
|
7 | - */ |
|
3 | + * Configuration file generated by ZFTool |
|
4 | + * The previous configuration file is stored in application.config.old |
|
5 | + * |
|
6 | + * @see https://github.com/zendframework/ZFTool |
|
7 | + */ |
|
8 | 8 | return [ |
9 | 9 | 'modules' => [ |
10 | 10 | 'Application', |