jaxon-php / jaxon-core

src/Response/Response.php

Doc Comments +48 added lines, -48 removed lines

@@ -176,7 +176,7 @@ 
     /**
      * Clear all the commands already added to the response
      *
-     * @return \Jaxon\Plugin\Response
+     * @return Response
      */
     public function clearCommands()
     {
@@ -190,9 +190,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 Response
      */
     public function addPluginCommand($xPlugin, $aAttributes, $mData)
     {
@@ -251,7 +251,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 Response
      */
     public function confirmCommands($iCmdNumber, $sMessage)
     {
@@ -271,7 +271,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 Response
      */
     public function assign($sTarget, $sAttribute, $sData)
     {
@@ -293,7 +293,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 Response
      */
     public function html($sTarget, $sData)
     {
@@ -307,7 +307,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 Response
      */
     public function append($sTarget, $sAttribute, $sData)
     {
@@ -328,7 +328,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 Response
      */
     public function prepend($sTarget, $sAttribute, $sData)
     {
@@ -350,7 +350,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 Response
      */
     public function replace($sTarget, $sAttribute, $sSearch, $sData)
     {
@@ -373,7 +373,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 Response
      */
     public function clear($sTarget, $sAttribute)
     {
@@ -389,7 +389,7 @@ 
      * @param string        $sAttribute            The attribute to be updated
      * @param string        $sData                The value to assign
      *
-     * @return \Jaxon\Plugin\Response
+     * @return Response
      */
     public function contextAssign($sAttribute, $sData)
     {
@@ -411,7 +411,7 @@ 
      * @param string        $sAttribute            The attribute to be appended to
      * @param string        $sData                The value to append
      *
-     * @return \Jaxon\Plugin\Response
+     * @return Response
      */
     public function contextAppend($sAttribute, $sData)
     {
@@ -433,7 +433,7 @@ 
      * @param string        $sAttribute            The attribute to be updated
      * @param string        $sData                The value to be prepended
      *
-     * @return \Jaxon\Plugin\Response
+     * @return Response
      */
     public function contextPrepend($sAttribute, $sData)
     {
@@ -454,7 +454,7 @@ 
      *
      * @param string        $sAttribute            The attribute to be cleared
      *
-     * @return \Jaxon\Plugin\Response
+     * @return Response
      */
     public function contextClear($sAttribute)
     {
@@ -466,7 +466,7 @@ 
      *
      * @param string        $sMessage            The message to be displayed
      *
-     * @return \Jaxon\Plugin\Response
+     * @return Response
      */
     public function alert($sMessage)
     {
@@ -483,7 +483,7 @@ 
      *
      * @param string        $sMessage            The message to be displayed
      *
-     * @return \Jaxon\Plugin\Response
+     * @return Response
      */
     public function debug($sMessage)
     {
@@ -501,7 +501,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)
     {
@@ -554,7 +554,7 @@ 
      *
      * @param string        $sJS                The script to execute
      *
-     * @return \Jaxon\Plugin\Response
+     * @return Response
      */
     public function script($sJS)
     {
@@ -571,7 +571,7 @@ 
      *
      * @param string        $sFunc                The name of the function to call
      *
-     * @return \Jaxon\Plugin\Response
+     * @return Response
      */
     public function call($sFunc)
     {
@@ -591,7 +591,7 @@ 
      *
      * @param string        $sTarget            The id of the element to be removed
      *
-     * @return \Jaxon\Plugin\Response
+     * @return Response
      */
     public function remove($sTarget)
     {
@@ -611,7 +611,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 Response
      */
     public function create($sParent, $sTag, $sId)
     {
@@ -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 Response
      */
     public function insert($sBefore, $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 Response
      */
     public function insertAfter($sAfter, $sTag, $sId)
     {
@@ -675,7 +675,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 Response
      */
     public function createInput($sParent, $sType, $sName, $sId)
     {
@@ -698,7 +698,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 Response
      */
     public function insertInput($sBefore, $sType, $sName, $sId)
     {
@@ -721,7 +721,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 Response
      */
     public function insertInputAfter($sAfter, $sType, $sName, $sId)
     {
@@ -743,7 +743,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 Response
      */
     public function setEvent($sTarget, $sEvent, $sScript)
     {
@@ -763,7 +763,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 Response
      */
     public function onClick($sTarget, $sScript)
     {
@@ -779,7 +779,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 Response
      */
     public function addHandler($sTarget, $sEvent, $sHandler)
     {
@@ -800,7 +800,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 Response
      */
     public function removeHandler($sTarget, $sEvent, $sHandler)
     {
@@ -821,7 +821,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 Response
      */
     public function setFunction($sFunction, $sArgs, $sScript)
     {
@@ -848,7 +848,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 Response
      */
     public function wrapFunction($sFunction, $sArgs, $aScripts, $sReturnValueVar)
     {
@@ -869,7 +869,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 Response
      */
     public function includeScript($sFileName, $sType = null, $sId = null)
     {
@@ -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 Response
      */
     public function includeScriptOnce($sFileName, $sType = null, $sId = null)
     {
@@ -913,7 +913,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 Response
      */
     public function removeScript($sFileName, $sUnload = '')
     {
@@ -934,7 +934,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 Response
      */
     public function includeCSS($sFileName, $sMedia = null)
     {
@@ -953,7 +953,7 @@ 
      *
      * @param string        $sFileName            The relative or fully qualified URI of the css file
      *
-     * @return \Jaxon\Plugin\Response
+     * @return Response
      */
     public function removeCSS($sFileName, $sMedia = null)
     {
@@ -978,7 +978,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 Response
      */
     public function waitForCSS($iTimeout = 600)
     {
@@ -1003,7 +1003,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 Response
      */
     public function waitFor($script, $tenths)
     {
@@ -1024,7 +1024,7 @@ 
      *
      * @param integer        $tenths                The number of 1/10ths of a second to sleep
      *
-     * @return \Jaxon\Plugin\Response
+     * @return Response
      */
     public function sleep($tenths)
     {
@@ -1053,7 +1053,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 Response
      */
     public function domCreateElement($variable, $tag)
     {
@@ -1073,7 +1073,7 @@ 
      * @param string        $key                The name of the attribute
      * @param string        $value                The value of the attribute
      *
-     * @return \Jaxon\Plugin\Response
+     * @return Response
      */
     public function domSetAttribute($variable, $key, $value)
     {
@@ -1094,7 +1094,7 @@ 
      * @param string        $skip                The ??
      * @param string        $remove                The ??
      *
-     * @return \Jaxon\Plugin\Response
+     * @return Response
      */
     public function domRemoveChildren($parent, $skip = null, $remove = null)
     {
@@ -1115,7 +1115,7 @@ 
      * @param string        $parent                The DOM parent element
      * @param string        $variable            The DOM element name (id or class)
      *
-     * @return \Jaxon\Plugin\Response
+     * @return Response
      */
     public function domAppendChild($parent, $variable)
     {
@@ -1134,7 +1134,7 @@ 
      * @param string        $target                The DOM target element
      * @param string        $variable            The DOM element name (id or class)
      *
-     * @return \Jaxon\Plugin\Response
+     * @return Response
      */
     public function domInsertBefore($target, $variable)
     {
@@ -1153,7 +1153,7 @@ 
      * @param string        $target                The DOM target element
      * @param string        $variable            The DOM element name (id or class)
      *
-     * @return \Jaxon\Plugin\Response
+     * @return Response
      */
     public function domInsertAfter($target, $variable)
     {
@@ -1172,7 +1172,7 @@ 
      * @param string        $parent                The DOM parent element
      * @param string        $text                The HTML text to append
      *
-     * @return \Jaxon\Plugin\Response
+     * @return Response
      */
     public function domAppendText($parent, $text)
     {
@@ -1213,7 +1213,7 @@ 
      *
      * @param mixed        $value                Any value
      *
-     * @return \Jaxon\Plugin\Response
+     * @return Response
      */
     public function setReturnValue($value)
     {

Spacing +34 added lines, -34 removed lines

@@ -75,7 +75,7 @@ 
     public function plugin($sName)
     {
         $xPlugin = $this->getPluginManager()->getResponsePlugin($sName);
-        if(!$xPlugin)
+        if (!$xPlugin)
         {
             return null;
         }
@@ -138,23 +138,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
                     {
@@ -212,26 +212,26 @@ 
     public function appendResponse(AbstractResponse $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);
             }
@@ -503,33 +503,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
@@ -537,8 +537,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;
@@ -875,10 +875,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"));
@@ -896,10 +896,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"));
@@ -940,7 +940,7 @@ 
     {
         $command = ['cmd' => 'css'];
 
-        if(($sMedia))
+        if (($sMedia))
             $command['media'] = trim((string)$sMedia, " \t");
 
         return $this->addCommand($command, trim((string)$sFileName, " \t"));
@@ -959,7 +959,7 @@ 
     {
         $command = ['cmd' => 'rcss'];
 
-        if(($sMedia))
+        if (($sMedia))
             $command['media'] = trim((string)$sMedia, " \t");
 
         return $this->addCommand($command, trim((string)$sFileName, " \t"));
@@ -1100,10 +1100,10 @@ 
     {
         $command = ['cmd' => 'DRC'];
 
-        if(($skip))
+        if (($skip))
             $command['skip'] = $skip;
 
-        if(($remove))
+        if (($remove))
             $command['remove'] = $remove;
 
         return $this->addCommand($command, $parent);
@@ -1230,13 +1230,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/AbstractResponse.php

Spacing +2 added lines, -2 removed lines

@@ -31,7 +31,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");
@@ -41,7 +41,7 @@ 
 
         $sCharacterSet = '';
         $sCharacterEncoding = $this->getCharacterEncoding();
-        if(is_string($sCharacterEncoding) && strlen($sCharacterEncoding) > 0)
+        if (is_string($sCharacterEncoding) && strlen($sCharacterEncoding) > 0)
         {
             $sCharacterSet = '; charset="' . $sCharacterEncoding . '"';
         }

src/Response/Manager.php

Spacing +8 added lines, -8 removed lines

@@ -84,13 +84,13 @@ 
      */
     public function append(AbstractResponse $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);
             }
@@ -137,9 +137,9 @@ 
      */
     public function printDebug()
     {
-        if(($this->xResponse))
+        if (($this->xResponse))
         {
-            foreach($this->aDebugMessages as $sMessage)
+            foreach ($this->aDebugMessages as $sMessage)
             {
                 $this->xResponse->debug($sMessage);
             }
@@ -154,7 +154,7 @@ 
      */
     public function sendHeaders()
     {
-        if(($this->xResponse))
+        if (($this->xResponse))
         {
             $this->xResponse->sendHeaders();
         }
@@ -167,7 +167,7 @@ 
      */
     public function getOutput()
     {
-        if(($this->xResponse))
+        if (($this->xResponse))
         {
             return $this->xResponse->getOutput();
         }
@@ -181,7 +181,7 @@ 
      */
     public function sendOutput()
     {
-        if(($this->xResponse))
+        if (($this->xResponse))
         {
             $this->xResponse->sendHeaders();
             $this->xResponse->printOutput();

src/Response/UploadResponse.php

Spacing +2 added lines, -3 removed lines

@@ -72,11 +72,10 @@
     public function getOutput()
     {
         $aResponse = ($this->sUploadedFile) ?
-            ['code' => 'success', 'upl' => $this->sUploadedFile] :
-            ['code' => 'error', 'msg' => $this->sErrorMessage];
+            ['code' => 'success', 'upl' => $this->sUploadedFile] : ['code' => 'error', 'msg' => $this->sErrorMessage];
 
         $sConsoleLog = '';
-        array_walk($this->aDebugMessages, function ($sMessage) use (&$sConsoleLog) {
+        array_walk($this->aDebugMessages, function($sMessage) use (&$sConsoleLog) {
             $sConsoleLog .= '
     console.log("' . addslashes($sMessage) . '");';
         });