@@ -52,7 +52,7 @@ discard block |
||
| 52 | 52 | * |
| 53 | 53 | * @param string $templateIdent The template ID. |
| 54 | 54 | * @throws InvalidArgumentException If the template identifier is not a string. |
| 55 | - * @return ViewableInterface Chainable |
|
| 55 | + * @return ViewableTrait Chainable |
|
| 56 | 56 | */ |
| 57 | 57 | public function setTemplateIdent($templateIdent) |
| 58 | 58 | { |
@@ -80,9 +80,9 @@ discard block |
||
| 80 | 80 | /** |
| 81 | 81 | * Set the renderable view. |
| 82 | 82 | * |
| 83 | - * @param ViewInterface|array $view The view instance to use to render. |
|
| 83 | + * @param ViewInterface $view The view instance to use to render. |
|
| 84 | 84 | * @throws InvalidArgumentException If the view parameter is not an array or a View object. |
| 85 | - * @return ViewableInterface Chainable |
|
| 85 | + * @return ViewableTrait Chainable |
|
| 86 | 86 | */ |
| 87 | 87 | public function setView(ViewInterface $view) |
| 88 | 88 | { |
@@ -135,7 +135,7 @@ discard block |
||
| 135 | 135 | * |
| 136 | 136 | * @param ViewableInterface|object|array|null $controller A view controller to use when rendering. |
| 137 | 137 | * @throws InvalidArgumentException If the controller is invalid. |
| 138 | - * @return ViewableInterface Chainable |
|
| 138 | + * @return ViewableTrait Chainable |
|
| 139 | 139 | */ |
| 140 | 140 | public function setViewController($controller) |
| 141 | 141 | { |
@@ -12,7 +12,6 @@ |
||
| 12 | 12 | use Charcoal\View\Mustache\MustacheLoader; |
| 13 | 13 | use Charcoal\View\Php\PhpEngine; |
| 14 | 14 | use Charcoal\View\Php\PhpLoader; |
| 15 | -use Charcoal\View\PhpMustache\PhpMustacheEngine; |
|
| 16 | 15 | use Charcoal\View\Twig\TwigEngine; |
| 17 | 16 | use Charcoal\View\Twig\TwigLoader; |
| 18 | 17 | use Charcoal\View\Renderer; |
@@ -75,7 +75,7 @@ discard block |
||
| 75 | 75 | * @param Container $container A container instance. |
| 76 | 76 | * @return ViewConfig |
| 77 | 77 | */ |
| 78 | - $container['view/config'] = function (Container $container) { |
|
| 78 | + $container['view/config'] = function(Container $container) { |
|
| 79 | 79 | $config = $container['config']['view']; |
| 80 | 80 | |
| 81 | 81 | return new ViewConfig($config); |
@@ -92,7 +92,7 @@ discard block |
||
| 92 | 92 | * @param Container $container A container instance. |
| 93 | 93 | * @return array The view loader dependencies array. |
| 94 | 94 | */ |
| 95 | - $container['view/loader/dependencies'] = function (Container $container) { |
|
| 95 | + $container['view/loader/dependencies'] = function(Container $container) { |
|
| 96 | 96 | return [ |
| 97 | 97 | 'logger' => $container['logger'], |
| 98 | 98 | 'base_path' => $container['config']['base_path'], |
@@ -104,7 +104,7 @@ discard block |
||
| 104 | 104 | * @param Container $container A container instance. |
| 105 | 105 | * @return MustacheLoader |
| 106 | 106 | */ |
| 107 | - $container['view/loader/mustache'] = function (Container $container) { |
|
| 107 | + $container['view/loader/mustache'] = function(Container $container) { |
|
| 108 | 108 | return new MustacheLoader($container['view/loader/dependencies']); |
| 109 | 109 | }; |
| 110 | 110 | |
@@ -112,7 +112,7 @@ discard block |
||
| 112 | 112 | * @param Container $container A container instance. |
| 113 | 113 | * @return PhpLoader |
| 114 | 114 | */ |
| 115 | - $container['view/loader/php'] = function (Container $container) { |
|
| 115 | + $container['view/loader/php'] = function(Container $container) { |
|
| 116 | 116 | return new PhpLoader($container['view/loader/dependencies']); |
| 117 | 117 | }; |
| 118 | 118 | |
@@ -120,7 +120,7 @@ discard block |
||
| 120 | 120 | * @param Container $container A container instance. |
| 121 | 121 | * @return TwigLoader |
| 122 | 122 | */ |
| 123 | - $container['view/loader/twig'] = function (Container $container) { |
|
| 123 | + $container['view/loader/twig'] = function(Container $container) { |
|
| 124 | 124 | return new TwigLoader($container['view/loader/dependencies']); |
| 125 | 125 | }; |
| 126 | 126 | } |
@@ -135,7 +135,7 @@ discard block |
||
| 135 | 135 | * @param Container $container A container instance. |
| 136 | 136 | * @return array The engine dependencies array. |
| 137 | 137 | */ |
| 138 | - $container['view/engine/dependencies'] = function (Container $container) { |
|
| 138 | + $container['view/engine/dependencies'] = function(Container $container) { |
|
| 139 | 139 | return [ |
| 140 | 140 | 'logger' => $container['logger'], |
| 141 | 141 | 'cache' => null, |
@@ -147,7 +147,7 @@ discard block |
||
| 147 | 147 | * @param Container $container A container instance. |
| 148 | 148 | * @return MustacheEngine |
| 149 | 149 | */ |
| 150 | - $container['view/engine/mustache'] = function (Container $container) { |
|
| 150 | + $container['view/engine/mustache'] = function(Container $container) { |
|
| 151 | 151 | $engineOptions = $container['view/engine/dependencies']; |
| 152 | 152 | $engineOptions['loader'] = $container['view/loader/mustache']; |
| 153 | 153 | return new MustacheEngine($engineOptions); |
@@ -157,7 +157,7 @@ discard block |
||
| 157 | 157 | * @param Container $container A container instance. |
| 158 | 158 | * @return PhpEngine |
| 159 | 159 | */ |
| 160 | - $container['view/engine/php'] = function (Container $container) { |
|
| 160 | + $container['view/engine/php'] = function(Container $container) { |
|
| 161 | 161 | $engineOptions = $container['view/engine/dependencies']; |
| 162 | 162 | return new PhpEngine($engineOptions); |
| 163 | 163 | }; |
@@ -166,7 +166,7 @@ discard block |
||
| 166 | 166 | * @param Container $container A container instance. |
| 167 | 167 | * @return TwigEngine |
| 168 | 168 | */ |
| 169 | - $container['view/engine/twig'] = function (Container $container) { |
|
| 169 | + $container['view/engine/twig'] = function(Container $container) { |
|
| 170 | 170 | $engineOptions = $container['view/engine/dependencies']; |
| 171 | 171 | $engineOptions['loader'] = $container['view/loader/twig']; |
| 172 | 172 | return new TwigEngine($engineOptions); |
@@ -178,7 +178,7 @@ discard block |
||
| 178 | 178 | * @param Container $container A container instance. |
| 179 | 179 | * @return \Charcoal\View\EngineInterface |
| 180 | 180 | */ |
| 181 | - $container['view/engine'] = function (Container $container) { |
|
| 181 | + $container['view/engine'] = function(Container $container) { |
|
| 182 | 182 | $viewConfig = $container['view/config']; |
| 183 | 183 | $type = $viewConfig['default_engine']; |
| 184 | 184 | return $container['view/engine/'.$type]; |
@@ -197,7 +197,7 @@ discard block |
||
| 197 | 197 | * @param Container $container A container instance. |
| 198 | 198 | * @return ViewInterface |
| 199 | 199 | */ |
| 200 | - $container['view'] = function (Container $container) { |
|
| 200 | + $container['view'] = function(Container $container) { |
|
| 201 | 201 | return new GenericView([ |
| 202 | 202 | 'logger' => $container['logger'], |
| 203 | 203 | 'engine' => $container['view/engine'] |
@@ -210,7 +210,7 @@ discard block |
||
| 210 | 210 | * @param Container $container A container instance. |
| 211 | 211 | * @return Renderer |
| 212 | 212 | */ |
| 213 | - $container['view/renderer'] = function (Container $container) { |
|
| 213 | + $container['view/renderer'] = function(Container $container) { |
|
| 214 | 214 | return new Renderer([ |
| 215 | 215 | 'view' => $container['view'] |
| 216 | 216 | ]); |