@@ -23,8 +23,8 @@ |
||
23 | 23 | */ |
24 | 24 | interface EngineFinder extends Finder |
25 | 25 | { |
26 | - // Constants to be used for the Config file sections. |
|
27 | - const CLASS_NAME_KEY = 'ClassName'; |
|
28 | - const ENGINES_KEY = 'Engines'; |
|
29 | - const NULL_OBJECT = 'NullObject'; |
|
26 | + // Constants to be used for the Config file sections. |
|
27 | + const CLASS_NAME_KEY = 'ClassName'; |
|
28 | + const ENGINES_KEY = 'Engines'; |
|
29 | + const NULL_OBJECT = 'NullObject'; |
|
30 | 30 | } |
@@ -34,264 +34,264 @@ |
||
34 | 34 | class ViewBuilder |
35 | 35 | { |
36 | 36 | |
37 | - use ConfigTrait; |
|
37 | + use ConfigTrait; |
|
38 | 38 | |
39 | - const ENGINE_FINDER_KEY = 'EngineFinder'; |
|
40 | - const VIEW_FINDER_KEY = 'ViewFinder'; |
|
39 | + const ENGINE_FINDER_KEY = 'EngineFinder'; |
|
40 | + const VIEW_FINDER_KEY = 'ViewFinder'; |
|
41 | 41 | |
42 | - /** |
|
43 | - * BaseViewFinder instance. |
|
44 | - * |
|
45 | - * @since 0.1.0 |
|
46 | - * |
|
47 | - * @var ViewFinder |
|
48 | - */ |
|
49 | - protected $viewFinder; |
|
42 | + /** |
|
43 | + * BaseViewFinder instance. |
|
44 | + * |
|
45 | + * @since 0.1.0 |
|
46 | + * |
|
47 | + * @var ViewFinder |
|
48 | + */ |
|
49 | + protected $viewFinder; |
|
50 | 50 | |
51 | - /** |
|
52 | - * BaseEngineFinder instance. |
|
53 | - * |
|
54 | - * @since 0.1.0 |
|
55 | - * |
|
56 | - * @var BaseEngineFinder |
|
57 | - */ |
|
58 | - protected $engineFinder; |
|
51 | + /** |
|
52 | + * BaseEngineFinder instance. |
|
53 | + * |
|
54 | + * @since 0.1.0 |
|
55 | + * |
|
56 | + * @var BaseEngineFinder |
|
57 | + */ |
|
58 | + protected $engineFinder; |
|
59 | 59 | |
60 | - /** |
|
61 | - * Locations to scan for views. |
|
62 | - * |
|
63 | - * @since 0.1.0 |
|
64 | - * |
|
65 | - * @var Locations |
|
66 | - */ |
|
67 | - protected $locations; |
|
60 | + /** |
|
61 | + * Locations to scan for views. |
|
62 | + * |
|
63 | + * @since 0.1.0 |
|
64 | + * |
|
65 | + * @var Locations |
|
66 | + */ |
|
67 | + protected $locations; |
|
68 | 68 | |
69 | - /** |
|
70 | - * Instantiate a ViewBuilder object. |
|
71 | - * |
|
72 | - * @since 0.1.0 |
|
73 | - * |
|
74 | - * @param ConfigInterface $config Optional. Configuration settings. |
|
75 | - * @param ViewFinder|null $viewFinder Optional. BaseViewFinder instance. |
|
76 | - * @param BaseEngineFinder|null $engineFinder Optional. BaseEngineFinder instance. |
|
77 | - * |
|
78 | - * @throws FailedToProcessConfigException If the config could not be processed. |
|
79 | - */ |
|
80 | - public function __construct( |
|
81 | - ConfigInterface $config = null, |
|
82 | - ViewFinder $viewFinder = null, |
|
83 | - BaseEngineFinder $engineFinder = null |
|
84 | - ) { |
|
85 | - $this->processConfig($this->getConfig($config)); |
|
86 | - $this->viewFinder = $viewFinder; |
|
87 | - $this->engineFinder = $engineFinder; |
|
88 | - $this->locations = new Locations(); |
|
89 | - } |
|
69 | + /** |
|
70 | + * Instantiate a ViewBuilder object. |
|
71 | + * |
|
72 | + * @since 0.1.0 |
|
73 | + * |
|
74 | + * @param ConfigInterface $config Optional. Configuration settings. |
|
75 | + * @param ViewFinder|null $viewFinder Optional. BaseViewFinder instance. |
|
76 | + * @param BaseEngineFinder|null $engineFinder Optional. BaseEngineFinder instance. |
|
77 | + * |
|
78 | + * @throws FailedToProcessConfigException If the config could not be processed. |
|
79 | + */ |
|
80 | + public function __construct( |
|
81 | + ConfigInterface $config = null, |
|
82 | + ViewFinder $viewFinder = null, |
|
83 | + BaseEngineFinder $engineFinder = null |
|
84 | + ) { |
|
85 | + $this->processConfig($this->getConfig($config)); |
|
86 | + $this->viewFinder = $viewFinder; |
|
87 | + $this->engineFinder = $engineFinder; |
|
88 | + $this->locations = new Locations(); |
|
89 | + } |
|
90 | 90 | |
91 | - /** |
|
92 | - * Create a new view for a given URI. |
|
93 | - * |
|
94 | - * @since 0.1.0 |
|
95 | - * |
|
96 | - * @param string $view View identifier to create a view for. |
|
97 | - * @param mixed $type Type of view to create. |
|
98 | - * |
|
99 | - * @return View Instance of the requested view. |
|
100 | - * @throws FailedToInstantiateView If the view could not be instantiated. |
|
101 | - */ |
|
102 | - public function create(string $view, $type = null): View |
|
103 | - { |
|
104 | - $uri = $this->scanLocations([$view]); |
|
105 | - $engine = $uri |
|
106 | - ? $this->getEngine($uri) |
|
107 | - : false; |
|
91 | + /** |
|
92 | + * Create a new view for a given URI. |
|
93 | + * |
|
94 | + * @since 0.1.0 |
|
95 | + * |
|
96 | + * @param string $view View identifier to create a view for. |
|
97 | + * @param mixed $type Type of view to create. |
|
98 | + * |
|
99 | + * @return View Instance of the requested view. |
|
100 | + * @throws FailedToInstantiateView If the view could not be instantiated. |
|
101 | + */ |
|
102 | + public function create(string $view, $type = null): View |
|
103 | + { |
|
104 | + $uri = $this->scanLocations([$view]); |
|
105 | + $engine = $uri |
|
106 | + ? $this->getEngine($uri) |
|
107 | + : false; |
|
108 | 108 | |
109 | - return ($uri && $engine) |
|
110 | - ? $this->getView($uri, $engine, $type) |
|
111 | - : $this->getViewFinder()->getNullObject(); |
|
112 | - } |
|
109 | + return ($uri && $engine) |
|
110 | + ? $this->getView($uri, $engine, $type) |
|
111 | + : $this->getViewFinder()->getNullObject(); |
|
112 | + } |
|
113 | 113 | |
114 | - /** |
|
115 | - * Get an Engine that can deal with the given URI. |
|
116 | - * |
|
117 | - * @since 0.1.0 |
|
118 | - * |
|
119 | - * @param string $uri URI to get an engine for. |
|
120 | - * |
|
121 | - * @return Engine Instance of an engine that can deal with the given URI. |
|
122 | - */ |
|
123 | - public function getEngine(string $uri): Engine |
|
124 | - { |
|
125 | - return $this->getEngineFinder()->find([$uri]); |
|
126 | - } |
|
114 | + /** |
|
115 | + * Get an Engine that can deal with the given URI. |
|
116 | + * |
|
117 | + * @since 0.1.0 |
|
118 | + * |
|
119 | + * @param string $uri URI to get an engine for. |
|
120 | + * |
|
121 | + * @return Engine Instance of an engine that can deal with the given URI. |
|
122 | + */ |
|
123 | + public function getEngine(string $uri): Engine |
|
124 | + { |
|
125 | + return $this->getEngineFinder()->find([$uri]); |
|
126 | + } |
|
127 | 127 | |
128 | - /** |
|
129 | - * Get a view for a given URI, engine and type. |
|
130 | - * |
|
131 | - * @since 0.1.0 |
|
132 | - * |
|
133 | - * @param string $uri URI to get a view for. |
|
134 | - * @param Engine $engine Engine to use for the view. |
|
135 | - * @param mixed $type Type of view to get. |
|
136 | - * |
|
137 | - * @return View View that matches the given requirements. |
|
138 | - * @throws FailedToInstantiateView If the view could not be instantiated. |
|
139 | - */ |
|
140 | - public function getView(string $uri, Engine $engine, $type = null): View |
|
141 | - { |
|
142 | - $view = (null === $type) |
|
143 | - ? $this->getViewFinder()->find([$uri], $engine) |
|
144 | - : $this->resolveType($type, $uri, $engine); |
|
128 | + /** |
|
129 | + * Get a view for a given URI, engine and type. |
|
130 | + * |
|
131 | + * @since 0.1.0 |
|
132 | + * |
|
133 | + * @param string $uri URI to get a view for. |
|
134 | + * @param Engine $engine Engine to use for the view. |
|
135 | + * @param mixed $type Type of view to get. |
|
136 | + * |
|
137 | + * @return View View that matches the given requirements. |
|
138 | + * @throws FailedToInstantiateView If the view could not be instantiated. |
|
139 | + */ |
|
140 | + public function getView(string $uri, Engine $engine, $type = null): View |
|
141 | + { |
|
142 | + $view = (null === $type) |
|
143 | + ? $this->getViewFinder()->find([$uri], $engine) |
|
144 | + : $this->resolveType($type, $uri, $engine); |
|
145 | 145 | |
146 | - return $view->setBuilder($this); |
|
147 | - } |
|
146 | + return $view->setBuilder($this); |
|
147 | + } |
|
148 | 148 | |
149 | - /** |
|
150 | - * Get the ViewFinder instance. |
|
151 | - * |
|
152 | - * @since 0.1.0 |
|
153 | - * |
|
154 | - * @return ViewFinder Instance of a BaseViewFinder. |
|
155 | - */ |
|
156 | - public function getViewFinder(): ViewFinder |
|
157 | - { |
|
158 | - return $this->getFinder($viewFinder, static::VIEW_FINDER_KEY); |
|
159 | - } |
|
149 | + /** |
|
150 | + * Get the ViewFinder instance. |
|
151 | + * |
|
152 | + * @since 0.1.0 |
|
153 | + * |
|
154 | + * @return ViewFinder Instance of a BaseViewFinder. |
|
155 | + */ |
|
156 | + public function getViewFinder(): ViewFinder |
|
157 | + { |
|
158 | + return $this->getFinder($viewFinder, static::VIEW_FINDER_KEY); |
|
159 | + } |
|
160 | 160 | |
161 | - /** |
|
162 | - * Get the EngineFinder instance. |
|
163 | - * |
|
164 | - * @since 0.1.0 |
|
165 | - * |
|
166 | - * @return EngineFinder Instance of a BaseEngineFinder. |
|
167 | - */ |
|
168 | - public function getEngineFinder(): EngineFinder |
|
169 | - { |
|
170 | - return $this->getFinder($this->engineFinder, static::ENGINE_FINDER_KEY); |
|
171 | - } |
|
161 | + /** |
|
162 | + * Get the EngineFinder instance. |
|
163 | + * |
|
164 | + * @since 0.1.0 |
|
165 | + * |
|
166 | + * @return EngineFinder Instance of a BaseEngineFinder. |
|
167 | + */ |
|
168 | + public function getEngineFinder(): EngineFinder |
|
169 | + { |
|
170 | + return $this->getFinder($this->engineFinder, static::ENGINE_FINDER_KEY); |
|
171 | + } |
|
172 | 172 | |
173 | - /** |
|
174 | - * Add a location to scan with the BaseViewFinder. |
|
175 | - * |
|
176 | - * @since 0.1.0 |
|
177 | - * |
|
178 | - * @param Location $location Location to scan with the BaseViewFinder. |
|
179 | - */ |
|
180 | - public function addLocation(Location $location) |
|
181 | - { |
|
182 | - $this->locations->add($location); |
|
183 | - } |
|
173 | + /** |
|
174 | + * Add a location to scan with the BaseViewFinder. |
|
175 | + * |
|
176 | + * @since 0.1.0 |
|
177 | + * |
|
178 | + * @param Location $location Location to scan with the BaseViewFinder. |
|
179 | + */ |
|
180 | + public function addLocation(Location $location) |
|
181 | + { |
|
182 | + $this->locations->add($location); |
|
183 | + } |
|
184 | 184 | |
185 | - /** |
|
186 | - * Get the collection of locations registered with this ViewBuilder. |
|
187 | - * |
|
188 | - * @since 0.1.3 |
|
189 | - * |
|
190 | - * @return Locations Collection of locations. |
|
191 | - */ |
|
192 | - public function getLocations() |
|
193 | - { |
|
194 | - return $this->locations; |
|
195 | - } |
|
185 | + /** |
|
186 | + * Get the collection of locations registered with this ViewBuilder. |
|
187 | + * |
|
188 | + * @since 0.1.3 |
|
189 | + * |
|
190 | + * @return Locations Collection of locations. |
|
191 | + */ |
|
192 | + public function getLocations() |
|
193 | + { |
|
194 | + return $this->locations; |
|
195 | + } |
|
196 | 196 | |
197 | - /** |
|
198 | - * Scan Locations for an URI that matches the specified criteria. |
|
199 | - * |
|
200 | - * @since 0.1.0 |
|
201 | - * |
|
202 | - * @param array $criteria Criteria to match. |
|
203 | - * |
|
204 | - * @return string|false URI of the requested view, or false if not found. |
|
205 | - */ |
|
206 | - public function scanLocations(array $criteria) |
|
207 | - { |
|
208 | - $uris = $this->locations->map(function ($location) use ($criteria) { |
|
209 | - /** @var Location $location */ |
|
210 | - return $location->getURI($criteria); |
|
211 | - })->filter(function ($uri) { |
|
212 | - return false !== $uri; |
|
213 | - }); |
|
197 | + /** |
|
198 | + * Scan Locations for an URI that matches the specified criteria. |
|
199 | + * |
|
200 | + * @since 0.1.0 |
|
201 | + * |
|
202 | + * @param array $criteria Criteria to match. |
|
203 | + * |
|
204 | + * @return string|false URI of the requested view, or false if not found. |
|
205 | + */ |
|
206 | + public function scanLocations(array $criteria) |
|
207 | + { |
|
208 | + $uris = $this->locations->map(function ($location) use ($criteria) { |
|
209 | + /** @var Location $location */ |
|
210 | + return $location->getURI($criteria); |
|
211 | + })->filter(function ($uri) { |
|
212 | + return false !== $uri; |
|
213 | + }); |
|
214 | 214 | |
215 | - return $uris->count() > 0 ? $uris->first() : false; |
|
216 | - } |
|
215 | + return $uris->count() > 0 ? $uris->first() : false; |
|
216 | + } |
|
217 | 217 | |
218 | - /** |
|
219 | - * Get a finder instance. |
|
220 | - * |
|
221 | - * @since 0.1.1 |
|
222 | - * |
|
223 | - * @param mixed $property Property to use. |
|
224 | - * @param string $key Configuration key to use. |
|
225 | - * |
|
226 | - * @return ViewFinder|EngineFinder The requested finder instance. |
|
227 | - */ |
|
228 | - protected function getFinder(&$property, $key) |
|
229 | - { |
|
230 | - if (null === $property) { |
|
231 | - $finderClass = $this->config->getKey($key, 'ClassName'); |
|
232 | - $property = new $finderClass($this->config->getSubConfig($key)); |
|
233 | - } |
|
218 | + /** |
|
219 | + * Get a finder instance. |
|
220 | + * |
|
221 | + * @since 0.1.1 |
|
222 | + * |
|
223 | + * @param mixed $property Property to use. |
|
224 | + * @param string $key Configuration key to use. |
|
225 | + * |
|
226 | + * @return ViewFinder|EngineFinder The requested finder instance. |
|
227 | + */ |
|
228 | + protected function getFinder(&$property, $key) |
|
229 | + { |
|
230 | + if (null === $property) { |
|
231 | + $finderClass = $this->config->getKey($key, 'ClassName'); |
|
232 | + $property = new $finderClass($this->config->getSubConfig($key)); |
|
233 | + } |
|
234 | 234 | |
235 | - return $property; |
|
236 | - } |
|
235 | + return $property; |
|
236 | + } |
|
237 | 237 | |
238 | - /** |
|
239 | - * Resolve the view type. |
|
240 | - * |
|
241 | - * @since 0.1.0 |
|
242 | - * |
|
243 | - * @param mixed $type Type of view that was requested. |
|
244 | - * @param string $uri URI to get a view for. |
|
245 | - * @param Engine|null $engine Engine to use for the view. |
|
246 | - * |
|
247 | - * @return View Resolved View object. |
|
248 | - * @throws FailedToInstantiateView If the view type could not be resolved. |
|
249 | - */ |
|
250 | - protected function resolveType($type, string $uri, Engine $engine = null): View |
|
251 | - { |
|
252 | - $configKey = [static::VIEW_FINDER_KEY, 'Views', $type]; |
|
238 | + /** |
|
239 | + * Resolve the view type. |
|
240 | + * |
|
241 | + * @since 0.1.0 |
|
242 | + * |
|
243 | + * @param mixed $type Type of view that was requested. |
|
244 | + * @param string $uri URI to get a view for. |
|
245 | + * @param Engine|null $engine Engine to use for the view. |
|
246 | + * |
|
247 | + * @return View Resolved View object. |
|
248 | + * @throws FailedToInstantiateView If the view type could not be resolved. |
|
249 | + */ |
|
250 | + protected function resolveType($type, string $uri, Engine $engine = null): View |
|
251 | + { |
|
252 | + $configKey = [static::VIEW_FINDER_KEY, 'Views', $type]; |
|
253 | 253 | |
254 | - if (is_string($type) && $this->config->hasKey($configKey)) { |
|
255 | - $className = $this->config->getKey($configKey); |
|
256 | - $type = new $className($uri, $engine); |
|
257 | - } |
|
254 | + if (is_string($type) && $this->config->hasKey($configKey)) { |
|
255 | + $className = $this->config->getKey($configKey); |
|
256 | + $type = new $className($uri, $engine); |
|
257 | + } |
|
258 | 258 | |
259 | - if (is_string($type)) { |
|
260 | - $type = new $type($uri, $engine); |
|
261 | - } |
|
259 | + if (is_string($type)) { |
|
260 | + $type = new $type($uri, $engine); |
|
261 | + } |
|
262 | 262 | |
263 | - if (is_callable($type)) { |
|
264 | - $type = $type($uri, $engine); |
|
265 | - } |
|
263 | + if (is_callable($type)) { |
|
264 | + $type = $type($uri, $engine); |
|
265 | + } |
|
266 | 266 | |
267 | - if (! $type instanceof View) { |
|
268 | - throw new FailedToInstantiateView( |
|
269 | - sprintf( |
|
270 | - _('Could not instantiate view "%s".'), |
|
271 | - serialize($type) |
|
272 | - ) |
|
273 | - ); |
|
274 | - } |
|
267 | + if (! $type instanceof View) { |
|
268 | + throw new FailedToInstantiateView( |
|
269 | + sprintf( |
|
270 | + _('Could not instantiate view "%s".'), |
|
271 | + serialize($type) |
|
272 | + ) |
|
273 | + ); |
|
274 | + } |
|
275 | 275 | |
276 | - return $type; |
|
277 | - } |
|
276 | + return $type; |
|
277 | + } |
|
278 | 278 | |
279 | - /** |
|
280 | - * Get the configuration to use in the ViewBuilder. |
|
281 | - * |
|
282 | - * @since 0.2.0 |
|
283 | - * |
|
284 | - * @param ConfigInterface|array $config Config to merge with defaults. |
|
285 | - * |
|
286 | - * @return ConfigInterface Configuration passed in through the constructor. |
|
287 | - */ |
|
288 | - protected function getConfig($config = []): ConfigInterface |
|
289 | - { |
|
290 | - $defaults = ConfigFactory::create(dirname(__DIR__, 2) . '/config/defaults.php', $config); |
|
291 | - $config = $config |
|
292 | - ? ConfigFactory::createFromArray(array_merge_recursive($defaults->getArrayCopy(), $config->getArrayCopy())) |
|
293 | - : $defaults; |
|
279 | + /** |
|
280 | + * Get the configuration to use in the ViewBuilder. |
|
281 | + * |
|
282 | + * @since 0.2.0 |
|
283 | + * |
|
284 | + * @param ConfigInterface|array $config Config to merge with defaults. |
|
285 | + * |
|
286 | + * @return ConfigInterface Configuration passed in through the constructor. |
|
287 | + */ |
|
288 | + protected function getConfig($config = []): ConfigInterface |
|
289 | + { |
|
290 | + $defaults = ConfigFactory::create(dirname(__DIR__, 2) . '/config/defaults.php', $config); |
|
291 | + $config = $config |
|
292 | + ? ConfigFactory::createFromArray(array_merge_recursive($defaults->getArrayCopy(), $config->getArrayCopy())) |
|
293 | + : $defaults; |
|
294 | 294 | |
295 | - return $config->getSubConfig('BrightNucleus\View'); |
|
296 | - } |
|
295 | + return $config->getSubConfig('BrightNucleus\View'); |
|
296 | + } |
|
297 | 297 | } |
@@ -15,35 +15,35 @@ |
||
15 | 15 | * Engine finder default configuration. |
16 | 16 | */ |
17 | 17 | $engineFinder = [ |
18 | - // Class to use for instantiating the EngineFinder implementation. |
|
19 | - Engine\EngineFinder::CLASS_NAME_KEY => Engine\BaseEngineFinder::class, |
|
20 | - // Engine implementations to register with the EngineFinder. |
|
21 | - Engine\EngineFinder::ENGINES_KEY => [ |
|
22 | - 'PHPEngine' => Engine\PHPEngine::class, |
|
23 | - ], |
|
24 | - // Null object implementation to use with the EngineFinder. |
|
25 | - Engine\EngineFinder::NULL_OBJECT => Engine\NullEngine::class, |
|
18 | + // Class to use for instantiating the EngineFinder implementation. |
|
19 | + Engine\EngineFinder::CLASS_NAME_KEY => Engine\BaseEngineFinder::class, |
|
20 | + // Engine implementations to register with the EngineFinder. |
|
21 | + Engine\EngineFinder::ENGINES_KEY => [ |
|
22 | + 'PHPEngine' => Engine\PHPEngine::class, |
|
23 | + ], |
|
24 | + // Null object implementation to use with the EngineFinder. |
|
25 | + Engine\EngineFinder::NULL_OBJECT => Engine\NullEngine::class, |
|
26 | 26 | ]; |
27 | 27 | |
28 | 28 | /* |
29 | 29 | * View finder default configuration. |
30 | 30 | */ |
31 | 31 | $viewFinder = [ |
32 | - // Class to use for instantiating the ViewFinder implementation. |
|
33 | - View\ViewFinder::CLASS_NAME_KEY => View\BaseViewFinder::class, |
|
34 | - // View implementations to register with the ViewFinder. |
|
35 | - View\ViewFinder::VIEWS_KEY => [ |
|
36 | - 'BaseView' => View\BaseView::class, |
|
37 | - ], |
|
38 | - // Null object implementation to use with the ViewFinder. |
|
39 | - View\ViewFinder::NULL_OBJECT => View\NullView::class, |
|
32 | + // Class to use for instantiating the ViewFinder implementation. |
|
33 | + View\ViewFinder::CLASS_NAME_KEY => View\BaseViewFinder::class, |
|
34 | + // View implementations to register with the ViewFinder. |
|
35 | + View\ViewFinder::VIEWS_KEY => [ |
|
36 | + 'BaseView' => View\BaseView::class, |
|
37 | + ], |
|
38 | + // Null object implementation to use with the ViewFinder. |
|
39 | + View\ViewFinder::NULL_OBJECT => View\NullView::class, |
|
40 | 40 | ]; |
41 | 41 | |
42 | 42 | return [ |
43 | - 'BrightNucleus' => [ |
|
44 | - 'View' => [ |
|
45 | - 'EngineFinder' => $engineFinder, |
|
46 | - 'ViewFinder' => $viewFinder, |
|
47 | - ], |
|
48 | - ], |
|
43 | + 'BrightNucleus' => [ |
|
44 | + 'View' => [ |
|
45 | + 'EngineFinder' => $engineFinder, |
|
46 | + 'ViewFinder' => $viewFinder, |
|
47 | + ], |
|
48 | + ], |
|
49 | 49 | ]; |