jaxon-php / jaxon-core

templates/support/event.js.php

Spacing +1 added lines, -1 removed lines

@@ -1,6 +1,6 @@
 <?php echo $this->sPrefix ?><?php echo $this->sEvent ?> = function() {
     return jaxon.request(
         { jxnevt: '<?php echo $this->sEvent ?>' },
-        { parameters: arguments<?php if(($this->sMode)): ?>, mode: '<?php echo $this->sMode ?>'<?php endif ?><?php if(($this->sMethod)): ?>, method: '<?php echo $this->sMethod ?>'<?php endif ?> }
+        { parameters: arguments<?php if (($this->sMode)): ?>, mode: '<?php echo $this->sMode ?>'<?php endif ?><?php if (($this->sMethod)): ?>, method: '<?php echo $this->sMethod ?>'<?php endif ?> }
     );
 };

templates/plugins/includes.js.php

Spacing +1 added lines, -1 removed lines

@@ -1,3 +1,3 @@
-<?php foreach($this->aUrls as $sUrl): ?>
+<?php foreach ($this->aUrls as $sUrl): ?>
 <script type="text/javascript" src="<?php echo $sUrl ?>" <?php echo $this->sJsOptions ?> charset="UTF-8"></script>
 <?php endforeach ?>

templates/plugins/ready.js.php

Spacing +1 added lines, -1 removed lines

@@ -1,7 +1,7 @@
 jaxon.dom.ready(function() {
     jaxon.command.handler.register('cc', jaxon.confirm.commands);
 
-<?php if($this->sPluginScript): ?>
+<?php if ($this->sPluginScript): ?>
 <?php echo $this->sPluginScript ?>
 <?php endif ?>
 });

src/Request/Factory.php

Doc Comments -3 removed lines

@@ -23,7 +23,6 @@ 
      * Return the javascript call to a Jaxon function or object method
      *
      * @param string            $sName              The function or method (with class) name
-     * @param ...               $xParams            The parameters of the function or method
      *
      * @return \Jaxon\Request\Request
      */
@@ -46,7 +45,6 @@ 
      * Return the javascript call to a generic function
      *
      * @param string            $sName              The function or method (with class) name
-     * @param ...               $xParams            The parameters of the function or method
      *
      * @return \Jaxon\Request\Request
      */
@@ -70,7 +68,6 @@ 
      * @param integer       $nItemsPerPage          The number of items per page page
      * @param integer       $nCurrentPage           The current page
      * @param string        $sMethod                The name of function or a method prepended with its class name
-     * @param ...           $xParams                The parameters of the function or method
      *
      * @return string the pagination links
      */

src/Request/Plugin/CallableObject.php

Doc Comments +1 added lines, -1 removed lines

@@ -100,7 +100,7 @@
      *
      * @param array         $aArgs                An array containing the callable object specification
      *
-     * @return array
+     * @return boolean
      */
     public function register($aArgs)
     {

Spacing +26 added lines, -26 removed lines

@@ -67,19 +67,19 @@ 
         $this->sRequestedClass = null;
         $this->sRequestedMethod = null;
 
-        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'];
         }
@@ -104,44 +104,44 @@ 
      */
     public function register($aArgs)
     {
-        if(count($aArgs) > 1)
+        if (count($aArgs) > 1)
         {
             $sType = $aArgs[0];
 
-            if($sType == Jaxon::CALLABLE_OBJECT)
+            if ($sType == Jaxon::CALLABLE_OBJECT)
             {
                 $xCallableObject = $aArgs[1];
 
-                if(!is_object($xCallableObject) && !is_string($xCallableObject))
+                if (!is_object($xCallableObject) && !is_string($xCallableObject))
                 {
                     throw new \Jaxon\Exception\Error($this->trans('errors.objects.instance'));
                 }
-                if(is_string($xCallableObject) && !class_exists($xCallableObject))
+                if (is_string($xCallableObject) && !class_exists($xCallableObject))
                 {
                     throw new \Jaxon\Exception\Error($this->trans('errors.objects.instance'));
                 }
-                if(!($xCallableObject instanceof \Jaxon\Request\Support\CallableObject))
+                if (!($xCallableObject instanceof \Jaxon\Request\Support\CallableObject))
                 {
                     $xCallableObject = new \Jaxon\Request\Support\CallableObject($xCallableObject);
                 }
-                if(count($aArgs) > 2 && is_array($aArgs[2]))
+                if (count($aArgs) > 2 && is_array($aArgs[2]))
                 {
                     $aOptions = $aArgs[2];
                     // Save the classpath and the separator in this class
-                    if(array_key_exists('*', $aOptions) && is_array($aOptions['*']))
+                    if (array_key_exists('*', $aOptions) && is_array($aOptions['*']))
                     {
                         $aOptions = $aOptions['*'];
                         $sSeparator = '.';
-                        if(array_key_exists('separator', $aOptions))
+                        if (array_key_exists('separator', $aOptions))
                         {
                             $sSeparator = trim($aOptions['separator']);
                         }
-                        if(!in_array($sSeparator, ['.', '_']))
+                        if (!in_array($sSeparator, ['.', '_']))
                         {
                             $sSeparator = '.';
                         }
                         $aOptions['separator'] = $sSeparator;
-                        if(array_key_exists('classpath', $aOptions))
+                        if (array_key_exists('classpath', $aOptions))
                         {
                             $aOptions['classpath'] = trim($aOptions['classpath'], ' \\._');
                             // Save classpath with "\" in the parameters
@@ -150,9 +150,9 @@ 
                             $this->aClassPaths[] = str_replace('\\', $sSeparator, $aOptions['classpath']);
                         }
                     }
-                    foreach($aArgs[2] as $sKey => $aValue)
+                    foreach ($aArgs[2] as $sKey => $aValue)
                     {
-                        foreach($aValue as $sName => $sValue)
+                        foreach ($aValue as $sName => $sValue)
                         {
                             $xCallableObject->configure($sKey, $sName, $sValue);
                         }
@@ -176,7 +176,7 @@ 
     public function generateHash()
     {
         $sHash = '';
-        foreach($this->aCallableObjects as $xCallableObject)
+        foreach ($this->aCallableObjects as $xCallableObject)
         {
             $sHash .= $xCallableObject->getName();
             $sHash .= implode('|', $xCallableObject->getMethods());
@@ -195,15 +195,15 @@ 
         // Generate code for javascript objects declaration
         $code = '';
         $classes = array();
-        foreach($this->aClassPaths as $sClassPath)
+        foreach ($this->aClassPaths as $sClassPath)
         {
             $offset = 0;
             $sClassPath .= '.Null'; // This is a sentinel. The last token is not processed in the while loop.
-            while(($dotPosition = strpos($sClassPath, '.', $offset)) !== false)
+            while (($dotPosition = strpos($sClassPath, '.', $offset)) !== false)
             {
                 $class = substr($sClassPath, 0, $dotPosition);
                 // Generate code for this object
-                if(!array_key_exists($class, $classes))
+                if (!array_key_exists($class, $classes))
                 {
                     $code .= "$sJaxonPrefix$class = {};\n";
                     $classes[$class] = $class;
@@ -212,7 +212,7 @@ 
             }
         }
         // Generate code for javascript methods
-        foreach($this->aCallableObjects as $xCallableObject)
+        foreach ($this->aCallableObjects as $xCallableObject)
         {
             $code .= $xCallableObject->getScript();
         }
@@ -227,13 +227,13 @@ 
     public function canProcessRequest()
     {
         // Check the validity of the class name
-        if(($this->sRequestedClass) && !$this->validateClass($this->sRequestedClass))
+        if (($this->sRequestedClass) && !$this->validateClass($this->sRequestedClass))
         {
             $this->sRequestedClass = null;
             $this->sRequestedMethod = null;
         }
         // Check the validity of the method name
-        if(($this->sRequestedMethod) && !$this->validateMethod($this->sRequestedMethod))
+        if (($this->sRequestedMethod) && !$this->validateMethod($this->sRequestedMethod))
         {
             $this->sRequestedClass = null;
             $this->sRequestedMethod = null;
@@ -248,20 +248,20 @@ 
      */
     public function processRequest()
     {
-        if(!$this->canProcessRequest())
+        if (!$this->canProcessRequest())
             return false;
 
         $aArgs = $this->getRequestManager()->process();
 
         // Register an instance of the requested class, if it isn't yet
-        if(!($xCallableObject = $this->getCallableObject($this->sRequestedClass)))
+        if (!($xCallableObject = $this->getCallableObject($this->sRequestedClass)))
         {
             $this->getPluginManager()->registerClass($this->sRequestedClass);
             $xCallableObject = $this->getCallableObject($this->sRequestedClass);
         }
 
         // Find the requested method
-        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',

Braces +3 added lines, -2 removed lines

@@ -248,8 +248,9 @@
      */
     public function processRequest()
     {
-        if(!$this->canProcessRequest())
-            return false;
+        if(!$this->canProcessRequest()) {
+                    return false;
+        }
 
         $aArgs = $this->getRequestManager()->process();
 

src/Response/Manager.php

Spacing +8 added lines, -8 removed lines

@@ -71,13 +71,13 @@ 
      */
     public function append(Response $xResponse)
     {
-        if(!$this->xResponse)
+        if (!$this->xResponse)
         {
             $this->xResponse = $xResponse;
         }
-        elseif(get_class($this->xResponse) == get_class($xResponse))
+        elseif (get_class($this->xResponse) == get_class($xResponse))
         {
-            if($this->xResponse != $xResponse)
+            if ($this->xResponse != $xResponse)
             {
                 $this->xResponse->appendResponse($xResponse);
             }
@@ -110,9 +110,9 @@ 
      */
     public function printDebug()
     {
-        if(($this->xResponse))
+        if (($this->xResponse))
         {
-            foreach($this->aDebugMessages as $sMessage)
+            foreach ($this->aDebugMessages as $sMessage)
             {
                 $this->xResponse->debug($sMessage);
             }
@@ -127,7 +127,7 @@ 
      */
     public function sendHeaders()
     {
-        if(($this->xResponse))
+        if (($this->xResponse))
         {
             $this->xResponse->sendHeaders();
         }
@@ -140,7 +140,7 @@ 
      */
     public function getOutput()
     {
-        if(($this->xResponse))
+        if (($this->xResponse))
         {
             return $this->xResponse->getOutput();
         }
@@ -154,7 +154,7 @@ 
      */
     public function sendOutput()
     {
-        if(($this->xResponse))
+        if (($this->xResponse))
         {
             $this->xResponse->sendHeaders();
             $this->xResponse->printOutput();

Braces +2 added lines, -4 removed lines

@@ -74,15 +74,13 @@
         if(!$this->xResponse)
         {
             $this->xResponse = $xResponse;
-        }
-        elseif(get_class($this->xResponse) == get_class($xResponse))
+        } elseif(get_class($this->xResponse) == get_class($xResponse))
         {
             if($this->xResponse != $xResponse)
             {
                 $this->xResponse->appendResponse($xResponse);
             }
-        }
-        else
+        } else
         {
             $this->debug($this->trans('errors.mismatch.types', array('class' => get_class($xResponse))));
         }

src/JQuery/Dom/Element.php

Spacing +3 added lines, -3 removed lines

@@ -52,11 +52,11 @@ 
         $sSelector = trim($sSelector, " \t");
         $sContext = trim($sContext, " \t");
         $this->aCalls = array();
-        if(!$sSelector)
+        if (!$sSelector)
         {
             $this->sSelector = "$(this)"; // If an empty selector is given, use javascript "this" instead
         }
-        elseif(($sContext))
+        elseif (($sContext))
         {
             $this->sSelector = "$('" . $sSelector . "', $('" . $sContext . "'))";
         }
@@ -112,7 +112,7 @@ 
      */
     public function getScript()
     {
-        if(count($this->aCalls) == 0)
+        if (count($this->aCalls) == 0)
         {
             return $this->sSelector;
         }

Braces +2 added lines, -4 removed lines

@@ -55,12 +55,10 @@
         if(!$sSelector)
         {
             $this->sSelector = "$(this)"; // If an empty selector is given, use javascript "this" instead
-        }
-        elseif(($sContext))
+        } elseif(($sContext))
         {
             $this->sSelector = "$('" . $sSelector . "', $('" . $sContext . "'))";
-        }
-        else
+        } else
         {
             $this->sSelector = "$('" . $sSelector . "')";
         }

src/Utils/URI.php

Spacing +32 added lines, -32 removed lines

@@ -25,16 +25,16 @@ 
     {
         $aURL = array();
         // Try to get the request URL
-        if(!empty($_SERVER['REQUEST_URI']))
+        if (!empty($_SERVER['REQUEST_URI']))
         {
-            $_SERVER['REQUEST_URI'] = str_replace(array('"',"'",'<','>'), array('%22','%27','%3C','%3E'), $_SERVER['REQUEST_URI']);
+            $_SERVER['REQUEST_URI'] = str_replace(array('"', "'", '<', '>'), array('%22', '%27', '%3C', '%3E'), $_SERVER['REQUEST_URI']);
             $aURL = parse_url($_SERVER['REQUEST_URI']);
         }
         
         // Fill in the empty values
-        if(empty($aURL['scheme']))
+        if (empty($aURL['scheme']))
         {
-            if(!empty($_SERVER['HTTP_SCHEME']))
+            if (!empty($_SERVER['HTTP_SCHEME']))
             {
                 $aURL['scheme'] = $_SERVER['HTTP_SCHEME'];
             }
@@ -44,11 +44,11 @@ 
             }
         }
         
-        if(empty($aURL['host']))
+        if (empty($aURL['host']))
         {
-            if(!empty($_SERVER['HTTP_X_FORWARDED_HOST']))
+            if (!empty($_SERVER['HTTP_X_FORWARDED_HOST']))
             {
-                if(strpos($_SERVER['HTTP_X_FORWARDED_HOST'], ':') > 0)
+                if (strpos($_SERVER['HTTP_X_FORWARDED_HOST'], ':') > 0)
                 {
                     list($aURL['host'], $aURL['port']) = explode(':', $_SERVER['HTTP_X_FORWARDED_HOST']);
                 }
@@ -57,9 +57,9 @@ 
                     $aURL['host'] = $_SERVER['HTTP_X_FORWARDED_HOST'];
                 }
             }
-            elseif(!empty($_SERVER['HTTP_HOST']))
+            elseif (!empty($_SERVER['HTTP_HOST']))
             {
-                if(strpos($_SERVER['HTTP_HOST'], ':') > 0)
+                if (strpos($_SERVER['HTTP_HOST'], ':') > 0)
                 {
                     list($aURL['host'], $aURL['port']) = explode(':', $_SERVER['HTTP_HOST']);
                 }
@@ -68,7 +68,7 @@ 
                     $aURL['host'] = $_SERVER['HTTP_HOST'];
                 }
             }
-            elseif(!empty($_SERVER['SERVER_NAME']))
+            elseif (!empty($_SERVER['SERVER_NAME']))
             {
                 $aURL['host'] = $_SERVER['SERVER_NAME'];
             }
@@ -78,20 +78,20 @@ 
             }
         }
         
-        if(empty($aURL['port']) && !empty($_SERVER['SERVER_PORT']))
+        if (empty($aURL['port']) && !empty($_SERVER['SERVER_PORT']))
         {
             $aURL['port'] = $_SERVER['SERVER_PORT'];
         }
         
-        if(!empty($aURL['path']) && strlen(basename($aURL['path'])) == 0)
+        if (!empty($aURL['path']) && strlen(basename($aURL['path'])) == 0)
         {
             unset($aURL['path']);
         }
         
-        if(empty($aURL['path']))
+        if (empty($aURL['path']))
         {
             $sPath = array();
-            if(!empty($_SERVER['PATH_INFO']))
+            if (!empty($_SERVER['PATH_INFO']))
             {
                 $sPath = parse_url($_SERVER['PATH_INFO']);
             }
@@ -99,61 +99,61 @@ 
             {
                 $sPath = parse_url($_SERVER['PHP_SELF']);
             }
-            if(isset($sPath['path']))
+            if (isset($sPath['path']))
             {
-                $aURL['path'] = str_replace(array('"',"'",'<','>'), array('%22','%27','%3C','%3E'), $sPath['path']);
+                $aURL['path'] = str_replace(array('"', "'", '<', '>'), array('%22', '%27', '%3C', '%3E'), $sPath['path']);
             }
             unset($sPath);
         }
         
-        if(empty($aURL['query']) && !empty($_SERVER['QUERY_STRING']))
+        if (empty($aURL['query']) && !empty($_SERVER['QUERY_STRING']))
         {
             $aURL['query'] = $_SERVER['QUERY_STRING'];
         }
         
-        if(!empty($aURL['query']))
+        if (!empty($aURL['query']))
         {
-            $aURL['query'] = '?'.$aURL['query'];
+            $aURL['query'] = '?' . $aURL['query'];
         }
         
         // Build the URL: Start with scheme, user and pass
-        $sURL = $aURL['scheme'].'://';
-        if(!empty($aURL['user']))
+        $sURL = $aURL['scheme'] . '://';
+        if (!empty($aURL['user']))
         {
-            $sURL.= $aURL['user'];
-            if(!empty($aURL['pass']))
+            $sURL .= $aURL['user'];
+            if (!empty($aURL['pass']))
             {
-                $sURL.= ':'.$aURL['pass'];
+                $sURL .= ':' . $aURL['pass'];
             }
-            $sURL.= '@';
+            $sURL .= '@';
         }
         
         // Add the host
-        $sURL.= $aURL['host'];
+        $sURL .= $aURL['host'];
         
         // Add the port if needed
-        if(!empty($aURL['port'])
+        if (!empty($aURL['port'])
                 && (($aURL['scheme'] == 'http' && $aURL['port'] != 80)
                         || ($aURL['scheme'] == 'https' && $aURL['port'] != 443)))
         {
-            $sURL.= ':'.$aURL['port'];
+            $sURL .= ':' . $aURL['port'];
         }
         
         // Add the path and the query string
-        $sURL.= $aURL['path'].@$aURL['query'];
+        $sURL .= $aURL['path'] . @$aURL['query'];
         
         // Clean up
         unset($aURL);
         
         $aURL = explode("?", $sURL);
         
-        if(1 < count($aURL))
+        if (1 < count($aURL))
         {
             $aQueries = explode("&", $aURL[1]);
         
-            foreach($aQueries as $sKey => $sQuery)
+            foreach ($aQueries as $sKey => $sQuery)
             {
-                if("jxnGenerate" == substr($sQuery, 0, 11))
+                if ("jxnGenerate" == substr($sQuery, 0, 11))
                     unset($aQueries[$sKey]);
             }
                 

Braces +10 added lines, -16 removed lines

@@ -37,8 +37,7 @@ 
             if(!empty($_SERVER['HTTP_SCHEME']))
             {
                 $aURL['scheme'] = $_SERVER['HTTP_SCHEME'];
-            }
-            else
+            } else
             {
                 $aURL['scheme'] = ((!empty($_SERVER['HTTPS']) && strtolower($_SERVER['HTTPS']) != 'off') ? 'https' : 'http');
             }
@@ -51,28 +50,23 @@ 
                 if(strpos($_SERVER['HTTP_X_FORWARDED_HOST'], ':') > 0)
                 {
                     list($aURL['host'], $aURL['port']) = explode(':', $_SERVER['HTTP_X_FORWARDED_HOST']);
-                }
-                else
+                } else
                 {
                     $aURL['host'] = $_SERVER['HTTP_X_FORWARDED_HOST'];
                 }
-            }
-            elseif(!empty($_SERVER['HTTP_HOST']))
+            } elseif(!empty($_SERVER['HTTP_HOST']))
             {
                 if(strpos($_SERVER['HTTP_HOST'], ':') > 0)
                 {
                     list($aURL['host'], $aURL['port']) = explode(':', $_SERVER['HTTP_HOST']);
-                }
-                else
+                } else
                 {
                     $aURL['host'] = $_SERVER['HTTP_HOST'];
                 }
-            }
-            elseif(!empty($_SERVER['SERVER_NAME']))
+            } elseif(!empty($_SERVER['SERVER_NAME']))
             {
                 $aURL['host'] = $_SERVER['SERVER_NAME'];
-            }
-            else
+            } else
             {
                 throw new \Jaxon\Exception\URI();
             }
@@ -94,8 +88,7 @@ 
             if(!empty($_SERVER['PATH_INFO']))
             {
                 $sPath = parse_url($_SERVER['PATH_INFO']);
-            }
-            else
+            } else
             {
                 $sPath = parse_url($_SERVER['PHP_SELF']);
             }
@@ -153,8 +146,9 @@ 
         
             foreach($aQueries as $sKey => $sQuery)
             {
-                if("jxnGenerate" == substr($sQuery, 0, 11))
-                    unset($aQueries[$sKey]);
+                if("jxnGenerate" == substr($sQuery, 0, 11)) {
+                                    unset($aQueries[$sKey]);
+                }
             }
                 
             $sQueries = implode("&", $aQueries);

src/Utils/Config/Json.php

Spacing +3 added lines, -3 removed lines

@@ -29,13 +29,13 @@ 
     public static function read($sConfigFile, $sLibKey = '', $sAppKey = null)
     {
         $sConfigFile = realpath($sConfigFile);
-        if(!is_readable($sConfigFile))
+        if (!is_readable($sConfigFile))
         {
             throw new \Jaxon\Exception\Config\File(jaxon_trans('config.errors.file.access', array('path' => $sConfigFile)));
         }
         $sFileContent = file_get_contents($sConfigFile);
         $aConfigOptions = json_decode($sFileContent, true);
-        if(!is_array($aConfigOptions))
+        if (!is_array($aConfigOptions))
         {
             throw new \Jaxon\Exception\Config\File(jaxon_trans('config.errors.file.content', array('path' => $sConfigFile)));
         }
@@ -44,7 +44,7 @@ 
         $jaxon = jaxon();
         $jaxon->setOptions($aConfigOptions, $sLibKey);
         $config = null;
-        if(is_string($sAppKey))
+        if (is_string($sAppKey))
         {
             $config = new Config();
             $config->setOptions($aConfigOptions, $sAppKey);