jaxon-php / jaxon-core

src/Factory/Request.php

Doc Comments +2 added lines, -4 removed lines

@@ -54,7 +54,7 @@ 
      *
      * @param string|null            $sClass              The callable class
      *
-     * @return Factory
+     * @return Request
      */
     public function setClassName($sClass)
     {
@@ -82,7 +82,7 @@ 
      *
      * @param CallableObject          $xCallable              The callable object
      *
-     * @return Factory
+     * @return Request
      */
     public function setCallable(CallableObject $xCallable)
     {
@@ -95,7 +95,6 @@ 
      * Return the javascript call to a Jaxon function or object method
      *
      * @param string            $sFunction          The function or method (without class) name
-     * @param ...               $xParams            The parameters of the function or method
      *
      * @return \Jaxon\Request\Request
      */
@@ -124,7 +123,6 @@ 
      * Return the javascript call to a generic function
      *
      * @param string            $sFunction          The function or method (with class) name
-     * @param ...               $xParams            The parameters of the function or method
      *
      * @return \Jaxon\Request\Request
      */

src/DI/Container.php

Spacing +25 added lines, -25 removed lines

@@ -49,7 +49,7 @@ 
 
     public static function getInstance()
     {
-        if(!self::$xInstance)
+        if (!self::$xInstance)
         {
             self::$xInstance = new Container();
         }
@@ -109,15 +109,15 @@ 
          * Core library objects
          */
         // Jaxon Core
-        $this->coreContainer[Jaxon::class] = function () {
+        $this->coreContainer[Jaxon::class] = function() {
             return new Jaxon();
         };
         // Global Response
-        $this->coreContainer[Response::class] = function () {
+        $this->coreContainer[Response::class] = function() {
             return new Response();
         };
         // Dialog
-        $this->coreContainer[Dialog::class] = function () {
+        $this->coreContainer[Dialog::class] = function() {
             return new Dialog();
         };
 
@@ -125,41 +125,41 @@ 
          * Managers
          */
         // Callable objects repository
-        $this->coreContainer[CallableRepository::class] = function () {
+        $this->coreContainer[CallableRepository::class] = function() {
             return new CallableRepository();
         };
         // Plugin Manager
-        $this->coreContainer[PluginManager::class] = function () {
+        $this->coreContainer[PluginManager::class] = function() {
             return new PluginManager();
         };
         // Request Manager
-        $this->coreContainer[RequestHandler::class] = function ($c) {
+        $this->coreContainer[RequestHandler::class] = function($c) {
             return new RequestHandler($c[PluginManager::class]);
         };
         // Request Factory
-        $this->coreContainer[RequestFactory::class] = function ($c) {
+        $this->coreContainer[RequestFactory::class] = function($c) {
             return new RequestFactory($c[CallableRepository::class]);
         };
         // Parameter Factory
-        $this->coreContainer[ParameterFactory::class] = function () {
+        $this->coreContainer[ParameterFactory::class] = function() {
             return new ParameterFactory();
         };
         // Response Manager
-        $this->coreContainer[ResponseManager::class] = function () {
+        $this->coreContainer[ResponseManager::class] = function() {
             return new ResponseManager();
         };
         // Code Generator
-        $this->coreContainer[CodeGenerator::class] = function ($c) {
+        $this->coreContainer[CodeGenerator::class] = function($c) {
             return new CodeGenerator($c[PluginManager::class]);
         };
 
         /*
          * Config
          */
-        $this->coreContainer[Config::class] = function () {
+        $this->coreContainer[Config::class] = function() {
             return new Config();
         };
-        $this->coreContainer[ConfigReader::class] = function () {
+        $this->coreContainer[ConfigReader::class] = function() {
             return new ConfigReader();
         };
 
@@ -167,31 +167,31 @@ 
          * Services
          */
         // Minifier
-        $this->coreContainer[Minifier::class] = function () {
+        $this->coreContainer[Minifier::class] = function() {
             return new Minifier();
         };
         // Translator
-        $this->coreContainer[Translator::class] = function ($c) {
+        $this->coreContainer[Translator::class] = function($c) {
             return new Translator($c['jaxon.core.translation_dir'], $c[Config::class]);
         };
         // Template engine
-        $this->coreContainer[Template::class] = function ($c) {
+        $this->coreContainer[Template::class] = function($c) {
             return new Template($c['jaxon.core.template_dir']);
         };
         // Validator
-        $this->coreContainer[Validator::class] = function ($c) {
+        $this->coreContainer[Validator::class] = function($c) {
             return new Validator($c[Translator::class], $c[Config::class]);
         };
         // Pagination Renderer
-        $this->coreContainer[PaginationRenderer::class] = function ($c) {
+        $this->coreContainer[PaginationRenderer::class] = function($c) {
             return new PaginationRenderer($c[Template::class]);
         };
         // Pagination Paginator
-        $this->coreContainer[Paginator::class] = function ($c) {
+        $this->coreContainer[Paginator::class] = function($c) {
             return new Paginator($c[PaginationRenderer::class]);
         };
         // Event Dispatcher
-        $this->coreContainer[EventDispatcher::class] = function () {
+        $this->coreContainer[EventDispatcher::class] = function() {
             return new EventDispatcher();
         };
 
@@ -210,7 +210,7 @@ 
      */
     public function get($sClass)
     {
-        if($this->sentryContainer != null && $this->sentryContainer->has($sClass))
+        if ($this->sentryContainer != null && $this->sentryContainer->has($sClass))
         {
             return $this->sentryContainer->get($sClass);
         }
@@ -515,14 +515,14 @@ 
         $this->coreContainer['jaxon.sentry.view.base.' . $sId] = $xClosure;
 
         // Return the initialized view renderer
-        $this->coreContainer['jaxon.sentry.view.' . $sId] = function ($c) use ($sId) {
+        $this->coreContainer['jaxon.sentry.view.' . $sId] = function($c) use ($sId) {
             // Get the defined renderer
             $renderer = $c['jaxon.sentry.view.base.' . $sId];
             // Init the renderer with the template namespaces
             $aNamespaces = $this->coreContainer['jaxon.view.data.namespaces'];
-            if(key_exists($sId, $aNamespaces))
+            if (key_exists($sId, $aNamespaces))
             {
-                foreach($aNamespaces[$sId] as $ns)
+                foreach ($aNamespaces[$sId] as $ns)
                 {
                     $renderer->addNamespace($ns['namespace'], $ns['directory'], $ns['extension']);
                 }
@@ -540,7 +540,7 @@ 
      */
     public function getViewRenderer($sId = '')
     {
-        if(!$sId)
+        if (!$sId)
         {
             // Return the view renderer facade
             return $this->coreContainer[\Jaxon\Sentry\View\Facade::class];

src/Dialog/Alert.php

Spacing +1 added lines, -1 removed lines

@@ -27,7 +27,7 @@
     protected function alert($message, $title)
     {
         $title = ''; // Not used.
-        if($this->getReturn())
+        if ($this->getReturn())
         {
             return 'alert(' . $message . ')';
         }

src/Plugin/Manager.php

Spacing +20 added lines, -20 removed lines

@@ -132,32 +132,32 @@ 
     {
         $bIsAlert = ($xPlugin instanceof \Jaxon\Dialog\Interfaces\Alert);
         $bIsConfirm = ($xPlugin instanceof \Jaxon\Dialog\Interfaces\Confirm);
-        if($xPlugin instanceof Request)
+        if ($xPlugin instanceof Request)
         {
             // The name of a request plugin is used as key in the plugin table
             $this->aRequestPlugins[$xPlugin->getName()] = $xPlugin;
         }
-        elseif($xPlugin instanceof Response)
+        elseif ($xPlugin instanceof Response)
         {
             // The name of a response plugin is used as key in the plugin table
             $this->aResponsePlugins[$xPlugin->getName()] = $xPlugin;
         }
-        elseif(!$bIsConfirm && !$bIsAlert)
+        elseif (!$bIsConfirm && !$bIsAlert)
         {
             throw new \Jaxon\Exception\Error($this->trans('errors.register.invalid', ['name' => get_class($xPlugin)]));
         }
         // This plugin implements the Alert interface
-        if($bIsAlert)
+        if ($bIsAlert)
         {
             jaxon()->dialog()->setAlert($xPlugin);
         }
         // This plugin implements the Confirm interface
-        if($bIsConfirm)
+        if ($bIsConfirm)
         {
             jaxon()->dialog()->setConfirm($xPlugin);
         }
         // Register the plugin as an event listener
-        if($xPlugin instanceof \Jaxon\Utils\Interfaces\EventListener)
+        if ($xPlugin instanceof \Jaxon\Utils\Interfaces\EventListener)
         {
             $this->addEventListener($xPlugin);
         }
@@ -192,7 +192,7 @@ 
      */
     public function register($sType, $sCallable, $aOptions = [])
     {
-        if(!key_exists($sType, $this->aRequestPlugins))
+        if (!key_exists($sType, $this->aRequestPlugins))
         {
             throw new \Jaxon\Exception\Error($this->trans('errors.register.plugin', ['name' => $sType]));
         }
@@ -220,14 +220,14 @@ 
     {
         // Register user functions
         $aFunctionsConfig = $xAppConfig->getOption('functions', []);
-        foreach($aFunctionsConfig as $xKey => $xValue)
+        foreach ($aFunctionsConfig as $xKey => $xValue)
         {
-            if(is_integer($xKey) && is_string($xValue))
+            if (is_integer($xKey) && is_string($xValue))
             {
                 // Register a function without options
                 $this->register(Jaxon::USER_FUNCTION, $xValue);
             }
-            elseif(is_string($xKey) && is_array($xValue))
+            elseif (is_string($xKey) && is_array($xValue))
             {
                 // Register a function with options
                 $this->register(Jaxon::USER_FUNCTION, $xKey, $xValue);
@@ -241,22 +241,22 @@ 
 
         // Register classes and directories
         $aClassesConfig = $xAppConfig->getOption('classes', []);
-        foreach($aClassesConfig as $xKey => $xValue)
+        foreach ($aClassesConfig as $xKey => $xValue)
         {
-            if(is_integer($xKey) && is_string($xValue))
+            if (is_integer($xKey) && is_string($xValue))
             {
                 // Register a class without options
                 $this->register(Jaxon::CALLABLE_CLASS, $xValue);
             }
-            elseif(is_string($xKey) && is_array($xValue))
+            elseif (is_string($xKey) && is_array($xValue))
             {
                 // Register a class with options
                 $this->register(Jaxon::CALLABLE_CLASS, $xKey, $xValue);
             }
-            elseif(is_integer($xKey) && is_array($xValue))
+            elseif (is_integer($xKey) && is_array($xValue))
             {
                 // The directory path is required
-                if(!key_exists('directory', $xValue))
+                if (!key_exists('directory', $xValue))
                 {
                     continue;
                     // Todo: throw an exception
@@ -264,17 +264,17 @@ 
                 // Registering a directory
                 $sDirectory = $xValue['directory'];
                 $aOptions = [];
-                if(key_exists('options', $xValue) &&
+                if (key_exists('options', $xValue) &&
                     is_array($xValue['options']) || is_string($xValue['options']))
                 {
                     $aOptions = $xValue['options'];
                 }
                 // Setup directory options
-                if(key_exists('namespace', $xValue))
+                if (key_exists('namespace', $xValue))
                 {
                     $aOptions['namespace'] = $xValue['namespace'];
                 }
-                if(key_exists('separator', $xValue))
+                if (key_exists('separator', $xValue))
                 {
                     $aOptions['separator'] = $xValue['separator'];
                 }
@@ -299,7 +299,7 @@ 
      */
     public function getResponsePlugin($sName)
     {
-        if(array_key_exists($sName, $this->aResponsePlugins))
+        if (array_key_exists($sName, $this->aResponsePlugins))
         {
             return $this->aResponsePlugins[$sName];
         }
@@ -315,7 +315,7 @@ 
      */
     public function getRequestPlugin($sName)
     {
-        if(array_key_exists($sName, $this->aRequestPlugins))
+        if (array_key_exists($sName, $this->aRequestPlugins))
         {
             return $this->aRequestPlugins[$sName];
         }

Braces +7 added lines, -14 removed lines

@@ -136,13 +136,11 @@ 
         {
             // The name of a request plugin is used as key in the plugin table
             $this->aRequestPlugins[$xPlugin->getName()] = $xPlugin;
-        }
-        elseif($xPlugin instanceof Response)
+        } elseif($xPlugin instanceof Response)
         {
             // The name of a response plugin is used as key in the plugin table
             $this->aResponsePlugins[$xPlugin->getName()] = $xPlugin;
-        }
-        elseif(!$bIsConfirm && !$bIsAlert)
+        } elseif(!$bIsConfirm && !$bIsAlert)
         {
             throw new \Jaxon\Exception\Error($this->trans('errors.register.invalid', ['name' => get_class($xPlugin)]));
         }
@@ -226,13 +224,11 @@ 
             {
                 // Register a function without options
                 $this->register(Jaxon::USER_FUNCTION, $xValue);
-            }
-            elseif(is_string($xKey) && is_array($xValue))
+            } elseif(is_string($xKey) && is_array($xValue))
             {
                 // Register a function with options
                 $this->register(Jaxon::USER_FUNCTION, $xKey, $xValue);
-            }
-            else
+            } else
             {
                 continue;
                 // Todo: throw an exception
@@ -247,13 +243,11 @@ 
             {
                 // Register a class without options
                 $this->register(Jaxon::CALLABLE_CLASS, $xValue);
-            }
-            elseif(is_string($xKey) && is_array($xValue))
+            } elseif(is_string($xKey) && is_array($xValue))
             {
                 // Register a class with options
                 $this->register(Jaxon::CALLABLE_CLASS, $xKey, $xValue);
-            }
-            elseif(is_integer($xKey) && is_array($xValue))
+            } elseif(is_integer($xKey) && is_array($xValue))
             {
                 // The directory path is required
                 if(!key_exists('directory', $xValue))
@@ -280,8 +274,7 @@ 
                 }
                 // Register a class without options
                 $this->register(Jaxon::CALLABLE_DIR, $sDirectory, $aOptions);
-            }
-            else
+            } else
             {
                 continue;
                 // Todo: throw an exception