jaxon-php / jaxon-core

src/Request/Factory.php

Doc Comments -2 removed lines

@@ -96,7 +96,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 Request
      */
@@ -125,7 +124,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 Request
      */

src/Request/Factory/Request.php

Unused Use Statements -1 removed lines

@@ -20,7 +20,6 @@
 
 namespace Jaxon\Request\Factory;
 
-use JsonSerializable;
 use Jaxon\Jaxon;
 
 class Request extends JsCall

Spacing +16 added lines, -16 removed lines

@@ -51,9 +51,9 @@ 
      */
     public function hasPageNumber()
     {
-        foreach($this->aParameters as $xParameter)
+        foreach ($this->aParameters as $xParameter)
         {
-            if($xParameter->getType() == Jaxon::PAGE_NUMBER)
+            if ($xParameter->getType() == Jaxon::PAGE_NUMBER)
             {
                 return true;
             }
@@ -71,9 +71,9 @@ 
     public function setPageNumber($nPageNumber)
     {
         // Set the value of the Jaxon::PAGE_NUMBER parameter
-        foreach($this->aParameters as $xParameter)
+        foreach ($this->aParameters as $xParameter)
         {
-            if($xParameter->getType() == Jaxon::PAGE_NUMBER)
+            if ($xParameter->getType() == Jaxon::PAGE_NUMBER)
             {
                 $xParameter->setValue(intval($nPageNumber));
                 break;
@@ -91,7 +91,7 @@ 
      */
     private function setMessageArgs(array $aArgs)
     {
-        array_walk($aArgs, function (&$xParameter) {
+        array_walk($aArgs, function(&$xParameter) {
             $xParameter = Parameter::make($xParameter);
         });
         $this->aMessageArgs = $aArgs;
@@ -146,12 +146,12 @@ 
         // This array will avoid declaring multiple variables with the same value.
         // The array key is the variable value, while the array value is the variable name.
         $aVariables = []; // Array of local variables.
-        foreach($this->aParameters as &$xParameter)
+        foreach ($this->aParameters as &$xParameter)
         {
             $sParameterStr = $xParameter->getScript();
-            if($xParameter instanceof \Jaxon\Response\Plugin\JQuery\Dom\Element)
+            if ($xParameter instanceof \Jaxon\Response\Plugin\JQuery\Dom\Element)
             {
-                if(!array_key_exists($sParameterStr, $aVariables))
+                if (!array_key_exists($sParameterStr, $aVariables))
                 {
                     // The value is not yet defined. A new variable is created.
                     $sVarName = "jxnVar$nVarId";
@@ -169,19 +169,19 @@ 
         }
 
         $sPhrase = '';
-        if(count($this->aMessageArgs) > 0)
+        if (count($this->aMessageArgs) > 0)
         {
             $sPhrase = array_shift($this->aMessageArgs); // The first array entry is the question.
             // $sPhrase = "'" . addslashes($sPhrase) . "'"; // Wrap the phrase with single quotes
-            if(count($this->aMessageArgs) > 0)
+            if (count($this->aMessageArgs) > 0)
             {
                 $nParamId = 1;
-                foreach($this->aMessageArgs as &$xParameter)
+                foreach ($this->aMessageArgs as &$xParameter)
                 {
                     $sParameterStr = $xParameter->getScript();
-                    if($xParameter instanceof \Jaxon\Response\Plugin\JQuery\Dom\Element)
+                    if ($xParameter instanceof \Jaxon\Response\Plugin\JQuery\Dom\Element)
                     {
-                        if(!array_key_exists($sParameterStr, $aVariables))
+                        if (!array_key_exists($sParameterStr, $aVariables))
                         {
                             // The value is not yet defined. A new variable is created.
                             $sVarName = "jxnVar$nVarId";
@@ -205,14 +205,14 @@ 
 
         $sScript = parent::getScript();
         $xDialog = jaxon()->dialog();
-        if($this->sCondition == '__confirm__')
+        if ($this->sCondition == '__confirm__')
         {
             $sScript = $xDialog->confirm($sPhrase, $sScript, '');
         }
-        elseif($this->sCondition !== null)
+        elseif ($this->sCondition !== null)
         {
             $sScript = 'if(' . $this->sCondition . '){' . $sScript . ';}';
-            if(($sPhrase))
+            if (($sPhrase))
             {
                 $xDialog->getAlert()->setReturn(true);
                 $sScript .= 'else{' . $xDialog->warning($sPhrase) . ';}';

src/Request/Plugin/CallableClass.php

Spacing +12 added lines, -12 removed lines

@@ -60,19 +60,19 @@ 
     {
         $this->xRepository = $xRepository;
 
-        if(!empty($_GET['jxncls']))
+        if (!empty($_GET['jxncls']))
         {
             $this->sRequestedClass = $_GET['jxncls'];
         }
-        if(!empty($_GET['jxnmthd']))
+        if (!empty($_GET['jxnmthd']))
         {
             $this->sRequestedMethod = $_GET['jxnmthd'];
         }
-        if(!empty($_POST['jxncls']))
+        if (!empty($_POST['jxncls']))
         {
             $this->sRequestedClass = $_POST['jxncls'];
         }
-        if(!empty($_POST['jxnmthd']))
+        if (!empty($_POST['jxnmthd']))
         {
             $this->sRequestedMethod = $_POST['jxnmthd'];
         }
@@ -99,20 +99,20 @@ 
      */
     public function register($sType, $sClassName, $aOptions)
     {
-        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'));
         }
@@ -150,7 +150,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;
@@ -166,14 +166,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',
@@ -184,7 +184,7 @@ 
         $jaxon = jaxon();
         $aArgs = $jaxon->getRequestHandler()->processArguments();
         $xResponse = $xCallableObject->call($this->sRequestedMethod, $aArgs);
-        if(($xResponse))
+        if (($xResponse))
         {
             $jaxon->getResponseManager()->append($xResponse);
         }

src/Request/Factory/Parameter.php

Spacing +8 added lines, -8 removed lines

@@ -84,19 +84,19 @@ 
      */
     public static function make($xValue)
     {
-        if($xValue instanceof Interfaces\Parameter)
+        if ($xValue instanceof Interfaces\Parameter)
         {
             return $xValue;
         }
-        elseif(is_numeric($xValue))
+        elseif (is_numeric($xValue))
         {
             return new Parameter(Jaxon::NUMERIC_VALUE, $xValue);
         }
-        elseif(is_string($xValue))
+        elseif (is_string($xValue))
         {
             return new Parameter(Jaxon::QUOTED_VALUE, $xValue);
         }
-        elseif(is_bool($xValue))
+        elseif (is_bool($xValue))
         {
             return new Parameter(Jaxon::BOOL_VALUE, $xValue);
         }
@@ -115,16 +115,16 @@ 
     {
         $sJsCode = '';
         $sQuoteCharacter = "'";
-        switch($this->sType)
+        switch ($this->sType)
         {
         case Jaxon::FORM_VALUES:
             $sJsCode = "jaxon.getFormValues(" . $sQuoteCharacter . $this->xValue . $sQuoteCharacter . ")";
             break;
         case Jaxon::INPUT_VALUE:
-            $sJsCode = "jaxon.$("  . $sQuoteCharacter . $this->xValue . $sQuoteCharacter  . ").value";
+            $sJsCode = "jaxon.$(" . $sQuoteCharacter . $this->xValue . $sQuoteCharacter . ").value";
             break;
         case Jaxon::CHECKED_VALUE:
-            $sJsCode = "jaxon.$("  . $sQuoteCharacter . $this->xValue  . $sQuoteCharacter . ").checked";
+            $sJsCode = "jaxon.$(" . $sQuoteCharacter . $this->xValue . $sQuoteCharacter . ").checked";
             break;
         case Jaxon::ELEMENT_INNERHTML:
             $sJsCode = "jaxon.$(" . $sQuoteCharacter . $this->xValue . $sQuoteCharacter . ").innerHTML";
@@ -142,7 +142,7 @@ 
             $sJsCode = (string)$this->xValue;
             break;
         case Jaxon::JS_VALUE:
-            if(is_array($this->xValue) || is_object($this->xValue))
+            if (is_array($this->xValue) || is_object($this->xValue))
             {
                 // Unable to use double quotes here because they cannot be handled on client side.
                 // So we are using simple quotes even if the Json standard recommends double quotes.

src/Plugin/CodeGenerator.php

Spacing +23 added lines, -23 removed lines

@@ -73,7 +73,7 @@ 
      */
     private function getJsLibUri()
     {
-        if(!$this->hasOption('js.lib.uri'))
+        if (!$this->hasOption('js.lib.uri'))
         {
             // return 'https://cdn.jsdelivr.net/jaxon/1.2.0/';
             return 'https://cdn.jsdelivr.net/gh/jaxon-php/jaxon-js@2.0/dist/';
@@ -96,7 +96,7 @@ 
         // The jsDelivr CDN only hosts minified files
         // if(($this->getOption('js.app.minify')) || substr($this->getJsLibUri(), 0, $nLen) == $jsDelivrUri)
         // Starting from version 2.0.0 of the js lib, the jsDelivr CDN also hosts non minified files.
-        if(($this->getOption('js.app.minify')))
+        if (($this->getOption('js.app.minify')))
         {
             return '.min.js';
         }
@@ -113,7 +113,7 @@ 
         // Check config options
         // - The js.app.extern option must be set to true
         // - The js.app.uri and js.app.dir options must be set to non null values
-        if(!$this->getOption('js.app.extern') ||
+        if (!$this->getOption('js.app.extern') ||
             !$this->getOption('js.app.uri') ||
             !$this->getOption('js.app.dir'))
         {
@@ -122,7 +122,7 @@ 
         // Check dir access
         // - The js.app.dir must be writable
         $sJsAppDir = $this->getOption('js.app.dir');
-        if(!is_dir($sJsAppDir) || !is_writable($sJsAppDir))
+        if (!is_dir($sJsAppDir) || !is_writable($sJsAppDir))
         {
             return false;
         }
@@ -136,7 +136,7 @@ 
      */
     private function setTemplateCacheDir()
     {
-        if($this->hasOption('core.template.cache_dir'))
+        if ($this->hasOption('core.template.cache_dir'))
         {
             $this->setCacheDir($this->getOption('core.template.cache_dir'));
         }
@@ -150,11 +150,11 @@ 
     private function generateHash()
     {
         $sHash = jaxon()->getVersion();
-        foreach($this->xPluginManager->getRequestPlugins() as $xPlugin)
+        foreach ($this->xPluginManager->getRequestPlugins() as $xPlugin)
         {
             $sHash .= $xPlugin->generateHash();
         }
-        foreach($this->xPluginManager->getResponsePlugins() as $xPlugin)
+        foreach ($this->xPluginManager->getResponsePlugins() as $xPlugin)
         {
             $sHash .= $xPlugin->generateHash();
         }
@@ -168,49 +168,49 @@ 
      */
     private function makePluginsCode()
     {
-        if($this->sCssCode === null || $this->sJsCode === null || $this->sJsReady === null)
+        if ($this->sCssCode === null || $this->sJsCode === null || $this->sJsReady === null)
         {
             $this->sCssCode = '';
             $this->sJsCode = '';
             $this->sJsReady = '';
-            foreach($this->xPluginManager->getResponsePlugins() as $xPlugin)
+            foreach ($this->xPluginManager->getResponsePlugins() as $xPlugin)
             {
-                if(($sCssCode = trim($xPlugin->getCss())))
+                if (($sCssCode = trim($xPlugin->getCss())))
                 {
                     $this->sCssCode .= rtrim($sCssCode, " \n") . "\n";
                 }
-                if(($sJsCode = trim($xPlugin->getJs())))
+                if (($sJsCode = trim($xPlugin->getJs())))
                 {
                     $this->sJsCode .= rtrim($sJsCode, " \n") . "\n";
                 }
-                if(($sJsReady = trim($xPlugin->getScript())))
+                if (($sJsReady = trim($xPlugin->getScript())))
                 {
                     $this->sJsReady .= trim($sJsReady, " \n") . "\n";
                 }
             }
 
             $this->sJsReady = $this->render('jaxon::plugins/ready.js', ['sPluginScript' => $this->sJsReady]);
-            foreach($this->xPluginManager->getRequestPlugins() as $xPlugin)
+            foreach ($this->xPluginManager->getRequestPlugins() as $xPlugin)
             {
-                if(($sJsReady = trim($xPlugin->getScript())))
+                if (($sJsReady = trim($xPlugin->getScript())))
                 {
                     $this->sJsReady .= trim($sJsReady, " \n") . "\n";
                 }
             }
 
-            foreach($this->xPluginManager->getPackages() as $sClass)
+            foreach ($this->xPluginManager->getPackages() as $sClass)
             {
                 $xPackage = jaxon()->di()->get($sClass);
-                if(($sCssCode = trim($xPackage->css())))
+                if (($sCssCode = trim($xPackage->css())))
                 {
                     $this->sCssCode .= rtrim($sCssCode, " \n") . "\n";
                 }
-                if(($sJsCode = trim($xPackage->js())))
+                if (($sJsCode = trim($xPackage->js())))
                 {
                     $this->sJsCode .= rtrim($sJsCode, " \n") . "\n";
                 }
                 $xPackage = jaxon()->di()->get($sClass);
-                if(($sJsReady = trim($xPackage->ready())))
+                if (($sJsReady = trim($xPackage->ready())))
                 {
                     $this->sJsReady .= trim($sJsReady, " \n") . "\n";
                 }
@@ -234,7 +234,7 @@ 
 
         // Add component files to the javascript file array;
         $aJsFiles = array($sJsCoreUrl);
-        if($this->getOption('core.debug.on'))
+        if ($this->getOption('core.debug.on'))
         {
             $aJsFiles[] = $sJsDebugUrl;
             $aJsFiles[] = $sJsLanguageUrl;
@@ -329,7 +329,7 @@ 
         $this->setTemplateCacheDir();
         $this->makePluginsCode();
 
-        if($this->canExportJavascript())
+        if ($this->canExportJavascript())
         {
             $sJsAppURI = rtrim($this->getOption('js.app.uri'), '/') . '/';
             $sJsAppDir = rtrim($this->getOption('js.app.dir'), '/') . '/';
@@ -338,13 +338,13 @@ 
             $sHash = $this->generateHash();
             $sOutFile = $sHash . '.js';
             $sMinFile = $sHash . '.min.js';
-            if(!is_file($sJsAppDir . $sOutFile))
+            if (!is_file($sJsAppDir . $sOutFile))
             {
                 file_put_contents($sJsAppDir . $sOutFile, $this->_getScript());
             }
-            if(($this->getOption('js.app.minify')) && !is_file($sJsAppDir . $sMinFile))
+            if (($this->getOption('js.app.minify')) && !is_file($sJsAppDir . $sMinFile))
             {
-                if(($this->minify($sJsAppDir . $sOutFile, $sJsAppDir . $sMinFile)))
+                if (($this->minify($sJsAppDir . $sOutFile, $sJsAppDir . $sMinFile)))
                 {
                     $sOutFile = $sMinFile;
                 }

src/DI/Container.php

Spacing +24 added lines, -24 removed lines

@@ -48,7 +48,7 @@ 
 
     public static function getInstance()
     {
-        if(!self::$xInstance)
+        if (!self::$xInstance)
         {
             self::$xInstance = new Container();
         }
@@ -108,15 +108,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();
         };
 
@@ -124,37 +124,37 @@ 
          * 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 Handler
-        $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]);
         };
         // 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();
         };
 
@@ -162,31 +162,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();
         };
 
@@ -205,7 +205,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);
         }
@@ -500,14 +500,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']);
                 }
@@ -525,7 +525,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

@@ -25,7 +25,7 @@
      */
     protected function alert($message)
     {
-        if($this->getReturn())
+        if ($this->getReturn())
         {
             return 'alert(' . $message . ')';
         }