@@ -91,19 +91,19 @@ discard block |
||
91 | 91 | private function getClassOptions($sClassName, array $aDirectoryOptions, array $aDefaultOptions = []) |
92 | 92 | { |
93 | 93 | $aOptions = $aDefaultOptions; |
94 | - if(key_exists('separator', $aDirectoryOptions)) |
|
94 | + if (key_exists('separator', $aDirectoryOptions)) |
|
95 | 95 | { |
96 | 96 | $aOptions['separator'] = $aDirectoryOptions['separator']; |
97 | 97 | } |
98 | - if(key_exists('protected', $aDirectoryOptions)) |
|
98 | + if (key_exists('protected', $aDirectoryOptions)) |
|
99 | 99 | { |
100 | 100 | $aOptions['protected'] = $aDirectoryOptions['protected']; |
101 | 101 | } |
102 | - if(key_exists('*', $aDirectoryOptions)) |
|
102 | + if (key_exists('*', $aDirectoryOptions)) |
|
103 | 103 | { |
104 | 104 | $aOptions = array_merge($aOptions, $aDirectoryOptions['*']); |
105 | 105 | } |
106 | - if(key_exists($sClassName, $aDirectoryOptions)) |
|
106 | + if (key_exists($sClassName, $aDirectoryOptions)) |
|
107 | 107 | { |
108 | 108 | $aOptions = array_merge($aOptions, $aDirectoryOptions[$sClassName]); |
109 | 109 | } |
@@ -123,17 +123,17 @@ discard block |
||
123 | 123 | $itDir = new RecursiveDirectoryIterator($sDirectory); |
124 | 124 | $itFile = new RecursiveIteratorIterator($itDir); |
125 | 125 | // Iterate on dir content |
126 | - foreach($itFile as $xFile) |
|
126 | + foreach ($itFile as $xFile) |
|
127 | 127 | { |
128 | 128 | // skip everything except PHP files |
129 | - if(!$xFile->isFile() || $xFile->getExtension() != 'php') |
|
129 | + if (!$xFile->isFile() || $xFile->getExtension() != 'php') |
|
130 | 130 | { |
131 | 131 | continue; |
132 | 132 | } |
133 | 133 | |
134 | 134 | $aClassOptions = []; |
135 | 135 | // No more classmap autoloading. The file will be included when needed. |
136 | - if(($aOptions['autoload'])) |
|
136 | + if (($aOptions['autoload'])) |
|
137 | 137 | { |
138 | 138 | $aClassOptions['include'] = $xFile->getPathname(); |
139 | 139 | } |
@@ -154,7 +154,7 @@ discard block |
||
154 | 154 | public function addNamespace($sNamespace, array $aOptions) |
155 | 155 | { |
156 | 156 | // Separator default value |
157 | - if(!key_exists('separator', $aOptions)) |
|
157 | + if (!key_exists('separator', $aOptions)) |
|
158 | 158 | { |
159 | 159 | $aOptions['separator'] = '.'; |
160 | 160 | } |
@@ -170,7 +170,7 @@ discard block |
||
170 | 170 | */ |
171 | 171 | private function getOptionsFromClass($sClassName) |
172 | 172 | { |
173 | - if(!key_exists($sClassName, $this->aClassOptions)) |
|
173 | + if (!key_exists($sClassName, $this->aClassOptions)) |
|
174 | 174 | { |
175 | 175 | return null; // Class not registered |
176 | 176 | } |
@@ -188,18 +188,18 @@ discard block |
||
188 | 188 | private function getOptionsFromNamespace($sClassName, $sNamespace = null) |
189 | 189 | { |
190 | 190 | // Find the corresponding namespace |
191 | - if($sNamespace === null) |
|
191 | + if ($sNamespace === null) |
|
192 | 192 | { |
193 | - foreach(array_keys($this->aNamespaceOptions) as $_sNamespace) |
|
193 | + foreach (array_keys($this->aNamespaceOptions) as $_sNamespace) |
|
194 | 194 | { |
195 | - if(substr($sClassName, 0, strlen($_sNamespace) + 1) == $_sNamespace . '\\') |
|
195 | + if (substr($sClassName, 0, strlen($_sNamespace) + 1) == $_sNamespace . '\\') |
|
196 | 196 | { |
197 | 197 | $sNamespace = $_sNamespace; |
198 | 198 | break; |
199 | 199 | } |
200 | 200 | } |
201 | 201 | } |
202 | - if($sNamespace === null) |
|
202 | + if ($sNamespace === null) |
|
203 | 203 | { |
204 | 204 | return null; // Class not registered |
205 | 205 | } |
@@ -207,7 +207,7 @@ discard block |
||
207 | 207 | // Get the class options |
208 | 208 | $aOptions = $this->aNamespaceOptions[$sNamespace]; |
209 | 209 | $aDefaultOptions = []; // ['namespace' => $aOptions['namespace']]; |
210 | - if(key_exists('separator', $aOptions)) |
|
210 | + if (key_exists('separator', $aOptions)) |
|
211 | 211 | { |
212 | 212 | $aDefaultOptions['separator'] = $aOptions['separator']; |
213 | 213 | } |
@@ -225,11 +225,11 @@ discard block |
||
225 | 225 | protected function _getCallableObject($sClassName, array $aOptions) |
226 | 226 | { |
227 | 227 | // Make sure the registered class exists |
228 | - if(key_exists('include', $aOptions)) |
|
228 | + if (key_exists('include', $aOptions)) |
|
229 | 229 | { |
230 | 230 | require_once($aOptions['include']); |
231 | 231 | } |
232 | - if(!class_exists($sClassName)) |
|
232 | + if (!class_exists($sClassName)) |
|
233 | 233 | { |
234 | 234 | return null; |
235 | 235 | } |
@@ -237,13 +237,13 @@ discard block |
||
237 | 237 | // Create the callable object |
238 | 238 | $xCallableObject = new \Jaxon\Request\Support\CallableObject($sClassName); |
239 | 239 | $this->aCallableOptions[$sClassName] = []; |
240 | - foreach($aOptions as $sName => $xValue) |
|
240 | + foreach ($aOptions as $sName => $xValue) |
|
241 | 241 | { |
242 | - if($sName == 'separator' || $sName == 'protected') |
|
242 | + if ($sName == 'separator' || $sName == 'protected') |
|
243 | 243 | { |
244 | 244 | $xCallableObject->configure($sName, $xValue); |
245 | 245 | } |
246 | - elseif(is_array($xValue) && $sName != 'include') |
|
246 | + elseif (is_array($xValue) && $sName != 'include') |
|
247 | 247 | { |
248 | 248 | // These options are to be included in javascript code. |
249 | 249 | $this->aCallableOptions[$sClassName][$sName] = $xValue; |
@@ -252,12 +252,12 @@ discard block |
||
252 | 252 | $this->aCallableObjects[$sClassName] = $xCallableObject; |
253 | 253 | |
254 | 254 | // Register the request factory for this callable object |
255 | - jaxon()->di()->set($sClassName . '_Factory_Rq', function () use ($sClassName) { |
|
255 | + jaxon()->di()->set($sClassName . '_Factory_Rq', function() use ($sClassName) { |
|
256 | 256 | $xCallableObject = $this->aCallableObjects[$sClassName]; |
257 | 257 | return new \Jaxon\Factory\Request\Portable($xCallableObject); |
258 | 258 | }); |
259 | 259 | // Register the paginator factory for this callable object |
260 | - jaxon()->di()->set($sClassName . '_Factory_Pg', function () use ($sClassName) { |
|
260 | + jaxon()->di()->set($sClassName . '_Factory_Pg', function() use ($sClassName) { |
|
261 | 261 | $xCallableObject = $this->aCallableObjects[$sClassName]; |
262 | 262 | return new \Jaxon\Factory\Request\Paginator($xCallableObject); |
263 | 263 | }); |
@@ -278,17 +278,17 @@ discard block |
||
278 | 278 | // at the beginning and the end of the class name. |
279 | 279 | $sClassName = trim(str_replace(['.', '_'], ['\\', '\\'], (string)$sClassName), '\\'); |
280 | 280 | |
281 | - if(key_exists($sClassName, $this->aCallableObjects)) |
|
281 | + if (key_exists($sClassName, $this->aCallableObjects)) |
|
282 | 282 | { |
283 | 283 | return $this->aCallableObjects[$sClassName]; |
284 | 284 | } |
285 | 285 | |
286 | 286 | $aOptions = $this->getOptionsFromClass($sClassName); |
287 | - if($aOptions === null) |
|
287 | + if ($aOptions === null) |
|
288 | 288 | { |
289 | 289 | $aOptions = $this->getOptionsFromNamespace($sClassName); |
290 | 290 | } |
291 | - if($aOptions === null) |
|
291 | + if ($aOptions === null) |
|
292 | 292 | { |
293 | 293 | return null; |
294 | 294 | } |
@@ -304,9 +304,9 @@ discard block |
||
304 | 304 | private function createCallableObjects() |
305 | 305 | { |
306 | 306 | // Create callable objects for registered classes |
307 | - foreach($this->aClassOptions as $sClassName => $aClassOptions) |
|
307 | + foreach ($this->aClassOptions as $sClassName => $aClassOptions) |
|
308 | 308 | { |
309 | - if(!key_exists($sClassName, $this->aCallableObjects)) |
|
309 | + if (!key_exists($sClassName, $this->aCallableObjects)) |
|
310 | 310 | { |
311 | 311 | $this->_getCallableObject($sClassName, $aClassOptions); |
312 | 312 | } |
@@ -314,9 +314,9 @@ discard block |
||
314 | 314 | |
315 | 315 | // Create callable objects for registered namespaces |
316 | 316 | $sDS = DIRECTORY_SEPARATOR; |
317 | - foreach($this->aNamespaceOptions as $sNamespace => $aOptions) |
|
317 | + foreach ($this->aNamespaceOptions as $sNamespace => $aOptions) |
|
318 | 318 | { |
319 | - if(key_exists($sNamespace, $this->aNamespaces)) |
|
319 | + if (key_exists($sNamespace, $this->aNamespaces)) |
|
320 | 320 | { |
321 | 321 | continue; |
322 | 322 | } |
@@ -327,10 +327,10 @@ discard block |
||
327 | 327 | $sDirectory = $aOptions['directory']; |
328 | 328 | $itDir = new RecursiveDirectoryIterator($sDirectory); |
329 | 329 | $itFile = new RecursiveIteratorIterator($itDir); |
330 | - foreach($itFile as $xFile) |
|
330 | + foreach ($itFile as $xFile) |
|
331 | 331 | { |
332 | 332 | // skip everything except PHP files |
333 | - if(!$xFile->isFile() || $xFile->getExtension() != 'php') |
|
333 | + if (!$xFile->isFile() || $xFile->getExtension() != 'php') |
|
334 | 334 | { |
335 | 335 | continue; |
336 | 336 | } |
@@ -339,7 +339,7 @@ discard block |
||
339 | 339 | $sClassPath = $sNamespace; |
340 | 340 | $sRelativePath = substr($xFile->getPath(), strlen($sDirectory)); |
341 | 341 | $sRelativePath = trim(str_replace($sDS, '\\', $sRelativePath), '\\'); |
342 | - if($sRelativePath != '') |
|
342 | + if ($sRelativePath != '') |
|
343 | 343 | { |
344 | 344 | $sClassPath .= '\\' . $sRelativePath; |
345 | 345 | } |
@@ -347,10 +347,10 @@ discard block |
||
347 | 347 | $this->aNamespaces[$sClassPath] = ['separator' => $aOptions['separator']]; |
348 | 348 | $sClassName = $sClassPath . '\\' . $xFile->getBasename('.php'); |
349 | 349 | |
350 | - if(!key_exists($sClassName, $this->aCallableObjects)) |
|
350 | + if (!key_exists($sClassName, $this->aCallableObjects)) |
|
351 | 351 | { |
352 | 352 | $aClassOptions = $this->getOptionsFromNamespace($sClassName, $sNamespace); |
353 | - if($aClassOptions !== null) |
|
353 | + if ($aClassOptions !== null) |
|
354 | 354 | { |
355 | 355 | $this->_getCallableObject($sClassName, $aClassOptions); |
356 | 356 | } |
@@ -383,11 +383,11 @@ discard block |
||
383 | 383 | $this->createCallableObjects(); |
384 | 384 | |
385 | 385 | $sHash = ''; |
386 | - foreach($this->aNamespaces as $sNamespace => $aOptions) |
|
386 | + foreach ($this->aNamespaces as $sNamespace => $aOptions) |
|
387 | 387 | { |
388 | 388 | $sHash .= $sNamespace . $aOptions['separator']; |
389 | 389 | } |
390 | - foreach($this->aCallableObjects as $sClassName => $xCallableObject) |
|
390 | + foreach ($this->aCallableObjects as $sClassName => $xCallableObject) |
|
391 | 391 | { |
392 | 392 | $sHash .= $sClassName . implode('|', $xCallableObject->getMethods()); |
393 | 393 | } |
@@ -408,16 +408,16 @@ discard block |
||
408 | 408 | |
409 | 409 | $aJsClasses = []; |
410 | 410 | $sCode = ''; |
411 | - foreach(array_keys($this->aNamespaces) as $sNamespace) |
|
411 | + foreach (array_keys($this->aNamespaces) as $sNamespace) |
|
412 | 412 | { |
413 | 413 | $offset = 0; |
414 | 414 | $sJsNamespace = str_replace('\\', '.', $sNamespace); |
415 | 415 | $sJsNamespace .= '.Null'; // This is a sentinel. The last token is not processed in the while loop. |
416 | - while(($dotPosition = strpos($sJsNamespace, '.', $offset)) !== false) |
|
416 | + while (($dotPosition = strpos($sJsNamespace, '.', $offset)) !== false) |
|
417 | 417 | { |
418 | 418 | $sJsClass = substr($sJsNamespace, 0, $dotPosition); |
419 | 419 | // Generate code for this object |
420 | - if(!key_exists($sJsClass, $aJsClasses)) |
|
420 | + if (!key_exists($sJsClass, $aJsClasses)) |
|
421 | 421 | { |
422 | 422 | $sCode .= "$sPrefix$sJsClass = {};\n"; |
423 | 423 | $aJsClasses[$sJsClass] = $sJsClass; |
@@ -426,13 +426,13 @@ discard block |
||
426 | 426 | } |
427 | 427 | } |
428 | 428 | |
429 | - foreach($this->aCallableObjects as $sClassName => $xCallableObject) |
|
429 | + foreach ($this->aCallableObjects as $sClassName => $xCallableObject) |
|
430 | 430 | { |
431 | 431 | $aConfig = $this->aCallableOptions[$sClassName]; |
432 | 432 | $aCommonConfig = key_exists('*', $aConfig) ? $aConfig['*'] : []; |
433 | 433 | |
434 | 434 | $aMethods = []; |
435 | - foreach($xCallableObject->getMethods() as $sMethodName) |
|
435 | + foreach ($xCallableObject->getMethods() as $sMethodName) |
|
436 | 436 | { |
437 | 437 | // Specific options for this method |
438 | 438 | $aMethodConfig = key_exists($sMethodName, $aConfig) ? |