jaxon-php / jaxon-core

src/Utils/Http/URI.php

Spacing +32 added lines, -32 removed lines

@@ -25,16 +25,16 @@ 
     {
         $aURL = [];
         // Try to get the request URL
-        if(!empty($_SERVER['REQUEST_URI']))
+        if (!empty($_SERVER['REQUEST_URI']))
         {
-            $_SERVER['REQUEST_URI'] = str_replace(['"',"'",'<','>'], ['%22','%27','%3C','%3E'], $_SERVER['REQUEST_URI']);
+            $_SERVER['REQUEST_URI'] = str_replace(['"', "'", '<', '>'], ['%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,19 +78,19 @@ 
             }
         }
 
-        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']))
         {
-            if(!empty($_SERVER['PATH_INFO']))
+            if (!empty($_SERVER['PATH_INFO']))
             {
                 $sPath = parse_url($_SERVER['PATH_INFO']);
             }
@@ -98,61 +98,61 @@ 
             {
                 $sPath = parse_url($_SERVER['PHP_SELF']);
             }
-            if(isset($sPath['path']))
+            if (isset($sPath['path']))
             {
-                $aURL['path'] = str_replace(['"',"'",'<','>'], ['%22','%27','%3C','%3E'], $sPath['path']);
+                $aURL['path'] = str_replace(['"', "'", '<', '>'], ['%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/Dialogs/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/Utils/Dialogs/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 . ')';
         }

src/Response/Response.php

Braces +43 added lines, -38 removed lines

@@ -169,20 +169,17 @@ 
                             $aLastCommand['cmd'] == 'js')
                     {
                         $mData = $aLastCommand['data'].'; '.$mData;
-                    }
-                    elseif($this->getOption('core.response.merge.ap') &&
+                    } elseif($this->getOption('core.response.merge.ap') &&
                             $aLastCommand['cmd'] == 'ap' &&
                             $aLastCommand['id'] == $aAttributes['id'] &&
                             $aLastCommand['prop'] == $aAttributes['prop'])
                     {
                         $mData = $aLastCommand['data'].' '.$mData;
-                    }
-                    else
+                    } else
                     {
                         $this->aCommands[] = $aLastCommand;
                     }
-                }
-                else
+                } else
                 {
                     $this->aCommands[] = $aLastCommand;
                 }
@@ -237,12 +234,10 @@ 
         {
             $this->returnValue = $mCommands->returnValue;
             $aCommands = $mCommands->aCommands;
-        }
-        elseif(is_array($mCommands))
+        } elseif(is_array($mCommands))
         {
             $aCommands = $mCommands;
-        }
-        else
+        } else
         {
             if(!empty($mCommands))
             {
@@ -255,8 +250,7 @@ 
             if($bBefore)
             {
                 $this->aCommands = array_merge($aCommands, $this->aCommands);
-            }
-            else
+            } else
             {
                 $this->aCommands = array_merge($this->aCommands, $aCommands);
             }
@@ -534,8 +528,9 @@ 
         {
             $queryStart++;
             $queryEnd = strpos($sURL, '#', $queryStart);
-            if($queryEnd === false)
-                $queryEnd = strlen($sURL);
+            if($queryEnd === false) {
+                            $queryEnd = strlen($sURL);
+            }
             $queryPart = substr($sURL, $queryStart, $queryEnd-$queryStart);
             parse_str($queryPart, $queryParts);
             $newQueryPart = "";
@@ -544,10 +539,11 @@ 
                 $first = true;
                 foreach($queryParts as $key => $value)
                 {
-                    if($first)
-                        $first = false;
-                    else
-                        $newQueryPart .= '&';
+                    if($first) {
+                                            $first = false;
+                    } else {
+                                            $newQueryPart .= '&';
+                    }
                     $newQueryPart .= rawurlencode($key).'='.rawurlencode($value);
                 }
             } elseif($_SERVER['QUERY_STRING']) {
@@ -558,10 +554,11 @@ 
                 }
             $sURL = str_replace($queryPart, $newQueryPart, $sURL);
         }
-        if($iDelay)
-            $this->script('window.setTimeout("window.location = \'' . $sURL . '\';",' . ($iDelay*1000) . ');');
-        else
-            $this->script('window.location = "' . $sURL . '";');
+        if($iDelay) {
+                    $this->script('window.setTimeout("window.location = \'' . $sURL . '\';",' . ($iDelay*1000) . ');');
+        } else {
+                    $this->script('window.location = "' . $sURL . '";');
+        }
         return $this;
     }
 
@@ -896,11 +893,13 @@ 
     {
         $command = ['cmd'  =>  'in'];
 
-        if(($sType))
-            $command['type'] = trim((string)$sType, " \t");
+        if(($sType)) {
+                    $command['type'] = trim((string)$sType, " \t");
+        }
 
-        if(($sId))
-            $command['elm_id'] = trim((string)$sId, " \t");
+        if(($sId)) {
+                    $command['elm_id'] = trim((string)$sId, " \t");
+        }
 
         return $this->addCommand($command, trim((string)$sFileName, " \t"));
     }
@@ -917,11 +916,13 @@ 
     {
         $command = ['cmd' => 'ino'];
 
-        if(($sType))
-            $command['type'] = trim((string)$sType, " \t");
+        if(($sType)) {
+                    $command['type'] = trim((string)$sType, " \t");
+        }
 
-        if(($sId))
-            $command['elm_id'] = trim((string)$sId, " \t");
+        if(($sId)) {
+                    $command['elm_id'] = trim((string)$sId, " \t");
+        }
 
         return $this->addCommand($command, trim((string)$sFileName, " \t"));
     }
@@ -961,8 +962,9 @@ 
     {
         $command = ['cmd' => 'css'];
 
-        if(($sMedia))
-            $command['media'] = trim((string)$sMedia, " \t");
+        if(($sMedia)) {
+                    $command['media'] = trim((string)$sMedia, " \t");
+        }
 
         return $this->addCommand($command, trim((string)$sFileName, " \t"));
     }
@@ -980,8 +982,9 @@ 
     {
         $command = ['cmd' => 'rcss'];
 
-        if(($sMedia))
-            $command['media'] = trim((string)$sMedia, " \t");
+        if(($sMedia)) {
+                    $command['media'] = trim((string)$sMedia, " \t");
+        }
 
         return $this->addCommand($command, trim((string)$sFileName, " \t"));
     }
@@ -1121,11 +1124,13 @@ 
     {
         $command = ['cmd' => 'DRC'];
 
-        if(($skip))
-            $command['skip'] = $skip;
+        if(($skip)) {
+                    $command['skip'] = $skip;
+        }
 
-        if(($remove))
-            $command['remove'] = $remove;
+        if(($remove)) {
+                    $command['remove'] = $remove;
+        }
 
         return $this->addCommand($command, $parent);
     }

Doc Comments +48 added lines, -48 removed lines

@@ -197,7 +197,7 @@ 
     /**
      * Clear all the commands already added to the response
      *
-     * @return \Jaxon\Plugin\Response
+     * @return Response
      */
     public function clearCommands()
     {
@@ -211,9 +211,9 @@ 
      *
      * @param \Jaxon\Plugin\Plugin  $xPlugin            The plugin object
      * @param array                 $aAttributes        The attributes for this response command
-     * @param mixed                 $mData              The data to be sent with this command
+     * @param string                 $mData              The data to be sent with this command
      *
-     * @return \Jaxon\Plugin\Response
+     * @return ResponseContract
      */
     public function addPluginCommand($xPlugin, $aAttributes, $mData)
     {
@@ -272,7 +272,7 @@ 
      * @param integer        $iCmdNumber            The number of commands to skip upon cancel
      * @param string        $sMessage            The message to display to the user
      *
-     * @return \Jaxon\Plugin\Response
+     * @return ResponseContract
      */
     public function confirmCommands($iCmdNumber, $sMessage)
     {
@@ -292,7 +292,7 @@ 
      * @param string        $sAttribute           The attribute to be assigned
      * @param string        $sData                The value to be assigned to the attribute
      *
-     * @return \Jaxon\Plugin\Response
+     * @return ResponseContract
      */
     public function assign($sTarget, $sAttribute, $sData)
     {
@@ -314,7 +314,7 @@ 
      * @param string        $sTarget              The id of the html element on the browser
      * @param string        $sData                The value to be assigned to the attribute
      *
-     * @return \Jaxon\Plugin\Response
+     * @return ResponseContract
      */
     public function html($sTarget, $sData)
     {
@@ -328,7 +328,7 @@ 
      * @param string        $sAttribute            The name of the attribute to be appended to
      * @param string        $sData                The data to be appended to the attribute
      *
-     * @return \Jaxon\Plugin\Response
+     * @return ResponseContract
      */
     public function append($sTarget, $sAttribute, $sData)
     {
@@ -349,7 +349,7 @@ 
      * @param string        $sAttribute            The name of the attribute to be prepended to
      * @param string        $sData                The value to be prepended to the attribute
      *
-     * @return \Jaxon\Plugin\Response
+     * @return ResponseContract
      */
     public function prepend($sTarget, $sAttribute, $sData)
     {
@@ -371,7 +371,7 @@ 
      * @param string        $sSearch            The needle to search for
      * @param string        $sData                The data to use in place of the needle
      *
-     * @return \Jaxon\Plugin\Response
+     * @return ResponseContract
      */
     public function replace($sTarget, $sAttribute, $sSearch, $sData)
     {
@@ -394,7 +394,7 @@ 
      * @param string        $sTarget            The id of the element to be updated.
      * @param string        $sAttribute            The attribute to be cleared
      *
-     * @return \Jaxon\Plugin\Response
+     * @return ResponseContract
      */
     public function clear($sTarget, $sAttribute)
     {
@@ -410,7 +410,7 @@ 
      * @param string        $sAttribute            The attribute to be updated
      * @param string        $sData                The value to assign
      *
-     * @return \Jaxon\Plugin\Response
+     * @return ResponseContract
      */
     public function contextAssign($sAttribute, $sData)
     {
@@ -432,7 +432,7 @@ 
      * @param string        $sAttribute            The attribute to be appended to
      * @param string        $sData                The value to append
      *
-     * @return \Jaxon\Plugin\Response
+     * @return ResponseContract
      */
     public function contextAppend($sAttribute, $sData)
     {
@@ -454,7 +454,7 @@ 
      * @param string        $sAttribute            The attribute to be updated
      * @param string        $sData                The value to be prepended
      *
-     * @return \Jaxon\Plugin\Response
+     * @return ResponseContract
      */
     public function contextPrepend($sAttribute, $sData)
     {
@@ -475,7 +475,7 @@ 
      *
      * @param string        $sAttribute            The attribute to be cleared
      *
-     * @return \Jaxon\Plugin\Response
+     * @return ResponseContract
      */
     public function contextClear($sAttribute)
     {
@@ -487,7 +487,7 @@ 
      *
      * @param string        $sMessage            The message to be displayed
      *
-     * @return \Jaxon\Plugin\Response
+     * @return ResponseContract
      */
     public function alert($sMessage)
     {
@@ -504,7 +504,7 @@ 
      *
      * @param string        $sMessage            The message to be displayed
      *
-     * @return \Jaxon\Plugin\Response
+     * @return ResponseContract
      */
     public function debug($sMessage)
     {
@@ -522,7 +522,7 @@ 
      * @param string        $sURL                The relative or fully qualified URL
      * @param integer        $iDelay                Number of seconds to delay before the redirect occurs
      *
-     * @return \Jaxon\Plugin\Response
+     * @return Response
      */
     public function redirect($sURL, $iDelay=0)
     {
@@ -575,7 +575,7 @@ 
      *
      * @param string        $sJS                The script to execute
      *
-     * @return \Jaxon\Plugin\Response
+     * @return ResponseContract
      */
     public function script($sJS)
     {
@@ -592,7 +592,7 @@ 
      *
      * @param string        $sFunc                The name of the function to call
      *
-     * @return \Jaxon\Plugin\Response
+     * @return ResponseContract
      */
     public function call($sFunc)
     {
@@ -612,7 +612,7 @@ 
      *
      * @param string        $sTarget            The id of the element to be removed
      *
-     * @return \Jaxon\Plugin\Response
+     * @return ResponseContract
      */
     public function remove($sTarget)
     {
@@ -632,7 +632,7 @@ 
      * @param string        $sTag                The tag name to be used for the new element
      * @param string        $sId                The id to assign to the new element
      *
-     * @return \Jaxon\Plugin\Response
+     * @return ResponseContract
      */
     public function create($sParent, $sTag, $sId)
     {
@@ -653,7 +653,7 @@ 
      * @param string        $sTag               The tag name to be used for the new element
      * @param string        $sId                The id to assign to the new element
      *
-     * @return \Jaxon\Plugin\Response
+     * @return ResponseContract
      */
     public function insert($sBefore, $sTag, $sId)
     {
@@ -674,7 +674,7 @@ 
      * @param string        $sTag               The tag name to be used for the new element
      * @param string        $sId                The id to assign to the new element
      *
-     * @return \Jaxon\Plugin\Response
+     * @return ResponseContract
      */
     public function insertAfter($sAfter, $sTag, $sId)
     {
@@ -696,7 +696,7 @@ 
      * @param string        $sName                The name of the new input element
      * @param string        $sId                The id of the new element
      *
-     * @return \Jaxon\Plugin\Response
+     * @return ResponseContract
      */
     public function createInput($sParent, $sType, $sName, $sId)
     {
@@ -719,7 +719,7 @@ 
      * @param string        $sName                The name of the new input element
      * @param string        $sId                The id of the new element
      *
-     * @return \Jaxon\Plugin\Response
+     * @return ResponseContract
      */
     public function insertInput($sBefore, $sType, $sName, $sId)
     {
@@ -742,7 +742,7 @@ 
      * @param string        $sName                The name of the new input element
      * @param string        $sId                The id of the new element
      *
-     * @return \Jaxon\Plugin\Response
+     * @return ResponseContract
      */
     public function insertInputAfter($sAfter, $sType, $sName, $sId)
     {
@@ -764,7 +764,7 @@ 
      * @param string        $sEvent                The name of the event
      * @param string        $sScript            The javascript to execute when the event is fired
      *
-     * @return \Jaxon\Plugin\Response
+     * @return ResponseContract
      */
     public function setEvent($sTarget, $sEvent, $sScript)
     {
@@ -784,7 +784,7 @@ 
      * @param string        $sTarget            The id of the element that contains the event
      * @param string        $sScript            The javascript to execute when the event is fired
      *
-     * @return \Jaxon\Plugin\Response
+     * @return ResponseContract
      */
     public function onClick($sTarget, $sScript)
     {
@@ -800,7 +800,7 @@ 
      * @param string        $sEvent              The name of the event
      * @param string        $sHandler            The name of the javascript function to call when the event is fired
      *
-     * @return \Jaxon\Plugin\Response
+     * @return ResponseContract
      */
     public function addHandler($sTarget, $sEvent, $sHandler)
     {
@@ -821,7 +821,7 @@ 
      * @param string        $sEvent              The name of the event
      * @param string        $sHandler            The name of the javascript function called when the event is fired
      *
-     * @return \Jaxon\Plugin\Response
+     * @return ResponseContract
      */
     public function removeHandler($sTarget, $sEvent, $sHandler)
     {
@@ -842,7 +842,7 @@ 
      * @param string        $sArgs                Comma separated list of parameter names
      * @param string        $sScript            The javascript code that will become the body of the function
      *
-     * @return \Jaxon\Plugin\Response
+     * @return ResponseContract
      */
     public function setFunction($sFunction, $sArgs, $sScript)
     {
@@ -869,7 +869,7 @@ 
      * @param string        $sReturnValueVar    The name of the variable that will retain the return value
      *                                             from the call to the original function
      *
-     * @return \Jaxon\Plugin\Response
+     * @return ResponseContract
      */
     public function wrapFunction($sFunction, $sArgs, $aScripts, $sReturnValueVar)
     {
@@ -890,7 +890,7 @@ 
      * @param string        $sFileName            The relative or fully qualified URI of the javascript file
      * @param string        $sType                Determines the script type. Defaults to 'text/javascript'
      *
-     * @return \Jaxon\Plugin\Response
+     * @return ResponseContract
      */
     public function includeScript($sFileName, $sType = null, $sId = null)
     {
@@ -911,7 +911,7 @@ 
      * @param string        $sFileName            The relative or fully qualified URI of the javascript file
      * @param string        $sType                Determines the script type. Defaults to 'text/javascript'
      *
-     * @return \Jaxon\Plugin\Response
+     * @return ResponseContract
      */
     public function includeScriptOnce($sFileName, $sType = null, $sId = null)
     {
@@ -934,7 +934,7 @@ 
      * @param string        $sFileName            The relative or fully qualified URI of the javascript file
      * @param string        $sUnload            Name of a javascript function to call prior to unlaoding the file
      *
-     * @return \Jaxon\Plugin\Response
+     * @return ResponseContract
      */
     public function removeScript($sFileName, $sUnload = '')
     {
@@ -955,7 +955,7 @@ 
      * @param string        $sFileName            The relative or fully qualified URI of the css file
      * @param string        $sMedia                The media type of the CSS file. Defaults to 'screen'
      *
-     * @return \Jaxon\Plugin\Response
+     * @return ResponseContract
      */
     public function includeCSS($sFileName, $sMedia = null)
     {
@@ -974,7 +974,7 @@ 
      *
      * @param string        $sFileName            The relative or fully qualified URI of the css file
      *
-     * @return \Jaxon\Plugin\Response
+     * @return ResponseContract
      */
     public function removeCSS($sFileName, $sMedia = null)
     {
@@ -999,7 +999,7 @@ 
      * @param integer        $iTimeout            The number of 1/10ths of a second to pause before timing out
      *                                             and continuing with the execution of the response commands
      *
-     * @return \Jaxon\Plugin\Response
+     * @return ResponseContract
      */
     public function waitForCSS($iTimeout = 600)
     {
@@ -1024,7 +1024,7 @@ 
      * @param integer        $tenths                The number of 1/10ths of a second to wait before timing out
      *                                             and continuing with the execution of the response commands.
      *
-     * @return \Jaxon\Plugin\Response
+     * @return ResponseContract
      */
     public function waitFor($script, $tenths)
     {
@@ -1045,7 +1045,7 @@ 
      *
      * @param integer        $tenths                The number of 1/10ths of a second to sleep
      *
-     * @return \Jaxon\Plugin\Response
+     * @return ResponseContract
      */
     public function sleep($tenths)
     {
@@ -1074,7 +1074,7 @@ 
      * @param string        $variable            The DOM element name (id or class)
      * @param string        $tag                The HTML tag of the new DOM element
      *
-     * @return \Jaxon\Plugin\Response
+     * @return ResponseContract
      */
     public function domCreateElement($variable, $tag)
     {
@@ -1094,7 +1094,7 @@ 
      * @param string        $key                The name of the attribute
      * @param string        $value                The value of the attribute
      *
-     * @return \Jaxon\Plugin\Response
+     * @return ResponseContract
      */
     public function domSetAttribute($variable, $key, $value)
     {
@@ -1115,7 +1115,7 @@ 
      * @param string        $skip                The ??
      * @param string        $remove                The ??
      *
-     * @return \Jaxon\Plugin\Response
+     * @return ResponseContract
      */
     public function domRemoveChildren($parent, $skip = null, $remove = null)
     {
@@ -1136,7 +1136,7 @@ 
      * @param string        $parent                The DOM parent element
      * @param string        $variable            The DOM element name (id or class)
      *
-     * @return \Jaxon\Plugin\Response
+     * @return ResponseContract
      */
     public function domAppendChild($parent, $variable)
     {
@@ -1155,7 +1155,7 @@ 
      * @param string        $target                The DOM target element
      * @param string        $variable            The DOM element name (id or class)
      *
-     * @return \Jaxon\Plugin\Response
+     * @return ResponseContract
      */
     public function domInsertBefore($target, $variable)
     {
@@ -1174,7 +1174,7 @@ 
      * @param string        $target                The DOM target element
      * @param string        $variable            The DOM element name (id or class)
      *
-     * @return \Jaxon\Plugin\Response
+     * @return ResponseContract
      */
     public function domInsertAfter($target, $variable)
     {
@@ -1193,7 +1193,7 @@ 
      * @param string        $parent                The DOM parent element
      * @param string        $text                The HTML text to append
      *
-     * @return \Jaxon\Plugin\Response
+     * @return ResponseContract
      */
     public function domAppendText($parent, $text)
     {
@@ -1234,7 +1234,7 @@ 
      *
      * @param mixed        $value                Any value
      *
-     * @return \Jaxon\Plugin\Response
+     * @return Response
      */
     public function setReturnValue($value)
     {

Spacing +36 added lines, -36 removed lines

@@ -96,7 +96,7 @@ 
     public function plugin($sName)
     {
         $xPlugin = $this->getPluginManager()->getResponsePlugin($sName);
-        if(!$xPlugin)
+        if (!$xPlugin)
         {
             return null;
         }
@@ -159,23 +159,23 @@ 
     public function addCommand($aAttributes, $mData)
     {
         /* merge commands if possible */
-        if(in_array($aAttributes['cmd'], ['js', 'ap']))
+        if (in_array($aAttributes['cmd'], ['js', 'ap']))
         {
-            if(($aLastCommand = array_pop($this->aCommands)))
+            if (($aLastCommand = array_pop($this->aCommands)))
             {
-                if($aLastCommand['cmd'] == $aAttributes['cmd'])
+                if ($aLastCommand['cmd'] == $aAttributes['cmd'])
                 {
-                    if($this->getOption('core.response.merge.js') &&
+                    if ($this->getOption('core.response.merge.js') &&
                             $aLastCommand['cmd'] == 'js')
                     {
-                        $mData = $aLastCommand['data'].'; '.$mData;
+                        $mData = $aLastCommand['data'] . '; ' . $mData;
                     }
-                    elseif($this->getOption('core.response.merge.ap') &&
+                    elseif ($this->getOption('core.response.merge.ap') &&
                             $aLastCommand['cmd'] == 'ap' &&
                             $aLastCommand['id'] == $aAttributes['id'] &&
                             $aLastCommand['prop'] == $aAttributes['prop'])
                     {
-                        $mData = $aLastCommand['data'].' '.$mData;
+                        $mData = $aLastCommand['data'] . ' ' . $mData;
                     }
                     else
                     {
@@ -233,26 +233,26 @@ 
     public function appendResponse(ResponseContract $mCommands, $bBefore = false)
     {
         $aCommands = [];
-        if($mCommands instanceof Response)
+        if ($mCommands instanceof Response)
         {
             $this->returnValue = $mCommands->returnValue;
             $aCommands = $mCommands->aCommands;
         }
-        elseif(is_array($mCommands))
+        elseif (is_array($mCommands))
         {
             $aCommands = $mCommands;
         }
         else
         {
-            if(!empty($mCommands))
+            if (!empty($mCommands))
             {
                 throw new \Jaxon\Exception\Error($this->trans('errors.response.data.invalid'));
             }
         }
 
-        if(count($aCommands) > 0)
+        if (count($aCommands) > 0)
         {
-            if($bBefore)
+            if ($bBefore)
             {
                 $this->aCommands = array_merge($aCommands, $this->aCommands);
             }
@@ -524,33 +524,33 @@ 
      *
      * @return \Jaxon\Plugin\Response
      */
-    public function redirect($sURL, $iDelay=0)
+    public function redirect($sURL, $iDelay = 0)
     {
         // we need to parse the query part so that the values are rawurlencode()'ed
         // can't just use parse_url() cos we could be dealing with a relative URL which
         // parse_url() can't deal with.
         $queryStart = strpos($sURL, '?', strrpos($sURL, '/'));
-        if($queryStart !== false)
+        if ($queryStart !== false)
         {
             $queryStart++;
             $queryEnd = strpos($sURL, '#', $queryStart);
-            if($queryEnd === false)
+            if ($queryEnd === false)
                 $queryEnd = strlen($sURL);
-            $queryPart = substr($sURL, $queryStart, $queryEnd-$queryStart);
+            $queryPart = substr($sURL, $queryStart, $queryEnd - $queryStart);
             parse_str($queryPart, $queryParts);
             $newQueryPart = "";
-            if($queryParts)
+            if ($queryParts)
             {
                 $first = true;
-                foreach($queryParts as $key => $value)
+                foreach ($queryParts as $key => $value)
                 {
-                    if($first)
+                    if ($first)
                         $first = false;
                     else
                         $newQueryPart .= '&';
-                    $newQueryPart .= rawurlencode($key).'='.rawurlencode($value);
+                    $newQueryPart .= rawurlencode($key) . '=' . rawurlencode($value);
                 }
-            } elseif($_SERVER['QUERY_STRING']) {
+            } elseif ($_SERVER['QUERY_STRING']) {
                     //couldn't break up the query, but there's one there
                     //possibly "http://url/page.html?query1234" type of query?
                     //just encode it and hope it works
@@ -558,8 +558,8 @@ 
                 }
             $sURL = str_replace($queryPart, $newQueryPart, $sURL);
         }
-        if($iDelay)
-            $this->script('window.setTimeout("window.location = \'' . $sURL . '\';",' . ($iDelay*1000) . ');');
+        if ($iDelay)
+            $this->script('window.setTimeout("window.location = \'' . $sURL . '\';",' . ($iDelay * 1000) . ');');
         else
             $this->script('window.location = "' . $sURL . '";');
         return $this;
@@ -896,10 +896,10 @@ 
     {
         $command = ['cmd'  =>  'in'];
 
-        if(($sType))
+        if (($sType))
             $command['type'] = trim((string)$sType, " \t");
 
-        if(($sId))
+        if (($sId))
             $command['elm_id'] = trim((string)$sId, " \t");
 
         return $this->addCommand($command, trim((string)$sFileName, " \t"));
@@ -917,10 +917,10 @@ 
     {
         $command = ['cmd' => 'ino'];
 
-        if(($sType))
+        if (($sType))
             $command['type'] = trim((string)$sType, " \t");
 
-        if(($sId))
+        if (($sId))
             $command['elm_id'] = trim((string)$sId, " \t");
 
         return $this->addCommand($command, trim((string)$sFileName, " \t"));
@@ -961,7 +961,7 @@ 
     {
         $command = ['cmd' => 'css'];
 
-        if(($sMedia))
+        if (($sMedia))
             $command['media'] = trim((string)$sMedia, " \t");
 
         return $this->addCommand($command, trim((string)$sFileName, " \t"));
@@ -980,7 +980,7 @@ 
     {
         $command = ['cmd' => 'rcss'];
 
-        if(($sMedia))
+        if (($sMedia))
             $command['media'] = trim((string)$sMedia, " \t");
 
         return $this->addCommand($command, trim((string)$sFileName, " \t"));
@@ -1121,10 +1121,10 @@ 
     {
         $command = ['cmd' => 'DRC'];
 
-        if(($skip))
+        if (($skip))
             $command['skip'] = $skip;
 
-        if(($remove))
+        if (($remove))
             $command['remove'] = $remove;
 
         return $this->addCommand($command, $parent);
@@ -1249,7 +1249,7 @@ 
      */
     public function sendHeaders()
     {
-        if($this->getRequesthandler()->requestMethodIsGet())
+        if ($this->getRequesthandler()->requestMethodIsGet())
         {
             header("Expires: Mon, 26 Jul 1997 05:00:00 GMT");
             header("Last-Modified: " . gmdate("D, d M Y H:i:s") . " GMT");
@@ -1259,7 +1259,7 @@ 
 
         $sCharacterSet = '';
         $sCharacterEncoding = trim($this->getOption('core.encoding'));
-        if(($sCharacterEncoding) && strlen($sCharacterEncoding) > 0)
+        if (($sCharacterEncoding) && strlen($sCharacterEncoding) > 0)
         {
             $sCharacterSet = '; charset="' . trim($sCharacterEncoding) . '"';
         }
@@ -1276,13 +1276,13 @@ 
     {
         $response = [];
 
-        if(($this->returnValue))
+        if (($this->returnValue))
         {
             $response['jxnrv'] = $this->returnValue;
         }
         $response['jxnobj'] = [];
 
-        foreach($this->aCommands as $xCommand)
+        foreach ($this->aCommands as $xCommand)
         {
             $response['jxnobj'][] = $xCommand;
         }

src/Response/Manager.php

Spacing +8 added lines, -8 removed lines

@@ -86,13 +86,13 @@ 
      */
     public function append(ResponseContract $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);
             }
@@ -139,9 +139,9 @@ 
      */
     public function printDebug()
     {
-        if(($this->xResponse))
+        if (($this->xResponse))
         {
-            foreach($this->aDebugMessages as $sMessage)
+            foreach ($this->aDebugMessages as $sMessage)
             {
                 $this->xResponse->debug($sMessage);
             }
@@ -156,7 +156,7 @@ 
      */
     public function sendHeaders()
     {
-        if(($this->xResponse))
+        if (($this->xResponse))
         {
             $this->xResponse->sendHeaders();
         }
@@ -169,7 +169,7 @@ 
      */
     public function getOutput()
     {
-        if(($this->xResponse))
+        if (($this->xResponse))
         {
             return $this->xResponse->getOutput();
         }
@@ -183,7 +183,7 @@ 
      */
     public function sendOutput()
     {
-        if(($this->xResponse))
+        if (($this->xResponse))
         {
             $this->xResponse->sendHeaders();
             $this->xResponse->printOutput();

Braces +2 added lines, -4 removed lines

@@ -89,15 +89,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', ['class' => get_class($xResponse)]));
         }

src/Plugin/CodeGenerator.php

Spacing +28 added lines, -28 removed lines

@@ -101,7 +101,7 @@ 
      */
     private function getJsLibExt()
     {
-        if(($this->getOption('js.app.minify')))
+        if (($this->getOption('js.app.minify')))
         {
             return '.min.js';
         }
@@ -118,7 +118,7 @@ 
         // Check config options
         // - The js.app.export 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.export') ||
+        if (!$this->getOption('js.app.export') ||
             !$this->getOption('js.app.uri') ||
             !$this->getOption('js.app.dir'))
         {
@@ -127,7 +127,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;
         }
@@ -142,11 +142,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();
         }
@@ -160,22 +160,22 @@ 
      */
     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 $xResponsePlugin)
+            foreach ($this->xPluginManager->getResponsePlugins() as $xResponsePlugin)
             {
-                if(($sCssCode = trim($xResponsePlugin->getCss())))
+                if (($sCssCode = trim($xResponsePlugin->getCss())))
                 {
                     $this->sCssCode .= rtrim($sCssCode, " \n") . "\n";
                 }
-                if(($sJsCode = trim($xResponsePlugin->getJs())))
+                if (($sJsCode = trim($xResponsePlugin->getJs())))
                 {
                     $this->sJsCode .= rtrim($sJsCode, " \n") . "\n";
                 }
-                if(($sJsReady = trim($xResponsePlugin->getScript())))
+                if (($sJsReady = trim($xResponsePlugin->getScript())))
                 {
                     $this->sJsReady .= trim($sJsReady, " \n") . "\n";
                 }
@@ -184,26 +184,26 @@ 
             $this->sJsReady = $this->xTemplate->render('jaxon::plugins/ready.js', [
                 'sPluginScript' => $this->sJsReady,
             ]);
-            foreach($this->xPluginManager->getRequestPlugins() as $xRequestPlugin)
+            foreach ($this->xPluginManager->getRequestPlugins() as $xRequestPlugin)
             {
-                if(($sJsReady = trim($xRequestPlugin->getScript())))
+                if (($sJsReady = trim($xRequestPlugin->getScript())))
                 {
                     $this->sJsReady .= trim($sJsReady, " \n") . "\n";
                 }
             }
 
-            foreach($this->xPluginManager->getPackages() as $sPackageClass)
+            foreach ($this->xPluginManager->getPackages() as $sPackageClass)
             {
                 $xPackage = jaxon()->di()->get($sPackageClass);
-                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";
                 }
-                if(($sJsReady = trim($xPackage->ready())))
+                if (($sJsReady = trim($xPackage->ready())))
                 {
                     $this->sJsReady .= trim($sJsReady, " \n") . "\n";
                 }
@@ -227,7 +227,7 @@ 
 
         // Add component files to the javascript file array;
         $aJsFiles = [$sJsCoreUrl];
-        if($this->getOption('core.debug.on'))
+        if ($this->getOption('core.debug.on'))
         {
             $aJsFiles[] = $sJsDebugUrl;
             $aJsFiles[] = $sJsLanguageUrl;
@@ -321,7 +321,7 @@ 
      */
     public function getScript($bIncludeJs = false, $bIncludeCss = false)
     {
-        if(!$this->getOption('core.request.uri'))
+        if (!$this->getOption('core.request.uri'))
         {
             $this->setOption('core.request.uri', URI::detect());
         }
@@ -330,16 +330,16 @@ 
         $this->makePluginsCode();
 
         $sScript = '';
-        if(($bIncludeCss))
+        if (($bIncludeCss))
         {
             $sScript .= $this->getCss() . "\n";
         }
-        if(($bIncludeJs))
+        if (($bIncludeJs))
         {
             $sScript .= $this->getJs() . "\n";
         }
 
-        if($this->canExportJavascript())
+        if ($this->canExportJavascript())
         {
             $sJsAppURI = rtrim($this->getOption('js.app.uri'), '/') . '/';
             $sJsAppDir = rtrim($this->getOption('js.app.dir'), '/') . '/';
@@ -347,7 +347,7 @@ 
             $sExtension = $this->getJsLibExt();
 
             // Check if the final file already exists
-            if(($sFinalFile) && is_file($sJsAppDir . $sFinalFile . $sExtension))
+            if (($sFinalFile) && is_file($sJsAppDir . $sFinalFile . $sExtension))
             {
                 $sOutFile = $sFinalFile . $sExtension;
             }
@@ -357,25 +357,25 @@ 
                 $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')))
+                if (($this->getOption('js.app.minify')))
                 {
-                    if(is_file($sJsAppDir . $sMinFile))
+                    if (is_file($sJsAppDir . $sMinFile))
                     {
                         $sOutFile = $sMinFile; // The file was already minified
                     }
-                    elseif(($this->minify($sJsAppDir . $sOutFile, $sJsAppDir . $sMinFile)))
+                    elseif (($this->minify($sJsAppDir . $sOutFile, $sJsAppDir . $sMinFile)))
                     {
                         $sOutFile = $sMinFile;
                     }
                 }
                 // Copy the file to its final location
-                if(($sFinalFile))
+                if (($sFinalFile))
                 {
-                    if(copy($sJsAppDir . $sOutFile, $sJsAppDir . $sFinalFile . $sExtension))
+                    if (copy($sJsAppDir . $sOutFile, $sJsAppDir . $sFinalFile . $sExtension))
                     {
                         $sOutFile = $sFinalFile . $sExtension;
                     }

Braces +3 added lines, -6 removed lines

@@ -350,8 +350,7 @@ 
             if(($sFinalFile) && is_file($sJsAppDir . $sFinalFile . $sExtension))
             {
                 $sOutFile = $sFinalFile . $sExtension;
-            }
-            else
+            } else
             {
                 // The plugins scripts are written into the javascript app dir
                 $sHash = $this->generateHash();
@@ -366,8 +365,7 @@ 
                     if(is_file($sJsAppDir . $sMinFile))
                     {
                         $sOutFile = $sMinFile; // The file was already minified
-                    }
-                    elseif(($this->minify($sJsAppDir . $sOutFile, $sJsAppDir . $sMinFile)))
+                    } elseif(($this->minify($sJsAppDir . $sOutFile, $sJsAppDir . $sMinFile)))
                     {
                         $sOutFile = $sMinFile;
                     }
@@ -387,8 +385,7 @@ 
                 'sJsOptions' => $this->getOption('js.app.options', ''),
                 'sUrl' => $sJsAppURI . $sOutFile,
             ]);
-        }
-        else
+        } else
         {
             // The plugins scripts are wrapped with javascript tags
             $sScript .= $this->xTemplate->render('jaxon::plugins/wrapper.js', [

src/Plugin/Manager.php

Spacing +12 added lines, -12 removed lines

@@ -138,33 +138,33 @@ 
         $bIsAlert = ($xPlugin instanceof \Jaxon\Contracts\Dialogs\Alert);
         $bIsConfirm = ($xPlugin instanceof \Jaxon\Contracts\Dialogs\Confirm);
         $bIsListener = ($xPlugin instanceof \Jaxon\Contracts\Event\Listener);
-        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 && !$bIsListener)
+        elseif (!$bIsConfirm && !$bIsAlert && !$bIsListener)
         {
             $sErrorMessage = $this->trans('errors.register.invalid', ['name' => get_class($xPlugin)]);
             throw new \Jaxon\Exception\Error($sErrorMessage);
         }
         // 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($bIsListener)
+        if ($bIsListener)
         {
             $this->addEventListener($xPlugin);
         }
@@ -199,7 +199,7 @@ 
      */
     public function registerCallable($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 @@ 
     private function registerCallablesFromConfig($xAppConfig, $sSection, $sCallableType)
     {
         $aConfig = $xAppConfig->getOption($sSection, []);
-        foreach($aConfig as $xKey => $xValue)
+        foreach ($aConfig as $xKey => $xValue)
         {
-            if(is_integer($xKey) && is_string($xValue))
+            if (is_integer($xKey) && is_string($xValue))
             {
                 // Register a function without options
                 $this->registerCallable($sCallableType, $xValue);
             }
-            elseif(is_string($xKey) && (is_array($xValue) || is_string($xValue)))
+            elseif (is_string($xKey) && (is_array($xValue) || is_string($xValue)))
             {
                 // Register a function with options
                 $this->registerCallable($sCallableType, $xKey, $xValue);
@@ -269,7 +269,7 @@ 
      */
     public function getResponsePlugin($sName)
     {
-        if(array_key_exists($sName, $this->aResponsePlugins))
+        if (array_key_exists($sName, $this->aResponsePlugins))
         {
             return $this->aResponsePlugins[$sName];
         }
@@ -285,7 +285,7 @@ 
      */
     public function getRequestPlugin($sName)
     {
-        if(array_key_exists($sName, $this->aRequestPlugins))
+        if (array_key_exists($sName, $this->aRequestPlugins))
         {
             return $this->aRequestPlugins[$sName];
         }

Braces +4 added lines, -8 removed lines

@@ -142,13 +142,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 && !$bIsListener)
+        } elseif(!$bIsConfirm && !$bIsAlert && !$bIsListener)
         {
             $sErrorMessage = $this->trans('errors.register.invalid', ['name' => get_class($xPlugin)]);
             throw new \Jaxon\Exception\Error($sErrorMessage);
@@ -226,13 +224,11 @@ 
             {
                 // Register a function without options
                 $this->registerCallable($sCallableType, $xValue);
-            }
-            elseif(is_string($xKey) && (is_array($xValue) || is_string($xValue)))
+            } elseif(is_string($xKey) && (is_array($xValue) || is_string($xValue)))
             {
                 // Register a function with options
                 $this->registerCallable($sCallableType, $xKey, $xValue);
-            }
-            else
+            } else
             {
                 continue;
                 // Todo: throw an exception

src/App/Bootstrap.php

Spacing +6 added lines, -6 removed lines

@@ -154,7 +154,7 @@ 
         $this->triggerEvent('pre.setup');
 
         // Add the view renderer
-        $view->addRenderer('jaxon', function () {
+        $view->addRenderer('jaxon', function() {
             return new View\View();
         });
 
@@ -181,24 +181,24 @@ 
         // Use the Composer autoloader. It's important to call this before triggers and callbacks.
         // $jaxon->useComposerAutoloader();
         // Jaxon library settings
-        if(!$jaxon->hasOption('js.app.export'))
+        if (!$jaxon->hasOption('js.app.export'))
         {
             $jaxon->setOption('js.app.export', $this->bExportJs);
         }
-        if(!$jaxon->hasOption('js.app.minify'))
+        if (!$jaxon->hasOption('js.app.minify'))
         {
             $jaxon->setOption('js.app.minify', $this->bMinifyJs);
         }
-        if(!$jaxon->hasOption('js.app.uri') && $this->sJsUri != '')
+        if (!$jaxon->hasOption('js.app.uri') && $this->sJsUri != '')
         {
             $jaxon->setOption('js.app.uri', $this->sJsUri);
         }
-        if(!$jaxon->hasOption('js.app.dir') && $this->sJsDir != '')
+        if (!$jaxon->hasOption('js.app.dir') && $this->sJsDir != '')
         {
             $jaxon->setOption('js.app.dir', $this->sJsDir);
         }
         // Set the request URI
-        if(!$jaxon->hasOption('core.request.uri') && $this->sUri != '')
+        if (!$jaxon->hasOption('core.request.uri') && $this->sUri != '')
         {
             $jaxon->setOption('core.request.uri', $this->sUri);
         }

src/CallableClass.php

Indentation +1 added lines, -1 removed lines

@@ -94,7 +94,7 @@
         return jaxon()->instance($name);
     }
 
-   /**
+    /**
      * Get the uploaded files
      *
      * @return array

Spacing +2 added lines, -2 removed lines

@@ -81,12 +81,12 @@
         $xCallableObject = jaxon()->di()->getCallableRepository()->getCallableObject(get_class($this));
         $cFirstChar = substr($name, 0, 1);
         // If the class name starts with a dot, then find the class in the same full namespace as the caller
-        if($cFirstChar == ':')
+        if ($cFirstChar == ':')
         {
             $name = $xCallableObject->getRootNamespace() . '\\' . str_replace('.', '\\', substr($name, 1));
         }
         // If the class name starts with a dot, then find the class in the same base namespace as the caller
-        elseif($cFirstChar == '.')
+        elseif ($cFirstChar == '.')
         {
             $name = $xCallableObject->getNamespace() . '\\' . str_replace('.', '\\', substr($name, 1));
         }