@@ -32,7 +32,7 @@ discard block |
||
32 | 32 | |
33 | 33 | public static function getInstance() |
34 | 34 | { |
35 | - if(!self::$xInstance) |
|
35 | + if (!self::$xInstance) |
|
36 | 36 | { |
37 | 37 | self::$xInstance = new Container(); |
38 | 38 | } |
@@ -92,27 +92,27 @@ discard block |
||
92 | 92 | * Managers |
93 | 93 | */ |
94 | 94 | // Callable objects repository |
95 | - $this->coreContainer[CallableRepository::class] = function ($c) { |
|
95 | + $this->coreContainer[CallableRepository::class] = function($c) { |
|
96 | 96 | return new CallableRepository(); |
97 | 97 | }; |
98 | 98 | // Plugin Manager |
99 | - $this->coreContainer['jaxon.core.plugin_manager'] = function ($c) { |
|
99 | + $this->coreContainer['jaxon.core.plugin_manager'] = function($c) { |
|
100 | 100 | return new \Jaxon\Plugin\Manager(); |
101 | 101 | }; |
102 | 102 | // Request Manager |
103 | - $this->coreContainer['jaxon.core.request_manager'] = function ($c) { |
|
103 | + $this->coreContainer['jaxon.core.request_manager'] = function($c) { |
|
104 | 104 | return new \Jaxon\Request\Manager(); |
105 | 105 | }; |
106 | 106 | // Request Factory |
107 | - $this->coreContainer['jaxon.core.request_factory'] = function ($c) { |
|
107 | + $this->coreContainer['jaxon.core.request_factory'] = function($c) { |
|
108 | 108 | return new \Jaxon\Factory\Request($c[CallableRepository::class]); |
109 | 109 | }; |
110 | 110 | // Parameter Factory |
111 | - $this->coreContainer['jaxon.core.parameter_factory'] = function ($c) { |
|
111 | + $this->coreContainer['jaxon.core.parameter_factory'] = function($c) { |
|
112 | 112 | return new \Jaxon\Factory\Parameter(); |
113 | 113 | }; |
114 | 114 | // Response Manager |
115 | - $this->coreContainer['jaxon.core.response_manager'] = function ($c) { |
|
115 | + $this->coreContainer['jaxon.core.response_manager'] = function($c) { |
|
116 | 116 | return new \Jaxon\Response\Manager(); |
117 | 117 | }; |
118 | 118 | |
@@ -120,35 +120,35 @@ discard block |
||
120 | 120 | * Services |
121 | 121 | */ |
122 | 122 | // Config manager |
123 | - $this->coreContainer['jaxon.core.config'] = function ($c) { |
|
123 | + $this->coreContainer['jaxon.core.config'] = function($c) { |
|
124 | 124 | return new \Jaxon\Utils\Config\Config(); |
125 | 125 | }; |
126 | 126 | // Minifier |
127 | - $this->coreContainer['jaxon.core.minifier'] = function ($c) { |
|
127 | + $this->coreContainer['jaxon.core.minifier'] = function($c) { |
|
128 | 128 | return new \Jaxon\Utils\Template\Minifier(); |
129 | 129 | }; |
130 | 130 | // Translator |
131 | - $this->coreContainer['jaxon.core.translator'] = function ($c) { |
|
131 | + $this->coreContainer['jaxon.core.translator'] = function($c) { |
|
132 | 132 | return new \Jaxon\Utils\Translation\Translator($c['jaxon.core.translation_dir'], $c['jaxon.core.config']); |
133 | 133 | }; |
134 | 134 | // Template engine |
135 | - $this->coreContainer['jaxon.core.template'] = function ($c) { |
|
135 | + $this->coreContainer['jaxon.core.template'] = function($c) { |
|
136 | 136 | return new \Jaxon\Utils\Template\Template($c['jaxon.core.template_dir']); |
137 | 137 | }; |
138 | 138 | // Validator |
139 | - $this->coreContainer['jaxon.core.validator'] = function ($c) { |
|
139 | + $this->coreContainer['jaxon.core.validator'] = function($c) { |
|
140 | 140 | return new \Jaxon\Utils\Validation\Validator($c['jaxon.core.translator'], $c['jaxon.core.config']); |
141 | 141 | }; |
142 | 142 | // Pagination Renderer |
143 | - $this->coreContainer['jaxon.pagination.renderer'] = function ($c) { |
|
143 | + $this->coreContainer['jaxon.pagination.renderer'] = function($c) { |
|
144 | 144 | return new \Jaxon\Utils\Pagination\Renderer($c['jaxon.core.template']); |
145 | 145 | }; |
146 | 146 | // Pagination Paginator |
147 | - $this->coreContainer['jaxon.pagination.paginator'] = function ($c) { |
|
147 | + $this->coreContainer['jaxon.pagination.paginator'] = function($c) { |
|
148 | 148 | return new \Jaxon\Utils\Pagination\Paginator($c['jaxon.pagination.renderer']); |
149 | 149 | }; |
150 | 150 | // Event Dispatcher |
151 | - $this->coreContainer['jaxon.core.events'] = function ($c) { |
|
151 | + $this->coreContainer['jaxon.core.events'] = function($c) { |
|
152 | 152 | return new EventDispatcher(); |
153 | 153 | }; |
154 | 154 | |
@@ -156,15 +156,15 @@ discard block |
||
156 | 156 | * Core library objects |
157 | 157 | */ |
158 | 158 | // Global Response |
159 | - $this->coreContainer['jaxon.core.response'] = function ($c) { |
|
159 | + $this->coreContainer['jaxon.core.response'] = function($c) { |
|
160 | 160 | return new \Jaxon\Response\Response(); |
161 | 161 | }; |
162 | 162 | // Jaxon Core |
163 | - $this->coreContainer['jaxon.core.jaxon'] = function ($c) { |
|
163 | + $this->coreContainer['jaxon.core.jaxon'] = function($c) { |
|
164 | 164 | return new \Jaxon\Jaxon(); |
165 | 165 | }; |
166 | 166 | // View Renderer Facade |
167 | - $this->coreContainer['jaxon.sentry.view.renderer'] = function ($c) { |
|
167 | + $this->coreContainer['jaxon.sentry.view.renderer'] = function($c) { |
|
168 | 168 | $aRenderers = $c['jaxon.view.data.renderers']; |
169 | 169 | $sDefaultNamespace = $c['jaxon.view.data.namespace.default']; |
170 | 170 | return new \Jaxon\Sentry\View\Facade($aRenderers, $sDefaultNamespace); |
@@ -178,7 +178,7 @@ discard block |
||
178 | 178 | */ |
179 | 179 | public function get($sClass) |
180 | 180 | { |
181 | - if($this->sentryContainer != null && $this->sentryContainer->has($sClass)) |
|
181 | + if ($this->sentryContainer != null && $this->sentryContainer->has($sClass)) |
|
182 | 182 | { |
183 | 183 | return $this->sentryContainer->get($sClass); |
184 | 184 | } |
@@ -463,14 +463,14 @@ discard block |
||
463 | 463 | $this->coreContainer['jaxon.sentry.view.base.' . $sId] = $xClosure; |
464 | 464 | |
465 | 465 | // Return the initialized view renderer |
466 | - $this->coreContainer['jaxon.sentry.view.' . $sId] = function ($c) use ($sId) { |
|
466 | + $this->coreContainer['jaxon.sentry.view.' . $sId] = function($c) use ($sId) { |
|
467 | 467 | // Get the defined renderer |
468 | 468 | $renderer = $c['jaxon.sentry.view.base.' . $sId]; |
469 | 469 | // Init the renderer with the template namespaces |
470 | 470 | $aNamespaces = $this->coreContainer['jaxon.view.data.namespaces']; |
471 | - if(key_exists($sId, $aNamespaces)) |
|
471 | + if (key_exists($sId, $aNamespaces)) |
|
472 | 472 | { |
473 | - foreach($aNamespaces[$sId] as $ns) |
|
473 | + foreach ($aNamespaces[$sId] as $ns) |
|
474 | 474 | { |
475 | 475 | $renderer->addNamespace($ns['namespace'], $ns['directory'], $ns['extension']); |
476 | 476 | } |
@@ -488,7 +488,7 @@ discard block |
||
488 | 488 | */ |
489 | 489 | public function getViewRenderer($sId = '') |
490 | 490 | { |
491 | - if(!$sId) |
|
491 | + if (!$sId) |
|
492 | 492 | { |
493 | 493 | // Return the view renderer facade |
494 | 494 | return $this->coreContainer['jaxon.sentry.view.renderer']; |
@@ -120,22 +120,22 @@ discard block |
||
120 | 120 | */ |
121 | 121 | public function configure($sName, $sValue) |
122 | 122 | { |
123 | - switch($sName) |
|
123 | + switch ($sName) |
|
124 | 124 | { |
125 | 125 | // Set the separator |
126 | 126 | case 'separator': |
127 | - if($sValue == '_' || $sValue == '.') |
|
127 | + if ($sValue == '_' || $sValue == '.') |
|
128 | 128 | { |
129 | 129 | $this->separator = $sValue; |
130 | 130 | } |
131 | 131 | break; |
132 | 132 | // Set the protected methods |
133 | 133 | case 'protected': |
134 | - if(is_array($sValue)) |
|
134 | + if (is_array($sValue)) |
|
135 | 135 | { |
136 | 136 | $this->aProtectedMethods = array_merge($this->aProtectedMethods, $sValue); |
137 | 137 | } |
138 | - elseif(is_string($sValue)) |
|
138 | + elseif (is_string($sValue)) |
|
139 | 139 | { |
140 | 140 | $this->aProtectedMethods[] = $sValue; |
141 | 141 | } |
@@ -153,16 +153,16 @@ discard block |
||
153 | 153 | public function getMethods() |
154 | 154 | { |
155 | 155 | $aMethods = []; |
156 | - foreach($this->reflectionClass->getMethods(\ReflectionMethod::IS_PUBLIC) as $xMethod) |
|
156 | + foreach ($this->reflectionClass->getMethods(\ReflectionMethod::IS_PUBLIC) as $xMethod) |
|
157 | 157 | { |
158 | 158 | $sMethodName = $xMethod->getShortName(); |
159 | 159 | // Don't take magic __call, __construct, __destruct methods |
160 | - if(strlen($sMethodName) > 2 && substr($sMethodName, 0, 2) == '__') |
|
160 | + if (strlen($sMethodName) > 2 && substr($sMethodName, 0, 2) == '__') |
|
161 | 161 | { |
162 | 162 | continue; |
163 | 163 | } |
164 | 164 | // Don't take excluded methods |
165 | - if(in_array($sMethodName, $this->aProtectedMethods)) |
|
165 | + if (in_array($sMethodName, $this->aProtectedMethods)) |
|
166 | 166 | { |
167 | 167 | continue; |
168 | 168 | } |
@@ -178,15 +178,15 @@ discard block |
||
178 | 178 | */ |
179 | 179 | public function getRegisteredObject() |
180 | 180 | { |
181 | - if($this->registeredObject == null) |
|
181 | + if ($this->registeredObject == null) |
|
182 | 182 | { |
183 | 183 | $di = jaxon()->di(); |
184 | 184 | // Use the Reflection class to get the parameters of the constructor |
185 | - if(($constructor = $this->reflectionClass->getConstructor()) != null) |
|
185 | + if (($constructor = $this->reflectionClass->getConstructor()) != null) |
|
186 | 186 | { |
187 | 187 | $parameters = $constructor->getParameters(); |
188 | 188 | $parameterInstances = []; |
189 | - foreach($parameters as $parameter) |
|
189 | + foreach ($parameters as $parameter) |
|
190 | 190 | { |
191 | 191 | // Get the parameter instance from the DI |
192 | 192 | $parameterInstances[] = $di->get($parameter->getClass()->getName()); |
@@ -223,7 +223,7 @@ discard block |
||
223 | 223 | */ |
224 | 224 | public function call($sMethod, $aArgs) |
225 | 225 | { |
226 | - if(!$this->hasMethod($sMethod)) |
|
226 | + if (!$this->hasMethod($sMethod)) |
|
227 | 227 | { |
228 | 228 | return; |
229 | 229 | } |
@@ -88,19 +88,19 @@ discard block |
||
88 | 88 | private function getClassOptions($sClassName, array $aDirectoryOptions, array $aDefaultOptions = []) |
89 | 89 | { |
90 | 90 | $aOptions = $aDefaultOptions; |
91 | - if(key_exists('separator', $aDirectoryOptions)) |
|
91 | + if (key_exists('separator', $aDirectoryOptions)) |
|
92 | 92 | { |
93 | 93 | $aOptions['separator'] = $aDirectoryOptions['separator']; |
94 | 94 | } |
95 | - if(key_exists('protected', $aDirectoryOptions)) |
|
95 | + if (key_exists('protected', $aDirectoryOptions)) |
|
96 | 96 | { |
97 | 97 | $aOptions['protected'] = $aDirectoryOptions['protected']; |
98 | 98 | } |
99 | - if(key_exists('*', $aDirectoryOptions)) |
|
99 | + if (key_exists('*', $aDirectoryOptions)) |
|
100 | 100 | { |
101 | 101 | $aOptions = array_merge($aOptions, $aDirectoryOptions['*']); |
102 | 102 | } |
103 | - if(key_exists($sClassName, $aDirectoryOptions)) |
|
103 | + if (key_exists($sClassName, $aDirectoryOptions)) |
|
104 | 104 | { |
105 | 105 | $aOptions = array_merge($aOptions, $aDirectoryOptions[$sClassName]); |
106 | 106 | } |
@@ -120,17 +120,17 @@ discard block |
||
120 | 120 | $itDir = new RecursiveDirectoryIterator($sDirectory); |
121 | 121 | $itFile = new RecursiveIteratorIterator($itDir); |
122 | 122 | // Iterate on dir content |
123 | - foreach($itFile as $xFile) |
|
123 | + foreach ($itFile as $xFile) |
|
124 | 124 | { |
125 | 125 | // skip everything except PHP files |
126 | - if(!$xFile->isFile() || $xFile->getExtension() != 'php') |
|
126 | + if (!$xFile->isFile() || $xFile->getExtension() != 'php') |
|
127 | 127 | { |
128 | 128 | continue; |
129 | 129 | } |
130 | 130 | |
131 | 131 | $aClassOptions = []; |
132 | 132 | // No more classmap autoloading. The file will be included when needed. |
133 | - if(($aOptions['autoload'])) |
|
133 | + if (($aOptions['autoload'])) |
|
134 | 134 | { |
135 | 135 | $aClassOptions['include'] = $xFile->getPathname(); |
136 | 136 | } |
@@ -162,7 +162,7 @@ discard block |
||
162 | 162 | */ |
163 | 163 | private function getOptionsFromClass($sClassName) |
164 | 164 | { |
165 | - if(!key_exists($sClassName, $this->aClassOptions)) |
|
165 | + if (!key_exists($sClassName, $this->aClassOptions)) |
|
166 | 166 | { |
167 | 167 | return null; // Class not registered |
168 | 168 | } |
@@ -180,15 +180,15 @@ discard block |
||
180 | 180 | { |
181 | 181 | // Find the corresponding namespace |
182 | 182 | $sNamespace = null; |
183 | - foreach(array_keys($this->aNamespaceOptions) as $_sNamespace) |
|
183 | + foreach (array_keys($this->aNamespaceOptions) as $_sNamespace) |
|
184 | 184 | { |
185 | - if(substr($sClassName, 0, strlen($_sNamespace) + 1) == $_sNamespace . '\\') |
|
185 | + if (substr($sClassName, 0, strlen($_sNamespace) + 1) == $_sNamespace . '\\') |
|
186 | 186 | { |
187 | 187 | $sNamespace = $_sNamespace; |
188 | 188 | break; |
189 | 189 | } |
190 | 190 | } |
191 | - if($sNamespace == null) |
|
191 | + if ($sNamespace == null) |
|
192 | 192 | { |
193 | 193 | return null; // Class not registered |
194 | 194 | } |
@@ -210,27 +210,27 @@ discard block |
||
210 | 210 | // at the beginning and the end of the class name. |
211 | 211 | $sClassName = trim(str_replace(['.', '_'], ['\\', '\\'], (string)$sClassName), '\\'); |
212 | 212 | |
213 | - if(key_exists($sClassName, $this->aCallableObjects)) |
|
213 | + if (key_exists($sClassName, $this->aCallableObjects)) |
|
214 | 214 | { |
215 | 215 | return $this->aCallableObjects[$sClassName]; |
216 | 216 | } |
217 | 217 | |
218 | 218 | $aOptions = $this->getOptionsFromClass($sClassName); |
219 | - if($aOptions === null) |
|
219 | + if ($aOptions === null) |
|
220 | 220 | { |
221 | 221 | $aOptions = $this->getOptionsFromNamespace($sClassName); |
222 | 222 | } |
223 | - if($aOptions === null) |
|
223 | + if ($aOptions === null) |
|
224 | 224 | { |
225 | 225 | return null; |
226 | 226 | } |
227 | 227 | |
228 | 228 | // Make sure the registered class exists |
229 | - if(key_exists('include', $aOptions)) |
|
229 | + if (key_exists('include', $aOptions)) |
|
230 | 230 | { |
231 | 231 | require_once($aOptions['include']); |
232 | 232 | } |
233 | - if(!class_exists('\\' . $sClassName)) |
|
233 | + if (!class_exists('\\' . $sClassName)) |
|
234 | 234 | { |
235 | 235 | return null; |
236 | 236 | } |
@@ -238,13 +238,13 @@ discard block |
||
238 | 238 | // Create the callable object |
239 | 239 | $xCallableObject = new \Jaxon\Request\Support\CallableObject($sClassName); |
240 | 240 | $this->aCallableOptions[$sClassName] = []; |
241 | - foreach($aOptions as $sName => $xValue) |
|
241 | + foreach ($aOptions as $sName => $xValue) |
|
242 | 242 | { |
243 | - if($sName == 'separator' || $sName == 'protected') |
|
243 | + if ($sName == 'separator' || $sName == 'protected') |
|
244 | 244 | { |
245 | 245 | $xCallableObject->configure($sName, $xValue); |
246 | 246 | } |
247 | - elseif(is_array($xValue) && $sName != 'include') |
|
247 | + elseif (is_array($xValue) && $sName != 'include') |
|
248 | 248 | { |
249 | 249 | // These options are to be included in javascript code. |
250 | 250 | $this->aCallableOptions[$sClassName][$sName] = $xValue; |
@@ -253,12 +253,12 @@ discard block |
||
253 | 253 | $this->aCallableObjects[$sClassName] = $xCallableObject; |
254 | 254 | |
255 | 255 | // Register the request factory for this callable object |
256 | - jaxon()->di()->set($sClassName . '_Factory_Rq', function ($di) use ($sClassName) { |
|
256 | + jaxon()->di()->set($sClassName . '_Factory_Rq', function($di) use ($sClassName) { |
|
257 | 257 | $xCallableObject = $this->aCallableObjects[$sClassName]; |
258 | 258 | return new \Jaxon\Factory\Request\Portable($xCallableObject); |
259 | 259 | }); |
260 | 260 | // Register the paginator factory for this callable object |
261 | - jaxon()->di()->set($sClassName . '_Factory_Pg', function ($di) use ($sClassName) { |
|
261 | + jaxon()->di()->set($sClassName . '_Factory_Pg', function($di) use ($sClassName) { |
|
262 | 262 | $xCallableObject = $this->aCallableObjects[$sClassName]; |
263 | 263 | return new \Jaxon\Factory\Request\Paginator($xCallableObject); |
264 | 264 | }); |
@@ -274,16 +274,16 @@ discard block |
||
274 | 274 | private function createCallableObjects() |
275 | 275 | { |
276 | 276 | // Create callable objects for registered classes |
277 | - foreach(array_keys($this->aClassOptions) as $sClassName) |
|
277 | + foreach (array_keys($this->aClassOptions) as $sClassName) |
|
278 | 278 | { |
279 | 279 | $this->getCallableObject($sClassName); |
280 | 280 | } |
281 | 281 | |
282 | 282 | // Create callable objects for registered namespaces |
283 | 283 | $sDS = DIRECTORY_SEPARATOR; |
284 | - foreach($this->aNamespaceOptions as $sNamespace => $aOptions) |
|
284 | + foreach ($this->aNamespaceOptions as $sNamespace => $aOptions) |
|
285 | 285 | { |
286 | - if(key_exists($sNamespace, $this->aNamespaces)) |
|
286 | + if (key_exists($sNamespace, $this->aNamespaces)) |
|
287 | 287 | { |
288 | 288 | continue; |
289 | 289 | } |
@@ -294,10 +294,10 @@ discard block |
||
294 | 294 | $sDirectory = $aOptions['directory']; |
295 | 295 | $itDir = new RecursiveDirectoryIterator($sDirectory); |
296 | 296 | $itFile = new RecursiveIteratorIterator($itDir); |
297 | - foreach($itFile as $xFile) |
|
297 | + foreach ($itFile as $xFile) |
|
298 | 298 | { |
299 | 299 | // skip everything except PHP files |
300 | - if(!$xFile->isFile() || $xFile->getExtension() != 'php') |
|
300 | + if (!$xFile->isFile() || $xFile->getExtension() != 'php') |
|
301 | 301 | { |
302 | 302 | continue; |
303 | 303 | } |
@@ -306,7 +306,7 @@ discard block |
||
306 | 306 | $sClassPath = $sNamespace; |
307 | 307 | $sRelativePath = substr($xFile->getPath(), strlen($sDirectory)); |
308 | 308 | $sRelativePath = trim(str_replace($sDS, '\\', $sRelativePath), '\\'); |
309 | - if($sRelativePath != '') |
|
309 | + if ($sRelativePath != '') |
|
310 | 310 | { |
311 | 311 | $sClassPath .= '\\' . $sRelativePath; |
312 | 312 | } |
@@ -342,11 +342,11 @@ discard block |
||
342 | 342 | return $this->createCallableObjects(); |
343 | 343 | |
344 | 344 | $sHash = ''; |
345 | - foreach($this->aNamespaces as $sNamespace => $aOptions) |
|
345 | + foreach ($this->aNamespaces as $sNamespace => $aOptions) |
|
346 | 346 | { |
347 | 347 | $sHash .= $sNamespace . $aOptions['separator']; |
348 | 348 | } |
349 | - foreach($this->aCallableObjects as $sClassName => $xCallableObject) |
|
349 | + foreach ($this->aCallableObjects as $sClassName => $xCallableObject) |
|
350 | 350 | { |
351 | 351 | $sHash .= $sClassName . implode('|', $xCallableObject->getMethods()); |
352 | 352 | } |
@@ -367,16 +367,16 @@ discard block |
||
367 | 367 | |
368 | 368 | $aJsClasses = []; |
369 | 369 | $sCode = ''; |
370 | - foreach(array_keys($this->aNamespaces) as $sNamespace) |
|
370 | + foreach (array_keys($this->aNamespaces) as $sNamespace) |
|
371 | 371 | { |
372 | 372 | $offset = 0; |
373 | 373 | $sJsNamespace = str_replace('\\', '.', $sNamespace); |
374 | 374 | $sJsNamespace .= '.Null'; // This is a sentinel. The last token is not processed in the while loop. |
375 | - while(($dotPosition = strpos($sJsNamespace, '.', $offset)) !== false) |
|
375 | + while (($dotPosition = strpos($sJsNamespace, '.', $offset)) !== false) |
|
376 | 376 | { |
377 | 377 | $sJsClass = substr($sJsNamespace, 0, $dotPosition); |
378 | 378 | // Generate code for this object |
379 | - if(!key_exists($sJsClass, $aJsClasses)) |
|
379 | + if (!key_exists($sJsClass, $aJsClasses)) |
|
380 | 380 | { |
381 | 381 | $sCode .= "$sPrefix$sJsClass = {};\n"; |
382 | 382 | $aJsClasses[$sJsClass] = $sJsClass; |
@@ -385,13 +385,13 @@ discard block |
||
385 | 385 | } |
386 | 386 | } |
387 | 387 | |
388 | - foreach($this->aCallableObjects as $sClassName => $xCallableObject) |
|
388 | + foreach ($this->aCallableObjects as $sClassName => $xCallableObject) |
|
389 | 389 | { |
390 | 390 | $aConfig = $this->aCallableOptions[$sClassName]; |
391 | 391 | $aCommonConfig = key_exists('*', $aConfig) ? $aConfig['*'] : []; |
392 | 392 | |
393 | 393 | $aMethods = []; |
394 | - foreach($xCallableObject->getMethods() as $sMethodName) |
|
394 | + foreach ($xCallableObject->getMethods() as $sMethodName) |
|
395 | 395 | { |
396 | 396 | // Specific options for this method |
397 | 397 | $aMethodConfig = key_exists($sMethodName, $aConfig) ? |
@@ -75,7 +75,7 @@ discard block |
||
75 | 75 | public function getName() |
76 | 76 | { |
77 | 77 | // Do not use sAlias here! |
78 | - if(is_array($this->sUserFunction)) |
|
78 | + if (is_array($this->sUserFunction)) |
|
79 | 79 | { |
80 | 80 | return $this->sUserFunction[1]; |
81 | 81 | } |
@@ -92,7 +92,7 @@ discard block |
||
92 | 92 | */ |
93 | 93 | public function configure($sName, $sValue) |
94 | 94 | { |
95 | - switch($sName) |
|
95 | + switch ($sName) |
|
96 | 96 | { |
97 | 97 | case 'class': // The user function is a method in the given class |
98 | 98 | $this->sUserFunction = [new $sValue, $this->sUserFunction]; |
@@ -149,7 +149,7 @@ discard block |
||
149 | 149 | */ |
150 | 150 | public function call($aArgs = []) |
151 | 151 | { |
152 | - if(($this->sInclude)) |
|
152 | + if (($this->sInclude)) |
|
153 | 153 | { |
154 | 154 | require_once $this->sInclude; |
155 | 155 | } |
@@ -61,19 +61,19 @@ discard block |
||
61 | 61 | { |
62 | 62 | $this->xRepository = $xRepository; |
63 | 63 | |
64 | - if(!empty($_GET['jxncls'])) |
|
64 | + if (!empty($_GET['jxncls'])) |
|
65 | 65 | { |
66 | 66 | $this->sRequestedClass = $_GET['jxncls']; |
67 | 67 | } |
68 | - if(!empty($_GET['jxnmthd'])) |
|
68 | + if (!empty($_GET['jxnmthd'])) |
|
69 | 69 | { |
70 | 70 | $this->sRequestedMethod = $_GET['jxnmthd']; |
71 | 71 | } |
72 | - if(!empty($_POST['jxncls'])) |
|
72 | + if (!empty($_POST['jxncls'])) |
|
73 | 73 | { |
74 | 74 | $this->sRequestedClass = $_POST['jxncls']; |
75 | 75 | } |
76 | - if(!empty($_POST['jxnmthd'])) |
|
76 | + if (!empty($_POST['jxnmthd'])) |
|
77 | 77 | { |
78 | 78 | $this->sRequestedMethod = $_POST['jxnmthd']; |
79 | 79 | } |
@@ -100,20 +100,20 @@ discard block |
||
100 | 100 | */ |
101 | 101 | public function register($sType, $sClassName, $aOptions) |
102 | 102 | { |
103 | - if($sType != $this->getName()) |
|
103 | + if ($sType != $this->getName()) |
|
104 | 104 | { |
105 | 105 | return false; |
106 | 106 | } |
107 | 107 | |
108 | - if(!is_string($sClassName)) |
|
108 | + if (!is_string($sClassName)) |
|
109 | 109 | { |
110 | 110 | throw new \Jaxon\Exception\Error($this->trans('errors.objects.invalid-declaration')); |
111 | 111 | } |
112 | - if(is_string($aOptions)) |
|
112 | + if (is_string($aOptions)) |
|
113 | 113 | { |
114 | 114 | $aOptions = ['include' => $aOptions]; |
115 | 115 | } |
116 | - if(!is_array($aOptions)) |
|
116 | + if (!is_array($aOptions)) |
|
117 | 117 | { |
118 | 118 | throw new \Jaxon\Exception\Error($this->trans('errors.objects.invalid-declaration')); |
119 | 119 | } |
@@ -151,13 +151,13 @@ discard block |
||
151 | 151 | public function canProcessRequest() |
152 | 152 | { |
153 | 153 | // Check the validity of the class name |
154 | - if($this->sRequestedClass !== null && !$this->validateClass($this->sRequestedClass)) |
|
154 | + if ($this->sRequestedClass !== null && !$this->validateClass($this->sRequestedClass)) |
|
155 | 155 | { |
156 | 156 | $this->sRequestedClass = null; |
157 | 157 | $this->sRequestedMethod = null; |
158 | 158 | } |
159 | 159 | // Check the validity of the method name |
160 | - if($this->sRequestedMethod !== null && !$this->validateMethod($this->sRequestedMethod)) |
|
160 | + if ($this->sRequestedMethod !== null && !$this->validateMethod($this->sRequestedMethod)) |
|
161 | 161 | { |
162 | 162 | $this->sRequestedClass = null; |
163 | 163 | $this->sRequestedMethod = null; |
@@ -172,14 +172,14 @@ discard block |
||
172 | 172 | */ |
173 | 173 | public function processRequest() |
174 | 174 | { |
175 | - if(!$this->canProcessRequest()) |
|
175 | + if (!$this->canProcessRequest()) |
|
176 | 176 | { |
177 | 177 | return false; |
178 | 178 | } |
179 | 179 | |
180 | 180 | // Find the requested method |
181 | 181 | $xCallableObject = $this->xRepository->getCallableObject($this->sRequestedClass); |
182 | - if(!$xCallableObject || !$xCallableObject->hasMethod($this->sRequestedMethod)) |
|
182 | + if (!$xCallableObject || !$xCallableObject->hasMethod($this->sRequestedMethod)) |
|
183 | 183 | { |
184 | 184 | // Unable to find the requested object or method |
185 | 185 | throw new \Jaxon\Exception\Error($this->trans('errors.objects.invalid', |
@@ -189,7 +189,7 @@ discard block |
||
189 | 189 | // Call the requested method |
190 | 190 | $aArgs = $this->getRequestManager()->process(); |
191 | 191 | $xResponse = $xCallableObject->call($this->sRequestedMethod, $aArgs); |
192 | - if(($xResponse)) |
|
192 | + if (($xResponse)) |
|
193 | 193 | { |
194 | 194 | $this->getResponseManager()->append($xResponse); |
195 | 195 | } |
@@ -47,11 +47,11 @@ discard block |
||
47 | 47 | |
48 | 48 | public function __construct() |
49 | 49 | { |
50 | - if(isset($_GET['jxnfun'])) |
|
50 | + if (isset($_GET['jxnfun'])) |
|
51 | 51 | { |
52 | 52 | $this->sRequestedFunction = $_GET['jxnfun']; |
53 | 53 | } |
54 | - if(isset($_POST['jxnfun'])) |
|
54 | + if (isset($_POST['jxnfun'])) |
|
55 | 55 | { |
56 | 56 | $this->sRequestedFunction = $_POST['jxnfun']; |
57 | 57 | } |
@@ -78,30 +78,30 @@ discard block |
||
78 | 78 | */ |
79 | 79 | public function register($sType, $sUserFunction, $aOptions) |
80 | 80 | { |
81 | - if($sType != $this->getName()) |
|
81 | + if ($sType != $this->getName()) |
|
82 | 82 | { |
83 | 83 | return false; |
84 | 84 | } |
85 | 85 | |
86 | - if(!is_string($sUserFunction)) |
|
86 | + if (!is_string($sUserFunction)) |
|
87 | 87 | { |
88 | 88 | throw new \Jaxon\Exception\Error($this->trans('errors.functions.invalid-declaration')); |
89 | 89 | } |
90 | 90 | |
91 | - if(is_string($aOptions)) |
|
91 | + if (is_string($aOptions)) |
|
92 | 92 | { |
93 | 93 | $aOptions = ['include' => $aOptions]; |
94 | 94 | } |
95 | - if(!is_array($aOptions)) |
|
95 | + if (!is_array($aOptions)) |
|
96 | 96 | { |
97 | 97 | throw new \Jaxon\Exception\Error($this->trans('errors.functions.invalid-declaration')); |
98 | 98 | } |
99 | 99 | |
100 | 100 | // Check if an alias is defined |
101 | 101 | $sFunctionName = $sUserFunction; |
102 | - foreach($aOptions as $sName => $sValue) |
|
102 | + foreach ($aOptions as $sName => $sValue) |
|
103 | 103 | { |
104 | - if($sName == 'alias') |
|
104 | + if ($sName == 'alias') |
|
105 | 105 | { |
106 | 106 | $sFunctionName = $sValue; |
107 | 107 | break; |
@@ -109,10 +109,10 @@ discard block |
||
109 | 109 | } |
110 | 110 | |
111 | 111 | $this->aFunctions[$sFunctionName] = $sUserFunction; |
112 | - jaxon()->di()->set($sFunctionName, function () use ($sUserFunction, $aOptions) { |
|
112 | + jaxon()->di()->set($sFunctionName, function() use ($sUserFunction, $aOptions) { |
|
113 | 113 | $xUserFunction = new \Jaxon\Request\Support\UserFunction($sUserFunction); |
114 | 114 | |
115 | - foreach($aOptions as $sName => $sValue) |
|
115 | + foreach ($aOptions as $sName => $sValue) |
|
116 | 116 | { |
117 | 117 | $xUserFunction->configure($sName, $sValue); |
118 | 118 | } |
@@ -142,7 +142,7 @@ discard block |
||
142 | 142 | { |
143 | 143 | $di = jaxon()->di(); |
144 | 144 | $code = ''; |
145 | - foreach($this->aFunctions as $sName) |
|
145 | + foreach ($this->aFunctions as $sName) |
|
146 | 146 | { |
147 | 147 | $xFunction = $di->get($sName); |
148 | 148 | $code .= $xFunction->getScript(); |
@@ -158,7 +158,7 @@ discard block |
||
158 | 158 | public function canProcessRequest() |
159 | 159 | { |
160 | 160 | // Check the validity of the function name |
161 | - if(($this->sRequestedFunction) && !$this->validateFunction($this->sRequestedFunction)) |
|
161 | + if (($this->sRequestedFunction) && !$this->validateFunction($this->sRequestedFunction)) |
|
162 | 162 | { |
163 | 163 | $this->sRequestedFunction = null; |
164 | 164 | } |
@@ -172,12 +172,12 @@ discard block |
||
172 | 172 | */ |
173 | 173 | public function processRequest() |
174 | 174 | { |
175 | - if(!$this->canProcessRequest()) |
|
175 | + if (!$this->canProcessRequest()) |
|
176 | 176 | { |
177 | 177 | return false; |
178 | 178 | } |
179 | 179 | |
180 | - if(!key_exists($this->sRequestedFunction, $this->aFunctions)) |
|
180 | + if (!key_exists($this->sRequestedFunction, $this->aFunctions)) |
|
181 | 181 | { |
182 | 182 | // Unable to find the requested function |
183 | 183 | throw new \Jaxon\Exception\Error($this->trans('errors.functions.invalid', |
@@ -187,7 +187,7 @@ discard block |
||
187 | 187 | $xFunction = jaxon()->di()->get($this->sRequestedFunction); |
188 | 188 | $aArgs = $this->getRequestManager()->process(); |
189 | 189 | $xResponse = $xFunction->call($aArgs); |
190 | - if(($xResponse)) |
|
190 | + if (($xResponse)) |
|
191 | 191 | { |
192 | 192 | $this->getResponseManager()->append($xResponse); |
193 | 193 | } |
@@ -63,7 +63,7 @@ discard block |
||
63 | 63 | */ |
64 | 64 | protected function getPrevLink() |
65 | 65 | { |
66 | - if(!($sCall = $this->xPaginator->getPrevCall())) |
|
66 | + if (!($sCall = $this->xPaginator->getPrevCall())) |
|
67 | 67 | { |
68 | 68 | return ''; |
69 | 69 | } |
@@ -78,7 +78,7 @@ discard block |
||
78 | 78 | */ |
79 | 79 | protected function getNextLink() |
80 | 80 | { |
81 | - if(!($sCall = $this->xPaginator->getNextCall())) |
|
81 | + if (!($sCall = $this->xPaginator->getNextCall())) |
|
82 | 82 | { |
83 | 83 | return ''; |
84 | 84 | } |
@@ -94,9 +94,9 @@ discard block |
||
94 | 94 | protected function getLinks() |
95 | 95 | { |
96 | 96 | $sLinks = ''; |
97 | - foreach($this->xPaginator->getPages() as $page) |
|
97 | + foreach ($this->xPaginator->getPages() as $page) |
|
98 | 98 | { |
99 | - if($page['call']) |
|
99 | + if ($page['call']) |
|
100 | 100 | { |
101 | 101 | $sTemplate = ($page['isCurrent'] ? 'pagination::links/current' : 'pagination::links/enabled'); |
102 | 102 | $sLinks .= $this->xTemplate->render($sTemplate, ['call' => $page['call'], 'text' => $page['num']]); |
@@ -100,8 +100,7 @@ |
||
100 | 100 | { |
101 | 101 | $sTemplate = ($page['isCurrent'] ? 'pagination::links/current' : 'pagination::links/enabled'); |
102 | 102 | $sLinks .= $this->xTemplate->render($sTemplate, ['call' => $page['call'], 'text' => $page['num']]); |
103 | - } |
|
104 | - else |
|
103 | + } else |
|
105 | 104 | { |
106 | 105 | $sLinks .= $this->xTemplate->render('pagination::links/disabled', ['text' => $page['num']]); |
107 | 106 | } |