jaxon-php / jaxon-core

src/Request/Plugin/CallableClass.php

Spacing +22 added lines, -22 removed lines

@@ -64,19 +64,19 @@ 
     {
         $this->xRepository = $xRepository;
 
-        if(!empty($_GET['jxncls']))
+        if (!empty($_GET['jxncls']))
         {
             $this->sRequestedClass = trim($_GET['jxncls']);
         }
-        if(!empty($_GET['jxnmthd']))
+        if (!empty($_GET['jxnmthd']))
         {
             $this->sRequestedMethod = trim($_GET['jxnmthd']);
         }
-        if(!empty($_POST['jxncls']))
+        if (!empty($_POST['jxncls']))
         {
             $this->sRequestedClass = trim($_POST['jxncls']);
         }
-        if(!empty($_POST['jxnmthd']))
+        if (!empty($_POST['jxnmthd']))
         {
             $this->sRequestedMethod = trim($_POST['jxnmthd']);
         }
@@ -99,7 +99,7 @@ 
      */
     public function getTarget()
     {
-        if(!$this->sRequestedClass || !$this->sRequestedMethod)
+        if (!$this->sRequestedClass || !$this->sRequestedMethod)
         {
             return null;
         }
@@ -118,20 +118,20 @@ 
     public function register($sType, $sClassName, $aOptions)
     {
         $sType = trim($sType);
-        if($sType != $this->getName())
+        if ($sType != $this->getName())
         {
             return false;
         }
 
-        if(!is_string($sClassName))
+        if (!is_string($sClassName))
         {
             throw new \Jaxon\Exception\Error($this->trans('errors.objects.invalid-declaration'));
         }
-        if(is_string($aOptions))
+        if (is_string($aOptions))
         {
             $aOptions = ['include' => $aOptions];
         }
-        if(!is_array($aOptions))
+        if (!is_array($aOptions))
         {
             throw new \Jaxon\Exception\Error($this->trans('errors.objects.invalid-declaration'));
         }
@@ -154,11 +154,11 @@ 
         $aCallableObjects = $this->xRepository->getCallableObjects();
         $sHash = '';
 
-        foreach($aNamespaces as $sNamespace => $aOptions)
+        foreach ($aNamespaces as $sNamespace => $aOptions)
         {
             $sHash .= $sNamespace . $aOptions['separator'];
         }
-        foreach($aCallableObjects as $sClassName => $xCallableObject)
+        foreach ($aCallableObjects as $sClassName => $xCallableObject)
         {
             $sHash .= $sClassName . implode('|', $xCallableObject->getMethods());
         }
@@ -183,21 +183,21 @@ 
 
         $xCallableClass = new \ReflectionClass(UserCallableClass::class);
         $aCallableMethods = [];
-        foreach($xCallableClass->getMethods(\ReflectionMethod::IS_PUBLIC) as $xMethod)
+        foreach ($xCallableClass->getMethods(\ReflectionMethod::IS_PUBLIC) as $xMethod)
         {
             $aCallableMethods[] = $xMethod->getName();
         }
 
-        foreach(array_keys($aNamespaces) as $sNamespace)
+        foreach (array_keys($aNamespaces) as $sNamespace)
         {
             $offset = 0;
             $sJsNamespace = str_replace('\\', '.', $sNamespace);
             $sJsNamespace .= '.Null'; // This is a sentinel. The last token is not processed in the while loop.
-            while(($dotPosition = strpos($sJsNamespace, '.', $offset)) !== false)
+            while (($dotPosition = strpos($sJsNamespace, '.', $offset)) !== false)
             {
                 $sJsClass = substr($sJsNamespace, 0, $dotPosition);
                 // Generate code for this object
-                if(!key_exists($sJsClass, $aJsClasses))
+                if (!key_exists($sJsClass, $aJsClasses))
                 {
                     $sCode .= "$sPrefix$sJsClass = {};\n";
                     $aJsClasses[$sJsClass] = $sJsClass;
@@ -206,17 +206,17 @@ 
             }
         }
 
-        foreach($aCallableObjects as $sClassName => $xCallableObject)
+        foreach ($aCallableObjects as $sClassName => $xCallableObject)
         {
             $aConfig = $aCallableOptions[$sClassName];
             $aCommonConfig = key_exists('*', $aConfig) ? $aConfig['*'] : [];
 
             $aProtectedMethods = is_subclass_of($sClassName, UserCallableClass::class) ? $aCallableMethods : [];
             $aMethods = [];
-            foreach($xCallableObject->getMethods() as $sMethodName)
+            foreach ($xCallableObject->getMethods() as $sMethodName)
             {
                 // Don't export methods of the CallableClass class
-                if(in_array($sMethodName, $aProtectedMethods))
+                if (in_array($sMethodName, $aProtectedMethods))
                 {
                     continue;
                 }
@@ -247,7 +247,7 @@ 
     public function canProcessRequest()
     {
         // Check the validity of the class name
-        if(($this->sRequestedClass !== null && !$this->validateClass($this->sRequestedClass)) ||
+        if (($this->sRequestedClass !== null && !$this->validateClass($this->sRequestedClass)) ||
             ($this->sRequestedMethod !== null && !$this->validateMethod($this->sRequestedMethod)))
         {
             $this->sRequestedClass = null;
@@ -263,14 +263,14 @@ 
      */
     public function processRequest()
     {
-        if(!$this->canProcessRequest())
+        if (!$this->canProcessRequest())
         {
             return false;
         }
 
         // Find the requested method
         $xCallableObject = $this->xRepository->getCallableObject($this->sRequestedClass);
-        if(!$xCallableObject || !$xCallableObject->hasMethod($this->sRequestedMethod))
+        if (!$xCallableObject || !$xCallableObject->hasMethod($this->sRequestedMethod))
         {
             // Unable to find the requested object or method
             throw new \Jaxon\Exception\Error($this->trans('errors.objects.invalid',
@@ -281,7 +281,7 @@ 
         $di = jaxon()->di();
         $aArgs = $di->getRequestHandler()->processArguments();
         $xResponse = $xCallableObject->call($this->sRequestedMethod, $aArgs);
-        if(($xResponse))
+        if (($xResponse))
         {
             $di->getResponseManager()->append($xResponse);
         }

src/Request/Handler.php

Braces +3 added lines, -6 removed lines

@@ -191,8 +191,7 @@ 
         if(($xCallback = $this->xCallbackManager->error()))
         {
             call_user_func_array($xCallback, [$xException]);
-        }
-        else
+        } else
         {
             throw $xException;
         }
@@ -275,8 +274,7 @@ 
                 {
                     $this->xTargetRequestPlugin->processRequest();
                 }
-            }
-            catch(Exception $e)
+            } catch(Exception $e)
             {
                 // An exception was thrown while processing the request.
                 // The request missed the corresponding handler function,
@@ -287,8 +285,7 @@ 
                 if($e instanceof \Jaxon\Exception\Error)
                 {
                     $this->onInvalid($e->getMessage());
-                }
-                else
+                } else
                 {
                     $this->onError($e);
                 }

Spacing +19 added lines, -19 removed lines

@@ -144,7 +144,7 @@ 
     public function onBefore(&$bEndRequest)
     {
         // Call the user defined callback
-        if(($xCallback = $this->xCallbackManager->before()))
+        if (($xCallback = $this->xCallbackManager->before()))
         {
             call_user_func_array($xCallback, [$this->xTargetRequestPlugin->getTarget(), &$bEndRequest]);
         }
@@ -157,7 +157,7 @@ 
      */
     public function onAfter($bEndRequest)
     {
-        if(($xCallback = $this->xCallbackManager->after()))
+        if (($xCallback = $this->xCallbackManager->after()))
         {
             call_user_func_array($xCallback, [$this->xTargetRequestPlugin->getTarget(), $bEndRequest]);
         }
@@ -170,7 +170,7 @@ 
      */
     public function onInvalid($sMessage)
     {
-        if(($xCallback = $this->xCallbackManager->invalid()))
+        if (($xCallback = $this->xCallbackManager->invalid()))
         {
             call_user_func_array($xCallback, [$sMessage]);
         }
@@ -183,7 +183,7 @@ 
      */
     public function onError(Exception $xException)
     {
-        if(($xCallback = $this->xCallbackManager->error()))
+        if (($xCallback = $this->xCallbackManager->error()))
         {
             call_user_func_array($xCallback, [$xException]);
         }
@@ -203,15 +203,15 @@ 
     public function canProcessRequest()
     {
         // Return true if the request plugin was already found
-        if(($this->xTargetRequestPlugin))
+        if (($this->xTargetRequestPlugin))
         {
             return true;
         }
 
         // Find a plugin to process the request
-        foreach($this->xPluginManager->getRequestPlugins() as $xPlugin)
+        foreach ($this->xPluginManager->getRequestPlugins() as $xPlugin)
         {
-            if($xPlugin->getName() != Jaxon::FILE_UPLOAD && $xPlugin->canProcessRequest())
+            if ($xPlugin->getName() != Jaxon::FILE_UPLOAD && $xPlugin->canProcessRequest())
             {
                 $this->xTargetRequestPlugin = $xPlugin;
                 return true;
@@ -235,7 +235,7 @@ 
     public function processRequest()
     {
         // Check to see if headers have already been sent out, in which case we can't do our job
-        if(headers_sent($filename, $linenumber))
+        if (headers_sent($filename, $linenumber))
         {
             echo $this->trans('errors.output.already-sent', [
                 'location' => $filename . ':' . $linenumber
@@ -244,7 +244,7 @@ 
         }
 
         // Check if there is a plugin to process this request
-        if(!$this->canProcessRequest())
+        if (!$this->canProcessRequest())
         {
             return;
         }
@@ -252,12 +252,12 @@ 
         $bEndRequest = false;
 
         // Handle before processing event
-        if(($this->xTargetRequestPlugin))
+        if (($this->xTargetRequestPlugin))
         {
             $this->onBefore($bEndRequest);
         }
 
-        if(!$bEndRequest)
+        if (!$bEndRequest)
         {
             try
             {
@@ -265,12 +265,12 @@ 
                 $this->xUploadRequestPlugin->processRequest();
 
                 // Process the request
-                if(($this->xTargetRequestPlugin))
+                if (($this->xTargetRequestPlugin))
                 {
                     $this->xTargetRequestPlugin->processRequest();
                 }
             }
-            catch(Exception $e)
+            catch (Exception $e)
             {
                 // An exception was thrown while processing the request.
                 // The request missed the corresponding handler function,
@@ -278,7 +278,7 @@ 
 
                 $this->xResponseManager->error($e->getMessage());
 
-                if($e instanceof \Jaxon\Exception\Error)
+                if ($e instanceof \Jaxon\Exception\Error)
                 {
                     $this->onInvalid($e->getMessage());
                 }
@@ -290,7 +290,7 @@ 
         }
 
         // Clean the processing buffer
-        if(($this->getOption('core.process.clean')))
+        if (($this->getOption('core.process.clean')))
         {
             $er = error_reporting(0);
             while (ob_get_level() > 0)
@@ -300,25 +300,25 @@ 
             error_reporting($er);
         }
 
-        if(($this->xTargetRequestPlugin))
+        if (($this->xTargetRequestPlugin))
         {
             // Handle after processing event
             $this->onAfter($bEndRequest);
         }
 
         // If the called function returned no response, take the the global response
-        if(!$this->xResponseManager->getResponse())
+        if (!$this->xResponseManager->getResponse())
         {
             $this->xResponseManager->append(jaxon()->getResponse());
         }
 
         $this->xResponseManager->printDebug();
 
-        if(($this->getOption('core.response.send')))
+        if (($this->getOption('core.response.send')))
         {
             $this->xResponseManager->sendOutput();
 
-            if(($this->getOption('core.process.exit')))
+            if (($this->getOption('core.process.exit')))
             {
                 exit();
             }

src/Request/Target.php

Indentation +5 added lines, -5 removed lines

@@ -100,11 +100,11 @@
         return new Target(self::TYPE_CLASS, '', $sClassName, $sMethodName);
     }
 
-     /**
-     * Check if the target type is Function.
-     *
-     * @return bool
-     */
+        /**
+         * Check if the target type is Function.
+         *
+         * @return bool
+         */
     public function isFunction()
     {
         return $this->sType == self::TYPE_FUNCTION;

src/Features/View/Namespaces.php

Spacing +1 added lines, -1 removed lines

@@ -60,7 +60,7 @@
     {
         $this->sDirectory = '';
         $this->sExtension = '';
-        if(key_exists($sNamespace, $this->aDirectories))
+        if (key_exists($sNamespace, $this->aDirectories))
         {
             // Make sure there's only one '/' at the end of the string
             $this->sDirectory = rtrim($this->aDirectories[$sNamespace]['path'], '/') . '/';

src/Utils/Template/Engine.php

Spacing +4 added lines, -4 removed lines

@@ -55,7 +55,7 @@ 
     public function addNamespace($sNamespace, $sDirectory, $sExtension = '')
     {
         // The 'jaxon' key cannot be overriden
-        if($sNamespace == 'jaxon')
+        if ($sNamespace == 'jaxon')
         {
             return;
         }
@@ -92,18 +92,18 @@ 
         // Get the namespace name
         $sNamespace = '';
         $iSeparatorPosition = strrpos($sTemplate, '::');
-        if($iSeparatorPosition !== false)
+        if ($iSeparatorPosition !== false)
         {
             $sNamespace = substr($sTemplate, 0, $iSeparatorPosition);
             $sTemplate = substr($sTemplate, $iSeparatorPosition + 2);
         }
         // The default namespace is 'jaxon'
-        if(!($sNamespace = trim($sNamespace)))
+        if (!($sNamespace = trim($sNamespace)))
         {
             $sNamespace = 'jaxon';
         }
         // Check if the namespace is defined
-        if(!key_exists($sNamespace, $this->aNamespaces))
+        if (!key_exists($sNamespace, $this->aNamespaces))
         {
             return '';
         }

src/Utils/DI/Container.php

Spacing +31 added lines, -31 removed lines

@@ -125,19 +125,19 @@ 
          * Core library objects
          */
         // Global Response
-        $this->libContainer[Response::class] = function () {
+        $this->libContainer[Response::class] = function() {
             return new Response();
         };
         // Dialog
-        $this->libContainer[Dialog::class] = function () {
+        $this->libContainer[Dialog::class] = function() {
             return new Dialog();
         };
         // Jaxon App
-        $this->libContainer[App::class] = function () {
+        $this->libContainer[App::class] = function() {
             return new App();
         };
         // Jaxon App bootstrap
-        $this->libContainer[Bootstrap::class] = function () {
+        $this->libContainer[Bootstrap::class] = function() {
             return new Bootstrap();
         };
 
@@ -145,27 +145,27 @@ 
          * Plugins
          */
         // Callable objects repository
-        $this->libContainer[CallableRepository::class] = function () {
+        $this->libContainer[CallableRepository::class] = function() {
             return new CallableRepository();
         };
         // Callable class plugin
-        $this->libContainer[CallableClass::class] = function ($c) {
+        $this->libContainer[CallableClass::class] = function($c) {
             return new CallableClass($c[CallableRepository::class]);
         };
         // Callable dir plugin
-        $this->libContainer[CallableDir::class] = function ($c) {
+        $this->libContainer[CallableDir::class] = function($c) {
             return new CallableDir($c[CallableRepository::class]);
         };
         // Callable function plugin
-        $this->libContainer[CallableFunction::class] = function () {
+        $this->libContainer[CallableFunction::class] = function() {
             return new CallableFunction();
         };
         // File upload plugin
-        $this->libContainer[FileUpload::class] = function () {
+        $this->libContainer[FileUpload::class] = function() {
             return new FileUpload();
         };
         // JQuery response plugin
-        $this->libContainer[JQueryPlugin::class] = function () {
+        $this->libContainer[JQueryPlugin::class] = function() {
             return new JQueryPlugin();
         };
 
@@ -173,45 +173,45 @@ 
          * Managers
          */
         // Plugin Manager
-        $this->libContainer[PluginManager::class] = function () {
+        $this->libContainer[PluginManager::class] = function() {
             return new PluginManager();
         };
         // Request Handler
-        $this->libContainer[RequestHandler::class] = function ($c) {
+        $this->libContainer[RequestHandler::class] = function($c) {
             return new RequestHandler($c[PluginManager::class], $c[ResponseManager::class], $c[FileUpload::class]);
         };
         // Request Factory
-        $this->libContainer[RequestFactory::class] = function ($c) {
+        $this->libContainer[RequestFactory::class] = function($c) {
             return new RequestFactory($c[CallableRepository::class]);
         };
         // Parameter Factory
-        $this->libContainer[ParameterFactory::class] = function () {
+        $this->libContainer[ParameterFactory::class] = function() {
             return new ParameterFactory();
         };
         // Response Manager
-        $this->libContainer[ResponseManager::class] = function () {
+        $this->libContainer[ResponseManager::class] = function() {
             return new ResponseManager();
         };
         // Code Generator
-        $this->libContainer[CodeGenerator::class] = function ($c) {
+        $this->libContainer[CodeGenerator::class] = function($c) {
             return new CodeGenerator($c[PluginManager::class], $c[TemplateEngine::class]);
         };
         // View Manager
-        $this->libContainer[ViewManager::class] = function () {
+        $this->libContainer[ViewManager::class] = function() {
             return new ViewManager();
         };
         // View Renderer
-        $this->libContainer[ViewRenderer::class] = function ($c) {
+        $this->libContainer[ViewRenderer::class] = function($c) {
             return new ViewRenderer($c[ViewManager::class]);
         };
 
         /*
          * Config
          */
-        $this->libContainer[Config::class] = function () {
+        $this->libContainer[Config::class] = function() {
             return new Config();
         };
-        $this->libContainer[ConfigReader::class] = function () {
+        $this->libContainer[ConfigReader::class] = function() {
             return new ConfigReader();
         };
 
@@ -219,35 +219,35 @@ 
          * Services
          */
         // Minifier
-        $this->libContainer[Minifier::class] = function () {
+        $this->libContainer[Minifier::class] = function() {
             return new Minifier();
         };
         // Translator
-        $this->libContainer[Translator::class] = function ($c) {
+        $this->libContainer[Translator::class] = function($c) {
             return new Translator($c['jaxon.core.translation_dir'], $c[Config::class]);
         };
         // Template engine
-        $this->libContainer[TemplateEngine::class] = function ($c) {
+        $this->libContainer[TemplateEngine::class] = function($c) {
             return new TemplateEngine($c['jaxon.core.template_dir']);
         };
         // Template Renderer
-        $this->libContainer[TemplateRenderer::class] = function ($c) {
+        $this->libContainer[TemplateRenderer::class] = function($c) {
             return $c[TemplateEngine::class];
         };
         // Validator
-        $this->libContainer[Validator::class] = function ($c) {
+        $this->libContainer[Validator::class] = function($c) {
             return new Validator($c[Translator::class], $c[Config::class]);
         };
         // Pagination Paginator
-        $this->libContainer[Paginator::class] = function ($c) {
+        $this->libContainer[Paginator::class] = function($c) {
             return new Paginator($c[PaginationRenderer::class]);
         };
         // Pagination Renderer
-        $this->libContainer[PaginationRenderer::class] = function ($c) {
+        $this->libContainer[PaginationRenderer::class] = function($c) {
             return new PaginationRenderer($c[TemplateRenderer::class]);
         };
         // Event Dispatcher
-        $this->libContainer[EventDispatcher::class] = function () {
+        $this->libContainer[EventDispatcher::class] = function() {
             return new EventDispatcher();
         };
     }
@@ -259,7 +259,7 @@ 
      */
     public function get($sClass)
     {
-        if($this->appContainer != null && $this->appContainer->has($sClass))
+        if ($this->appContainer != null && $this->appContainer->has($sClass))
         {
             return $this->appContainer->get($sClass);
         }
@@ -289,7 +289,7 @@ 
      */
     public function alias($sClass, $sAlias)
     {
-        $this->libContainer[$sClass] = function ($c) use ($sAlias) {
+        $this->libContainer[$sClass] = function($c) use ($sAlias) {
             return $c[$sAlias];
         };
     }
@@ -559,7 +559,7 @@ 
      */
     public function setCallableClassRequestFactory($sClassName, CallableObject $xCallableObject)
     {
-        $this->libContainer[$sClassName . '_RequestFactory'] = function () use ($xCallableObject) {
+        $this->libContainer[$sClassName . '_RequestFactory'] = function() use ($xCallableObject) {
             // $xCallableObject = $c[CallableRepository::class]->getCallableObject($sClassName);
             return new CallableClassRequestFactory($xCallableObject);
         };

src/Request/Handler/Callback.php

Spacing +5 added lines, -5 removed lines

@@ -58,7 +58,7 @@ 
      */
     public function before($xCallable = null)
     {
-        if($xCallable === null)
+        if ($xCallable === null)
         {
             return $this->xBeforeCallback;
         }
@@ -74,7 +74,7 @@ 
      */
     public function after($xCallable = null)
     {
-        if($xCallable === null)
+        if ($xCallable === null)
         {
             return $this->xAfterCallback;
         }
@@ -90,7 +90,7 @@ 
      */
     public function invalid($xCallable = null)
     {
-        if($xCallable === null)
+        if ($xCallable === null)
         {
             return $this->xInvalidCallback;
         }
@@ -106,7 +106,7 @@ 
      */
     public function error($xCallable = null)
     {
-        if($xCallable === null)
+        if ($xCallable === null)
         {
             return $this->xErrorCallback;
         }
@@ -122,7 +122,7 @@ 
      */
     public function init($xCallable = null)
     {
-        if($xCallable === null)
+        if ($xCallable === null)
         {
             return $this->xInitCallback;
         }

src/Jaxon.php

Spacing +5 added lines, -5 removed lines

@@ -82,7 +82,7 @@ 
      */
     public static function getInstance()
     {
-        if(self::$xInstance == null)
+        if (self::$xInstance == null)
         {
             self::$xInstance = new Jaxon();
         }
@@ -94,7 +94,7 @@ 
      */
     public function __construct()
     {
-        if(self::$xContainer == null)
+        if (self::$xContainer == null)
         {
             self::$xContainer = new Container();
             $this->setDefaultOptions();
@@ -154,7 +154,7 @@ 
             'core.prefix.class'                 => 'Jaxon',
             // 'core.request.uri'               => '',
             'core.request.mode'                 => 'asynchronous',
-            'core.request.method'               => 'POST',    // W3C: Method is case sensitive
+            'core.request.method'               => 'POST', // W3C: Method is case sensitive
             'core.response.send'                => true,
             'core.response.merge.ap'            => true,
             'core.response.merge.js'            => true,
@@ -240,11 +240,11 @@ 
      */
     public function register($sType, $sCallable, $xOptions = [])
     {
-        if($sType == Jaxon::PROCESSING_EVENT)
+        if ($sType == Jaxon::PROCESSING_EVENT)
         {
             $sEvent = $sCallable;
             $xCallback = $xOptions;
-            switch($sEvent)
+            switch ($sEvent)
             {
             case Jaxon::PROCESSING_EVENT_BEFORE:
                 $this->callback()->before($xCallback);

src/Response/AbstractResponse.php

Spacing +2 added lines, -2 removed lines

@@ -31,7 +31,7 @@ 
      */
     public function sendHeaders()
     {
-        if($this->getRequesthandler()->requestMethodIsGet())
+        if ($this->getRequesthandler()->requestMethodIsGet())
         {
             header("Expires: Mon, 26 Jul 1997 05:00:00 GMT");
             header("Last-Modified: " . gmdate("D, d M Y H:i:s") . " GMT");
@@ -41,7 +41,7 @@ 
 
         $sCharacterSet = '';
         $sCharacterEncoding = $this->getCharacterEncoding();
-        if(is_string($sCharacterEncoding) && strlen($sCharacterEncoding) > 0)
+        if (is_string($sCharacterEncoding) && strlen($sCharacterEncoding) > 0)
         {
             $sCharacterSet = '; charset="' . $sCharacterEncoding . '"';
         }