jaxon-php / jaxon-core

src/Request/Support/UserFunction.php

Doc Comments +1 added lines, -1 removed lines

@@ -158,7 +158,7 @@
     /**
      * Constructs and returns a <Jaxon\Request\Request> object which is capable of generating the javascript call to invoke this jaxon enabled function
      *
-     * @return Jaxon\Request\Request
+     * @return Request
      */
     public function generateRequest()
     {

Spacing +8 added lines, -8 removed lines

@@ -90,13 +90,13 @@ 
     {
         $this->aConfiguration = array();
         $this->sAlias = '';
-        if(is_array($sUserFunction))
+        if (is_array($sUserFunction))
         {
-            if(count($sUserFunction) != 2 && count($sUserFunction) != 3)
+            if (count($sUserFunction) != 2 && count($sUserFunction) != 3)
             {
                 throw new \Jaxon\Exception\Error($this->trans('errors.functions.invalid-declaration'));
             }
-            if(count($sUserFunction) == 3)
+            if (count($sUserFunction) == 3)
             {
                 $this->sAlias = $sUserFunction[0];
                 $this->sUserFunction = array_slice($sUserFunction, 1);
@@ -106,7 +106,7 @@ 
                 $this->sUserFunction = $sUserFunction;
             }
         }
-        else if(is_string($sUserFunction))
+        else if (is_string($sUserFunction))
         {
             $this->sUserFunction = $sUserFunction;
         }
@@ -124,7 +124,7 @@ 
     public function getName()
     {
         // Do not use sAlias here!
-        if(is_array($this->sUserFunction))
+        if (is_array($this->sUserFunction))
         {
             return $this->sUserFunction[1];
         }
@@ -141,7 +141,7 @@ 
      */
     public function configure($sName, $sValue)
     {
-        switch($sName)
+        switch ($sName)
         {
         case 'alias':
             $this->sAlias = $sValue;
@@ -195,12 +195,12 @@ 
      */
     public function call($aArgs = array())
     {
-        if(($this->sInclude))
+        if (($this->sInclude))
         {
             ob_start();
             require_once $this->sInclude;
             $sOutput = ob_get_clean();
-            if(($sOutput))
+            if (($sOutput))
             {
                 $sOutput = $this->trans('debug.function.include', array(
                     'file' => $this->sInclude,

Braces +3 added lines, -6 removed lines

@@ -100,17 +100,14 @@
             {
                 $this->sAlias = $sUserFunction[0];
                 $this->sUserFunction = array_slice($sUserFunction, 1);
-            }
-            else
+            } else
             {
                 $this->sUserFunction = $sUserFunction;
             }
-        }
-        else if(is_string($sUserFunction))
+        } else if(is_string($sUserFunction))
         {
             $this->sUserFunction = $sUserFunction;
-        }
-        else
+        } else
         {
             throw new \Jaxon\Exception\Error($this->trans('errors.functions.invalid-declaration'));
         }

src/Request/Traits/Factory.php

Doc Comments -2 removed lines

@@ -89,7 +89,6 @@ 
      * Return the javascript call to an Jaxon object method
      *
      * @param string         $sMethod           The method (without class) name
-     * @param ...            $xParams           The parameters of the method
      *
      * @return object
      */
@@ -110,7 +109,6 @@ 
      * @param integer $nItemsPerPage the number of items per page
      * @param integer $nCurrentPage the current page
      * @param string  $sMethod the name of the method
-     * @param ... $parameters the parameters of the method
      *
      * @return string the pagination links
      */

Spacing +3 added lines, -3 removed lines

@@ -44,7 +44,7 @@ 
      */
     public function getJaxonClassName()
     {
-        if(!$this->xJaxonCallable)
+        if (!$this->xJaxonCallable)
         {
             // Make the Jaxon class name for a class without an associated callable
             // !! Warning !! This can happen only if this object is not registered with the Jaxon libary
@@ -62,7 +62,7 @@ 
      */
     public function getJaxonNamespace()
     {
-        if(!$this->xJaxonCallable)
+        if (!$this->xJaxonCallable)
         {
             // Return an empty string.
             return '';
@@ -77,7 +77,7 @@ 
      */
     public function getJaxonClassPath()
     {
-        if(!$this->xJaxonCallable)
+        if (!$this->xJaxonCallable)
         {
             // Return an empty string.
             return '';

src/Utils/Container.php

Doc Comments +1 added lines, -1 removed lines

@@ -201,7 +201,7 @@
     /**
      * Create a new the config manager
      *
-     * @return Jaxon\Utils\Config\Config            The config manager
+     * @return Config\Config            The config manager
      */
     public function newConfig()
     {

Spacing +21 added lines, -21 removed lines

@@ -27,7 +27,7 @@ 
 
     public static function getInstance()
     {
-        if(!self::$xInstance)
+        if (!self::$xInstance)
         {
             self::$xInstance = new Container();    
         }
@@ -65,19 +65,19 @@ 
          * Managers
          */
         // Plugin Manager
-        $this->di['plugin_manager'] = function($c){
+        $this->di['plugin_manager'] = function($c) {
             return new \Jaxon\Plugin\Manager();
         };
         // Request Manager
-        $this->di['request_manager'] = function($c){
+        $this->di['request_manager'] = function($c) {
             return new \Jaxon\Request\Manager();
         };
         // Request Factory
-        $this->di['request_factory'] = function($c){
+        $this->di['request_factory'] = function($c) {
             return new \Jaxon\Request\Factory();
         };
         // Response Manager
-        $this->di['response_manager'] = function($c){
+        $this->di['response_manager'] = function($c) {
             return new \Jaxon\Response\Manager();
         };
 
@@ -85,35 +85,35 @@ 
          * Services
          */
         // Config manager
-        $this->di['config'] = function($c){
+        $this->di['config'] = function($c) {
             return new Config\Config();
         };
         // Minifier
-        $this->di['minifier'] = function($c){
+        $this->di['minifier'] = function($c) {
             return new Template\Minifier();
         };
         // Translator
-        $this->di['translator'] = function($c){
+        $this->di['translator'] = function($c) {
             return new Translation\Translator($c['translation_dir'], $c['config']);
         };
         // Template engine
-        $this->di['template'] = function($c){
+        $this->di['template'] = function($c) {
             return new Template\Template($c['template_dir']);
         };
         // Validator
-        $this->di['validator'] = function($c){
+        $this->di['validator'] = function($c) {
             return new Validation\Validator();
         };
         // Pagination Renderer
-        $this->di['pagination.renderer'] = function($c){
+        $this->di['pagination.renderer'] = function($c) {
             return new Pagination\Renderer();
         };
         // Pagination Paginator
-        $this->di['pagination.paginator'] = function($c){
+        $this->di['pagination.paginator'] = function($c) {
             return new Pagination\Paginator($c['pagination.renderer']);
         };
         // Event Dispatcher
-        $this->di['events'] = function($c){
+        $this->di['events'] = function($c) {
             return new EventDispatcher();
         };
 
@@ -121,27 +121,27 @@ 
          * Core library objects
          */
         // Global Response
-        $this->di['response'] = function($c){
+        $this->di['response'] = function($c) {
             return new \Jaxon\Response\Response();
         };
         // Jaxon Core
-        $this->di['jaxon'] = function($c){
+        $this->di['jaxon'] = function($c) {
             return new \Jaxon\Jaxon();
         };
         // Jaxon Sentry
-        $this->di['sentry'] = function($c){
+        $this->di['sentry'] = function($c) {
             // This class is not defined in this package
             $sClass = '\\Jaxon\\Sentry\\Sentry';
             return new $sClass;
         };
         // Armada
-        $this->di['armada'] = function($c){
+        $this->di['armada'] = function($c) {
             // This class is not defined in this package
             $sClass = '\\Jaxon\\Armada\\Armada';
             return new $sClass;
         };
         // View Renderer Facade
-        $this->di['sentry.view.renderer'] = function($c){
+        $this->di['sentry.view.renderer'] = function($c) {
             $aRenderers = $c['view.data.renderers'];
             $sDefaultNamespace = $c['view.data.namespace.default'];
             return new \Jaxon\Sentry\View\Facade($aRenderers, $sDefaultNamespace);
@@ -396,9 +396,9 @@ 
             $renderer = $c['sentry.view.base.' . $sId];
             // Init the renderer with the template namespaces
             $aNamespaces = $this->di['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']);
                 }
@@ -416,7 +416,7 @@ 
      */
     public function getViewRenderer($sId = '')
     {
-        if(!$sId)
+        if (!$sId)
         {
             // Return the view renderer facade
             return $this->di['sentry.view.renderer'];

src/Utils/Pagination/Paginator.php

Doc Comments +1 added lines, -1 removed lines

@@ -161,7 +161,7 @@
     }
 
     /**
-     * @return string
+     * @return Request
      */
     public function getRequest()
     {

Spacing +21 added lines, -21 removed lines

@@ -65,7 +65,7 @@ 
 
     protected function updateNumPages()
     {
-        $this->numPages = ($this->itemsPerPage == 0 ? 0 : (int) ceil($this->totalItems/$this->itemsPerPage));
+        $this->numPages = ($this->itemsPerPage == 0 ? 0 : (int)ceil($this->totalItems / $this->itemsPerPage));
     }
 
     /**
@@ -74,7 +74,7 @@ 
      */
     public function setMaxPagesToShow($maxPagesToShow)
     {
-        if($maxPagesToShow < 3)
+        if ($maxPagesToShow < 3)
         {
             throw new \InvalidArgumentException('maxPagesToShow cannot be less than 3.');
         }
@@ -154,7 +154,7 @@ 
     {
         $this->request = $request;
         // Append the page number to the parameter list, if not yet given.
-        if(($this->request) && !$this->request->hasPageNumber())
+        if (($this->request) && !$this->request->hasPageNumber())
         {
             $this->request->addParameter(Jaxon::PAGE_NUMBER, 0);
         }
@@ -193,7 +193,7 @@ 
 
     public function getNextPage()
     {
-        if($this->currentPage < $this->numPages)
+        if ($this->currentPage < $this->numPages)
         {
             return $this->currentPage + 1;
         }
@@ -203,7 +203,7 @@ 
 
     public function getPrevPage()
     {
-        if($this->currentPage > 1)
+        if ($this->currentPage > 1)
         {
             return $this->currentPage - 1;
         }
@@ -213,7 +213,7 @@ 
 
     public function getNextCall()
     {
-        if(!$this->getNextPage())
+        if (!$this->getNextPage())
         {
             return null;
         }
@@ -226,7 +226,7 @@ 
      */
     public function getPrevCall()
     {
-        if(!$this->getPrevPage())
+        if (!$this->getPrevPage())
         {
             return null;
         }
@@ -254,14 +254,14 @@ 
     {
         $pages = array();
 
-        if($this->numPages <= 1)
+        if ($this->numPages <= 1)
         {
             return array();
         }
 
-        if($this->numPages <= $this->maxPagesToShow)
+        if ($this->numPages <= $this->maxPagesToShow)
         {
-            for($i = 1; $i <= $this->numPages; $i++)
+            for ($i = 1; $i <= $this->numPages; $i++)
             {
                 $pages[] = $this->createPage($i, $i == $this->currentPage);
             }
@@ -269,9 +269,9 @@ 
         else
         {
             // Determine the sliding range, centered around the current page.
-            $numAdjacents = (int) floor(($this->maxPagesToShow - 3) / 2);
+            $numAdjacents = (int)floor(($this->maxPagesToShow - 3) / 2);
 
-            if($this->currentPage + $numAdjacents > $this->numPages)
+            if ($this->currentPage + $numAdjacents > $this->numPages)
             {
                 $slidingStart = $this->numPages - $this->maxPagesToShow + 2;
             }
@@ -279,28 +279,28 @@ 
             {
                 $slidingStart = $this->currentPage - $numAdjacents;
             }
-            if($slidingStart < 2)
+            if ($slidingStart < 2)
             {
                 $slidingStart = 2;
             }
 
             $slidingEnd = $slidingStart + $this->maxPagesToShow - 3;
-            if($slidingEnd >= $this->numPages)
+            if ($slidingEnd >= $this->numPages)
             {
                 $slidingEnd = $this->numPages - 1;
             }
 
             // Build the list of pages.
             $pages[] = $this->createPage(1, $this->currentPage == 1);
-            if($slidingStart > 2)
+            if ($slidingStart > 2)
             {
                 $pages[] = $this->createPageEllipsis();
             }
-            for($i = $slidingStart; $i <= $slidingEnd; $i++)
+            for ($i = $slidingStart; $i <= $slidingEnd; $i++)
             {
                 $pages[] = $this->createPage($i, $i == $this->currentPage);
             }
-            if($slidingEnd < $this->numPages - 1)
+            if ($slidingEnd < $this->numPages - 1)
             {
                 $pages[] = $this->createPageEllipsis();
             }
@@ -346,7 +346,7 @@ 
      */
     public function toHtml()
     {
-        if($this->getNumPages() <= 1)
+        if ($this->getNumPages() <= 1)
         {
             return '';
         }
@@ -369,7 +369,7 @@ 
     {
         $first = ($this->currentPage - 1) * $this->itemsPerPage + 1;
 
-        if($first > $this->totalItems)
+        if ($first > $this->totalItems)
         {
             return null;
         }
@@ -380,13 +380,13 @@ 
     public function getCurrentPageLastItem()
     {
         $first = $this->getCurrentPageFirstItem();
-        if($first === null)
+        if ($first === null)
         {
             return null;
         }
 
         $last = $first + $this->itemsPerPage - 1;
-        if($last > $this->totalItems)
+        if ($last > $this->totalItems)
         {
             return $this->totalItems;
         }

Braces +2 added lines, -4 removed lines

@@ -265,8 +265,7 @@ 
             {
                 $pages[] = $this->createPage($i, $i == $this->currentPage);
             }
-        }
-        else
+        } else
         {
             // Determine the sliding range, centered around the current page.
             $numAdjacents = (int) floor(($this->maxPagesToShow - 3) / 2);
@@ -274,8 +273,7 @@ 
             if($this->currentPage + $numAdjacents > $this->numPages)
             {
                 $slidingStart = $this->numPages - $this->maxPagesToShow + 2;
-            }
-            else
+            } else
             {
                 $slidingStart = $this->currentPage - $numAdjacents;
             }

src/Utils/Translation/Translator.php

Doc Comments +1 added lines, -1 removed lines

@@ -69,7 +69,7 @@
      * Get a translated string
      *
      * @param string        $sText                The key of the translated string
-     * @param string        $aPlaceHolders        The placeholders of the translated string
+     * @param string        $placeholders        The placeholders of the translated string
      * @param string        $sLanguage            The language of the translated string
      *
      * @return string        The translated string

Indentation +1 added lines, -1 removed lines

@@ -87,7 +87,7 @@
         }
         if(!array_key_exists($sLanguage, $this->aMessages) || !array_key_exists($sText, $this->aMessages[$sLanguage]))
         {
-           return $sText;
+            return $sText;
         }
         $message = $this->aMessages[$sLanguage][$sText];
         foreach($placeholders as $name => $value)

Spacing +7 added lines, -7 removed lines

@@ -45,17 +45,17 @@ 
      */
     public function loadMessages($sFilePath, $sLanguage)
     {
-        if(!file_exists($sFilePath))
+        if (!file_exists($sFilePath))
         {
             return;
         }
         $aMessages = require($sFilePath);
-        if(!is_array($aMessages))
+        if (!is_array($aMessages))
         {
             return;
         }
         // Load the translations
-        if(!array_key_exists($sLanguage, $this->aMessages))
+        if (!array_key_exists($sLanguage, $this->aMessages))
         {
             $this->aMessages[$sLanguage] = $aMessages;
         }
@@ -77,20 +77,20 @@ 
     public function trans($sText, array $placeholders = array(), $sLanguage = null)
     {
         $sText = trim((string)$sText);
-        if(!$sLanguage)
+        if (!$sLanguage)
         {
             $sLanguage = $this->xConfig->getOption('language');
         }
-        if(!$sLanguage)
+        if (!$sLanguage)
         {
             $sLanguage = $this->sDefaultLocale;
         }
-        if(!array_key_exists($sLanguage, $this->aMessages) || !array_key_exists($sText, $this->aMessages[$sLanguage]))
+        if (!array_key_exists($sLanguage, $this->aMessages) || !array_key_exists($sText, $this->aMessages[$sLanguage]))
         {
            return $sText;
         }
         $message = $this->aMessages[$sLanguage][$sText];
-        foreach($placeholders as $name => $value)
+        foreach ($placeholders as $name => $value)
         {
             $message = str_replace(":$name", $value, $message);
         }

Braces +1 added lines, -2 removed lines

@@ -58,8 +58,7 @@
         if(!array_key_exists($sLanguage, $this->aMessages))
         {
             $this->aMessages[$sLanguage] = $aMessages;
-        }
-        else
+        } else
         {
             $this->aMessages[$sLanguage] = array_merge($aMessages, $this->aMessages[$sLanguage]);
         }

src/Request/Support/CallableObject.php

Spacing +22 added lines, -22 removed lines

@@ -92,7 +92,7 @@ 
      */
     public function __construct($xCallable)
     {
-        if(is_string($xCallable)) // Received a class name
+        if (is_string($xCallable)) // Received a class name
         {
             $this->reflectionClass = new \ReflectionClass($xCallable);
             $this->callableObject = null;
@@ -118,12 +118,12 @@ 
      */
     private function setCallable($xCallable = null)
     {
-        if($xCallable == null)
+        if ($xCallable == null)
         {
             $xCallable = $this->reflectionClass->newInstance();
         }
         // Save the Jaxon callable object into the user callable object
-        if($this->reflectionClass->hasMethod('setJaxonCallable'))
+        if ($this->reflectionClass->hasMethod('setJaxonCallable'))
         {
             $xCallable->setJaxonCallable($this);
         }
@@ -137,7 +137,7 @@ 
      */
     public function getRegisteredObject()
     {
-        if($this->callableObject == null)
+        if ($this->callableObject == null)
         {
             $this->setCallable();
         }
@@ -167,7 +167,7 @@ 
         // The class name without the namespace.
         $name = $this->reflectionClass->getShortName();
         // Append the classpath to the name
-        if(($this->classpath))
+        if (($this->classpath))
         {
             $name = $this->classpath . $this->separator . $name;
         }
@@ -204,16 +204,16 @@ 
     public function getMethods()
     {
         $aReturn = array();
-        foreach($this->reflectionClass->getMethods(\ReflectionMethod::IS_PUBLIC) as $xMethod)
+        foreach ($this->reflectionClass->getMethods(\ReflectionMethod::IS_PUBLIC) as $xMethod)
         {
             $sMethodName = $xMethod->getShortName();
             // Don't take magic __call, __construct, __destruct methods
-            if(strlen($sMethodName) > 2 && substr($sMethodName, 0, 2) == '__')
+            if (strlen($sMethodName) > 2 && substr($sMethodName, 0, 2) == '__')
             {
                 continue;
             }
             // Don't take excluded methods
-            if(in_array($sMethodName, $this->aProtectedMethods))
+            if (in_array($sMethodName, $this->aProtectedMethods))
             {
                 continue;
             }
@@ -234,37 +234,37 @@ 
     public function configure($sMethod, $sName, $sValue)
     {
         // Set the namespace
-        if($sName == 'namespace')
+        if ($sName == 'namespace')
         {
-            if($sValue != '')
+            if ($sValue != '')
                 $this->namespace = $sValue;
             return;
         }
         // Set the classpath
-        if($sName == 'classpath')
+        if ($sName == 'classpath')
         {
-            if($sValue != '')
+            if ($sValue != '')
                 $this->classpath = $sValue;
             return;
         }
         // Set the separator
-        if($sName == 'separator')
+        if ($sName == 'separator')
         {
-            if($sValue == '_' || $sValue == '.')
+            if ($sValue == '_' || $sValue == '.')
                 $this->separator = $sValue;
             return;
         }
         // Set the excluded methods
-        if($sName == 'protected')
+        if ($sName == 'protected')
         {
-            if(is_array($sValue))
+            if (is_array($sValue))
                 $this->aProtectedMethods = array_merge($this->aProtectedMethods, $sValue);
-            else if(is_string($sValue))
+            else if (is_string($sValue))
                 $this->aProtectedMethods[] = $sValue;
             return;
         }
         
-        if(!isset($this->aConfiguration[$sMethod]))
+        if (!isset($this->aConfiguration[$sMethod]))
         {
             $this->aConfiguration[$sMethod] = array();
         }    
@@ -284,16 +284,16 @@ 
 
         // Common options to be set on all methods
         $aCommonConfig = array_key_exists('*', $this->aConfiguration) ? $this->aConfiguration['*'] : array();
-        foreach($this->reflectionClass->getMethods(\ReflectionMethod::IS_PUBLIC) as $xMethod)
+        foreach ($this->reflectionClass->getMethods(\ReflectionMethod::IS_PUBLIC) as $xMethod)
         {
             $sMethodName = $xMethod->getShortName();
             // Don't export magic __call, __construct, __destruct methods
-            if(strlen($sMethodName) > 0 && substr($sMethodName, 0, 2) == '__')
+            if (strlen($sMethodName) > 0 && substr($sMethodName, 0, 2) == '__')
             {
                 continue;
             }
             // Don't export "protected" methods
-            if(in_array($sMethodName, $this->aProtectedMethods))
+            if (in_array($sMethodName, $this->aProtectedMethods))
             {
                 continue;
             }
@@ -343,7 +343,7 @@ 
      */
     public function call($sMethod, $aArgs)
     {
-        if(!$this->hasMethod($sMethod))
+        if (!$this->hasMethod($sMethod))
             return;
         $reflectionMethod = $this->reflectionClass->getMethod($sMethod);
         $callableObject = $this->getRegisteredObject();

Braces +21 added lines, -15 removed lines

@@ -92,12 +92,13 @@ 
      */
     public function __construct($xCallable)
     {
-        if(is_string($xCallable)) // Received a class name
+        if(is_string($xCallable)) {
+            // Received a class name
         {
             $this->reflectionClass = new \ReflectionClass($xCallable);
-            $this->callableObject = null;
         }
-        else // if(is_object($xCallable)) // Received a class instance
+            $this->callableObject = null;
+        } else // if(is_object($xCallable)) // Received a class instance
         {
             $this->reflectionClass = new \ReflectionClass(get_class($xCallable));
             $this->setCallable($xCallable);
@@ -236,31 +237,35 @@ 
         // Set the namespace
         if($sName == 'namespace')
         {
-            if($sValue != '')
-                $this->namespace = $sValue;
+            if($sValue != '') {
+                            $this->namespace = $sValue;
+            }
             return;
         }
         // Set the classpath
         if($sName == 'classpath')
         {
-            if($sValue != '')
-                $this->classpath = $sValue;
+            if($sValue != '') {
+                            $this->classpath = $sValue;
+            }
             return;
         }
         // Set the separator
         if($sName == 'separator')
         {
-            if($sValue == '_' || $sValue == '.')
-                $this->separator = $sValue;
+            if($sValue == '_' || $sValue == '.') {
+                            $this->separator = $sValue;
+            }
             return;
         }
         // Set the excluded methods
         if($sName == 'protected')
         {
-            if(is_array($sValue))
-                $this->aProtectedMethods = array_merge($this->aProtectedMethods, $sValue);
-            else if(is_string($sValue))
-                $this->aProtectedMethods[] = $sValue;
+            if(is_array($sValue)) {
+                            $this->aProtectedMethods = array_merge($this->aProtectedMethods, $sValue);
+            } else if(is_string($sValue)) {
+                            $this->aProtectedMethods[] = $sValue;
+            }
             return;
         }
         
@@ -343,8 +348,9 @@ 
      */
     public function call($sMethod, $aArgs)
     {
-        if(!$this->hasMethod($sMethod))
-            return;
+        if(!$this->hasMethod($sMethod)) {
+                    return;
+        }
         $reflectionMethod = $this->reflectionClass->getMethod($sMethod);
         $callableObject = $this->getRegisteredObject();
         $this->getResponseManager()->append($reflectionMethod->invokeArgs($callableObject, $aArgs));

src/Request/Support/Alert.php

Spacing +1 added lines, -1 removed lines

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

src/Request/Support/Confirm.php

Spacing +1 added lines, -1 removed lines

@@ -22,7 +22,7 @@
      */
     public function confirm($question, $yesScript, $noScript)
     {
-        if(!$noScript)
+        if (!$noScript)
         {
             return 'if(confirm(' . $question . ')){' . $yesScript . ';}';
         }

Braces +1 added lines, -2 removed lines

@@ -25,8 +25,7 @@
         if(!$noScript)
         {
             return 'if(confirm(' . $question . ')){' . $yesScript . ';}';
-        }
-        else
+        } else
         {
             return 'if(confirm(' . $question . ')){' . $yesScript . ';}else{' . $noScript . ';}';
         }

src/Request/Parameter.php

Spacing +8 added lines, -8 removed lines

@@ -91,19 +91,19 @@ 
      */
     public static function make($xValue)
     {
-        if($xValue instanceof Interfaces\Parameter)
+        if ($xValue instanceof Interfaces\Parameter)
         {
             return $xValue;
         }
-        else if(is_numeric($xValue))
+        else if (is_numeric($xValue))
         {
             return new Parameter(Jaxon::NUMERIC_VALUE, $xValue);
         }
-        else if(is_string($xValue))
+        else if (is_string($xValue))
         {
             return new Parameter(Jaxon::QUOTED_VALUE, $xValue);
         }
-        else if(is_bool($xValue))
+        else if (is_bool($xValue))
         {
             return new Parameter(Jaxon::BOOL_VALUE, $xValue);
         }
@@ -122,7 +122,7 @@ 
     {
         $sJsCode = '';
         $sQuoteCharacter = "'";
-        switch($this->sType)
+        switch ($this->sType)
         {
         case Jaxon::FORM_VALUES:
             $sFormID = (string)$this->xValue;
@@ -130,11 +130,11 @@ 
             break;
         case Jaxon::INPUT_VALUE:
             $sInputID = (string)$this->xValue;
-            $sJsCode = "jaxon.$("  . $sQuoteCharacter . $sInputID . $sQuoteCharacter  . ").value";
+            $sJsCode = "jaxon.$(" . $sQuoteCharacter . $sInputID . $sQuoteCharacter . ").value";
             break;
         case Jaxon::CHECKED_VALUE:
             $sCheckedID = (string)$this->xValue;
-            $sJsCode = "jaxon.$("  . $sQuoteCharacter . $sCheckedID  . $sQuoteCharacter . ").checked";
+            $sJsCode = "jaxon.$(" . $sQuoteCharacter . $sCheckedID . $sQuoteCharacter . ").checked";
             break;
         case Jaxon::ELEMENT_INNERHTML:
             $sElementID = (string)$this->xValue;
@@ -153,7 +153,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.

Braces +5 added lines, -10 removed lines

@@ -94,20 +94,16 @@ 
         if($xValue instanceof Interfaces\Parameter)
         {
             return $xValue;
-        }
-        else if(is_numeric($xValue))
+        } else if(is_numeric($xValue))
         {
             return new Parameter(Jaxon::NUMERIC_VALUE, $xValue);
-        }
-        else if(is_string($xValue))
+        } else if(is_string($xValue))
         {
             return new Parameter(Jaxon::QUOTED_VALUE, $xValue);
-        }
-        else if(is_bool($xValue))
+        } else if(is_bool($xValue))
         {
             return new Parameter(Jaxon::BOOL_VALUE, $xValue);
-        }
-        else // if(is_array($xValue) || is_object($xValue))
+        } else // if(is_array($xValue) || is_object($xValue))
         {
             return new Parameter(Jaxon::JS_VALUE, $xValue);
         }
@@ -158,8 +154,7 @@ 
                 // 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.
                 $sJsCode = str_replace(['"'], ["'"], json_encode($this->xValue, JSON_HEX_APOS | JSON_HEX_QUOT));
-            }
-            else
+            } else
             {
                 $sJsCode = (string)$this->xValue;
             }