Completed
Pull Request — master (#51)
by Thierry
01:27
created
src/Response/Response.php 1 patch
Braces   +18 added lines, -8 removed lines patch added patch discarded remove patch
@@ -514,7 +514,9 @@  discard block
 block discarded – undo
514 514
             $queryStart++;
515 515
             $queryEnd = strpos($sURL, '#', $queryStart);
516 516
             if($queryEnd === false)
517
-                $queryEnd = strlen($sURL);
517
+            {
518
+                            $queryEnd = strlen($sURL);
519
+            }
518 520
             $queryPart = substr($sURL, $queryStart, $queryEnd - $queryStart);
519 521
             parse_str($queryPart, $queryParts);
520 522
             $newQueryPart = "";
@@ -524,12 +526,17 @@  discard block
 block discarded – undo
524 526
                 foreach($queryParts as $key => $value)
525 527
                 {
526 528
                     if($first)
527
-                        $first = false;
528
-                    else
529
-                        $newQueryPart .= '&';
529
+                    {
530
+                                            $first = false;
531
+                    }
532
+                    else {
533
+                                            $newQueryPart .= '&';
534
+                    }
530 535
                     $newQueryPart .= rawurlencode($key) . '=' . rawurlencode($value);
531 536
                 }
532
-            } elseif($_SERVER['QUERY_STRING']) {
537
+            }
538
+            elseif($_SERVER['QUERY_STRING'])
539
+            {
533 540
                     //couldn't break up the query, but there's one there
534 541
                     //possibly "http://url/page.html?query1234" type of query?
535 542
                     //just encode it and hope it works
@@ -538,9 +545,12 @@  discard block
 block discarded – undo
538 545
             $sURL = str_replace($queryPart, $newQueryPart, $sURL);
539 546
         }
540 547
         if($iDelay)
541
-            $this->script('window.setTimeout("window.location = \'' . $sURL . '\';",' . ($iDelay * 1000) . ');');
542
-        else
543
-            $this->script('window.location = "' . $sURL . '";');
548
+        {
549
+                    $this->script('window.setTimeout("window.location = \'' . $sURL . '\';",' . ($iDelay * 1000) . ');');
550
+        }
551
+        else {
552
+                    $this->script('window.location = "' . $sURL . '";');
553
+        }
544 554
         return $this;
545 555
     }
546 556
 
Please login to merge, or discard this patch.
src/Jaxon.php 1 patch
Doc Comments   +3 added lines, -3 removed lines patch added patch discarded remove patch
@@ -364,7 +364,7 @@  discard block
 block discarded – undo
364 364
      *
365 365
      * This function may exit after the request is processed, if the 'core.process.exit' option is set to true.
366 366
      *
367
-     * @return void
367
+     * @return boolean|null
368 368
      *
369 369
      * @see <Jaxon\Jaxon->canProcessRequest>
370 370
      */
@@ -438,7 +438,7 @@  discard block
 block discarded – undo
438 438
     /**
439 439
      * Get the view renderer
440 440
      *
441
-     * @return Jaxon\Utils\View\Renderer
441
+     * @return Utils\View\Renderer
442 442
      */
443 443
     public function view()
444 444
     {
@@ -448,7 +448,7 @@  discard block
 block discarded – undo
448 448
     /**
449 449
      * Get the session manager
450 450
      *
451
-     * @return Jaxon\Contracts\Session
451
+     * @return Contracts\Session
452 452
      */
453 453
     public function session()
454 454
     {
Please login to merge, or discard this patch.
src/Request/Handler/Handler.php 2 patches
Doc Comments   +3 added lines, -1 removed lines patch added patch discarded remove patch
@@ -140,6 +140,7 @@  discard block
 block discarded – undo
140 140
      * This is the pre-request processing callback passed to the Jaxon library.
141 141
      *
142 142
      * @param  boolean  &$bEndRequest if set to true, the request processing is interrupted.
143
+     * @param boolean $bEndRequest
143 144
      *
144 145
      * @return Jaxon\Response\Response  the Jaxon response
145 146
      */
@@ -170,6 +171,7 @@  discard block
 block discarded – undo
170 171
     /**
171 172
      * This callback is called whenever an invalid request is processed.
172 173
      *
174
+     * @param string $sMessage
173 175
      * @return Jaxon\Response\Response  the Jaxon response
174 176
      */
175 177
     public function onInvalid($sMessage)
@@ -236,7 +238,7 @@  discard block
 block discarded – undo
236 238
      * Calls each of the request plugins to request that they process the current request.
237 239
      * If any plugin processes the request, it will return true.
238 240
      *
239
-     * @return boolean
241
+     * @return boolean|null
240 242
      */
241 243
     public function processRequest()
242 244
     {
Please login to merge, or discard this patch.
Unused Use Statements   -1 removed lines patch added patch discarded remove patch
@@ -24,7 +24,6 @@
 block discarded – undo
24 24
 use Jaxon\Plugin\Manager as PluginManager;
25 25
 use Jaxon\Response\Manager as ResponseManager;
26 26
 use Jaxon\Request\Plugin\FileUpload;
27
-
28 27
 use Exception;
29 28
 
30 29
 class Handler
Please login to merge, or discard this patch.