jaxon-php / jaxon-core

src/Utils/Template/Renderer.php

Spacing +1 added lines, -1 removed lines

@@ -27,7 +27,7 @@
     public function render($sPath, array $aVars = [])
     {
         // Make the template vars available as attributes
-        foreach($aVars as $sName => $xValue)
+        foreach ($aVars as $sName => $xValue)
         {
             $sName = (string)$sName;
             $this->$sName = $xValue;

src/Utils/Config/Config.php

Spacing +9 added lines, -10 removed lines

@@ -50,14 +50,14 @@ 
         $sPrefix = trim((string)$sPrefix);
         $nDepth = intval($nDepth);
         // Check the max depth
-        if($nDepth < 0 || $nDepth > 9)
+        if ($nDepth < 0 || $nDepth > 9)
         {
             throw new \Jaxon\Exception\Config\Data(jaxon_trans('config.errors.data.depth',
                 array('key' => $sPrefix, 'depth' => $nDepth)));
         }
-        foreach($aOptions as $sName => $xOption)
+        foreach ($aOptions as $sName => $xOption)
         {
-            if(is_int($sName))
+            if (is_int($sName))
             {
                 continue;
             }
@@ -67,7 +67,7 @@ 
             // Save the value of this option
             $this->aOptions[$sFullName] = $xOption;
             // Save the values of its sub-options
-            if(is_array($xOption))
+            if (is_array($xOption))
             {
                 // Recursively read the options in the array
                 $this->_setOptions($xOption, $sFullName, $nDepth + 1);
@@ -89,9 +89,9 @@ 
         $aKeys = explode('.', (string)$sKeys);
         foreach ($aKeys as $sKey)
         {
-            if(($sKey))
+            if (($sKey))
             {
-                if(!array_key_exists($sKey, $aOptions) || !is_array($aOptions[$sKey]))
+                if (!array_key_exists($sKey, $aOptions) || !is_array($aOptions[$sKey]))
                 {
                     return;
                 }
@@ -139,13 +139,12 @@ 
         $sPrefix = rtrim($sPrefix, '.') . '.';
         $sPrefixLen = strlen($sPrefix);
         $aOptions = [];
-        foreach($this->aOptions as $sName => $xValue)
+        foreach ($this->aOptions as $sName => $xValue)
         {
-            if(substr($sName, 0, $sPrefixLen) == $sPrefix)
+            if (substr($sName, 0, $sPrefixLen) == $sPrefix)
             {
                 $iNextDotPos = strpos($sName, '.', $sPrefixLen);
-                $sOptionName = $iNextDotPos === false ? substr($sName, $sPrefixLen) :
-                    substr($sName, $sPrefixLen, $iNextDotPos - $sPrefixLen);
+                $sOptionName = $iNextDotPos === false ? substr($sName, $sPrefixLen) : substr($sName, $sPrefixLen, $iNextDotPos - $sPrefixLen);
                 $aOptions[$sOptionName] = $sPrefix . $sOptionName;
             }
         }

src/Plugin/Manager.php

Spacing +39 added lines, -39 removed lines

@@ -219,32 +219,32 @@ 
     {
         $bIsAlert = ($xPlugin instanceof \Jaxon\Request\Interfaces\Alert);
         $bIsConfirm = ($xPlugin instanceof \Jaxon\Request\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', array('name' => get_class($xPlugin))));
         }
         // This plugin implements the Alert interface
-        if($bIsAlert)
+        if ($bIsAlert)
         {
             $this->setAlert($xPlugin);
         }
         // This plugin implements the Confirm interface
-        if($bIsConfirm)
+        if ($bIsConfirm)
         {
             $this->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);
         }
@@ -274,7 +274,7 @@ 
     private function generateHash()
     {
         $sHash = $this->getVersion();
-        foreach($this->aPlugins as $xPlugin)
+        foreach ($this->aPlugins as $xPlugin)
         {
             $sHash .= $xPlugin->generateHash();
         }
@@ -291,9 +291,9 @@ 
      */
     public function canProcessRequest()
     {
-        foreach($this->aRequestPlugins as $xPlugin)
+        foreach ($this->aRequestPlugins as $xPlugin)
         {
-            if($xPlugin->getName() != Jaxon::FILE_UPLOAD && $xPlugin->canProcessRequest())
+            if ($xPlugin->getName() != Jaxon::FILE_UPLOAD && $xPlugin->canProcessRequest())
             {
                 return true;
             }
@@ -312,12 +312,12 @@ 
     public function processRequest()
     {
         $xUploadPlugin = $this->getRequestPlugin(Jaxon::FILE_UPLOAD);
-        foreach($this->aRequestPlugins as $xPlugin)
+        foreach ($this->aRequestPlugins as $xPlugin)
         {
-            if($xPlugin->getName() != Jaxon::FILE_UPLOAD && $xPlugin->canProcessRequest())
+            if ($xPlugin->getName() != Jaxon::FILE_UPLOAD && $xPlugin->canProcessRequest())
             {
                 // Process uploaded files
-                if($xUploadPlugin != null)
+                if ($xUploadPlugin != null)
                 {
                     $xUploadPlugin->processRequest();
                 }
@@ -341,10 +341,10 @@ 
      */
     public function register($aArgs)
     {
-        foreach($this->aRequestPlugins as $xPlugin)
+        foreach ($this->aRequestPlugins as $xPlugin)
         {
             $mResult = $xPlugin->register($aArgs);
-            if($mResult instanceof \Jaxon\Request\Request || is_array($mResult) || $mResult === true)
+            if ($mResult instanceof \Jaxon\Request\Request || is_array($mResult) || $mResult === true)
             {
                 return $mResult;
             }
@@ -359,7 +359,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/';
@@ -382,7 +382,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';
         }
@@ -399,7 +399,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'))
         {
@@ -408,7 +408,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;
         }
@@ -422,7 +422,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'));
         }
@@ -444,7 +444,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;
@@ -460,17 +460,17 @@ 
             'sJsOptions' => $this->getOption('js.app.options'),
             'aUrls' => $aJsFiles,
         ));
-        foreach($this->aResponsePlugins as $xPlugin)
+        foreach ($this->aResponsePlugins as $xPlugin)
         {
-            if(($str = trim($xPlugin->getJs())))
+            if (($str = trim($xPlugin->getJs())))
             {
                 $sCode .= rtrim($str, " \n") . "\n";
             }
         }
-        foreach($this->aPackages as $sClass)
+        foreach ($this->aPackages as $sClass)
         {
             $xPackage = jaxon()->di()->get($sClass);
-            if(($str = trim($xPackage->js())))
+            if (($str = trim($xPackage->js())))
             {
                 $sCode .= rtrim($str, " \n") . "\n";
             }
@@ -489,17 +489,17 @@ 
         $this->setTemplateCacheDir();
 
         $sCode = '';
-        foreach($this->aResponsePlugins as $xPlugin)
+        foreach ($this->aResponsePlugins as $xPlugin)
         {
-            if(($str = trim($xPlugin->getCss())))
+            if (($str = trim($xPlugin->getCss())))
             {
                 $sCode .= rtrim($str, " \n") . "\n";
             }
         }
-        foreach($this->aPackages as $sClass)
+        foreach ($this->aPackages as $sClass)
         {
             $xPackage = jaxon()->di()->get($sClass);
-            if(($str = trim($xPackage->css())))
+            if (($str = trim($xPackage->css())))
             {
                 $sCode .= rtrim($str, " \n") . "\n";
             }
@@ -563,17 +563,17 @@ 
     private function getReadyScript()
     {
         $sPluginScript = '';
-        foreach($this->aResponsePlugins as $xPlugin)
+        foreach ($this->aResponsePlugins as $xPlugin)
         {
-            if(($str = trim($xPlugin->getScript())))
+            if (($str = trim($xPlugin->getScript())))
             {
                 $sPluginScript .= "\n" . trim($str, " \n");
             }
         }
-        foreach($this->aPackages as $sClass)
+        foreach ($this->aPackages as $sClass)
         {
             $xPackage = jaxon()->di()->get($sClass);
-            if(($str = trim($xPackage->ready())))
+            if (($str = trim($xPackage->ready())))
             {
                 $sPluginScript .= "\n" . trim($str, " \n");
             }
@@ -596,7 +596,7 @@ 
     {
         // Get the config and plugins scripts
         $sScript = $this->getConfigScript() . "\n" . $this->getReadyScript() . "\n";
-        foreach($this->aRequestPlugins as $xPlugin)
+        foreach ($this->aRequestPlugins as $xPlugin)
         {
             $sScript .= "\n" . trim($xPlugin->getScript(), " \n");
         }
@@ -618,7 +618,7 @@ 
         // Set the template engine cache dir
         $this->setTemplateCacheDir();
 
-        if($this->canExportJavascript())
+        if ($this->canExportJavascript())
         {
             $sJsAppURI = rtrim($this->getOption('js.app.uri'), '/') . '/';
             $sJsAppDir = rtrim($this->getOption('js.app.dir'), '/') . '/';
@@ -627,13 +627,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->getAllScripts());
             }
-            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;
                 }
@@ -666,7 +666,7 @@ 
      */
     public function getResponsePlugin($sName)
     {
-        if(array_key_exists($sName, $this->aResponsePlugins))
+        if (array_key_exists($sName, $this->aResponsePlugins))
         {
             return $this->aResponsePlugins[$sName];
         }
@@ -682,7 +682,7 @@ 
      */
     public function getRequestPlugin($sName)
     {
-        if(array_key_exists($sName, $this->aRequestPlugins))
+        if (array_key_exists($sName, $this->aRequestPlugins))
         {
             return $this->aRequestPlugins[$sName];
         }

Braces +3 added lines, -6 removed lines

@@ -223,13 +223,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', array('name' => get_class($xPlugin))));
         }
@@ -644,8 +642,7 @@ 
                 'sJsOptions' => $this->getOption('js.app.options'),
                 'sUrl' => $sJsAppURI . $sOutFile,
             ));
-        }
-        else
+        } else
         {
             // The plugins scripts are wrapped with javascript tags
             $sScript = $this->render('jaxon::plugins/wrapper.js', array(