jaxon-php / jaxon-core

src/Request/Request.php

Unused Use Statements -1 removed lines

@@ -20,7 +20,6 @@
 
 namespace Jaxon\Request;
 
-use JsonSerializable;
 use Jaxon\Jaxon;
 
 class Request extends JsCall

Spacing +17 added lines, -17 removed lines

@@ -58,9 +58,9 @@ 
      */
     public function hasPageNumber()
     {
-        foreach($this->aParameters as $xParameter)
+        foreach ($this->aParameters as $xParameter)
         {
-            if($xParameter->getType() == Jaxon::PAGE_NUMBER)
+            if ($xParameter->getType() == Jaxon::PAGE_NUMBER)
             {
                 return true;
             }
@@ -78,9 +78,9 @@ 
     public function setPageNumber($nPageNumber)
     {
         // Set the value of the Jaxon::PAGE_NUMBER parameter
-        foreach($this->aParameters as $xParameter)
+        foreach ($this->aParameters as $xParameter)
         {
-            if($xParameter->getType() == Jaxon::PAGE_NUMBER)
+            if ($xParameter->getType() == Jaxon::PAGE_NUMBER)
             {
                 $xParameter->setValue(intval($nPageNumber));
                 break;
@@ -100,7 +100,7 @@ 
     {
         $this->sCondition = '__confirm__';
         $this->aMessageArgs = func_get_args();
-        array_walk($this->aMessageArgs, function (&$xParameter) {
+        array_walk($this->aMessageArgs, function(&$xParameter) {
             $xParameter = Parameter::make($xParameter);
         });
         return $this;
@@ -233,7 +233,7 @@ 
     public function elseShow($sMessage)
     {
         $this->aMessageArgs = func_get_args();
-        array_walk($this->aMessageArgs, function (&$xParameter) {
+        array_walk($this->aMessageArgs, function(&$xParameter) {
             $xParameter = Parameter::make($xParameter);
         });
         return $this;
@@ -258,12 +258,12 @@ 
         // This array will avoid declaring multiple variables with the same value.
         // The array key is the variable value, while the array value is the variable name.
         $aVariables = []; // Array of local variables.
-        foreach($this->aParameters as &$xParameter)
+        foreach ($this->aParameters as &$xParameter)
         {
             $sParameterStr = $xParameter->getScript();
-            if($xParameter instanceof \Jaxon\Response\Plugin\JQuery\Dom\Element)
+            if ($xParameter instanceof \Jaxon\Response\Plugin\JQuery\Dom\Element)
             {
-                if(!array_key_exists($sParameterStr, $aVariables))
+                if (!array_key_exists($sParameterStr, $aVariables))
                 {
                     // The value is not yet defined. A new variable is created.
                     $sVarName = "jxnVar$nVarId";
@@ -281,19 +281,19 @@ 
         }
 
         $sPhrase = '';
-        if(count($this->aMessageArgs) > 0)
+        if (count($this->aMessageArgs) > 0)
         {
             $sPhrase = array_shift($this->aMessageArgs); // The first array entry is the question.
             // $sPhrase = "'" . addslashes($sPhrase) . "'"; // Wrap the phrase with single quotes
-            if(count($this->aMessageArgs) > 0)
+            if (count($this->aMessageArgs) > 0)
             {
                 $nParamId = 1;
-                foreach($this->aMessageArgs as &$xParameter)
+                foreach ($this->aMessageArgs as &$xParameter)
                 {
                     $sParameterStr = $xParameter->getScript();
-                    if($xParameter instanceof \Jaxon\Response\Plugin\JQuery\Dom\Element)
+                    if ($xParameter instanceof \Jaxon\Response\Plugin\JQuery\Dom\Element)
                     {
-                        if(!array_key_exists($sParameterStr, $aVariables))
+                        if (!array_key_exists($sParameterStr, $aVariables))
                         {
                             // The value is not yet defined. A new variable is created.
                             $sVarName = "jxnVar$nVarId";
@@ -317,14 +317,14 @@ 
 
         $sScript = parent::getScript();
         $xDialog = jaxon()->dialog();
-        if($this->sCondition == '__confirm__')
+        if ($this->sCondition == '__confirm__')
         {
             $sScript = $xDialog->confirm($sPhrase, $sScript, '');
         }
-        elseif($this->sCondition !== null)
+        elseif ($this->sCondition !== null)
         {
             $sScript = 'if(' . $this->sCondition . '){' . $sScript . ';}';
-            if(($sPhrase))
+            if (($sPhrase))
             {
                 $xDialog->getAlert()->setReturn(true);
                 $sScript .= 'else{' . $xDialog->warning($sPhrase) . ';}';

Braces +3 added lines, -6 removed lines

@@ -270,8 +270,7 @@ 
                     $aVariables[$sParameterStr] = $sVarName;
                     $sVars .= "$sVarName=$xParameter;";
                     $nVarId++;
-                }
-                else
+                } else
                 {
                     // The value is already defined. The corresponding variable is assigned.
                     $sVarName = $aVariables[$sParameterStr];
@@ -300,8 +299,7 @@ 
                             $aVariables[$sParameterStr] = $sVarName;
                             $sVars .= "$sVarName=$xParameter;";
                             $nVarId++;
-                        }
-                        else
+                        } else
                         {
                             // The value is already defined. The corresponding variable is assigned.
                             $sVarName = $aVariables[$sParameterStr];
@@ -320,8 +318,7 @@ 
         if($this->sCondition == '__confirm__')
         {
             $sScript = $xDialog->confirm($sPhrase, $sScript, '');
-        }
-        elseif($this->sCondition !== null)
+        } elseif($this->sCondition !== null)
         {
             $sScript = 'if(' . $this->sCondition . '){' . $sScript . ';}';
             if(($sPhrase))

src/Utils/Pagination/Paginator.php

Doc Comments +1 added lines, -1 removed lines

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

Braces +2 added lines, -4 removed lines

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

Spacing +21 added lines, -21 removed lines

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

src/Request/JsCall.php

Spacing +2 added lines, -2 removed lines

@@ -168,9 +168,9 @@
      */
     public function addParameters(array $aParameters)
     {
-        foreach($aParameters as $xParameter)
+        foreach ($aParameters as $xParameter)
         {
-            if($xParameter instanceof JsCall)
+            if ($xParameter instanceof JsCall)
             {
                 $this->addParameter(Jaxon::JS_VALUE, 'function(){' . $xParameter->getScript() . ';}');
             }

Braces +1 added lines, -2 removed lines

@@ -173,8 +173,7 @@
             if($xParameter instanceof JsCall)
             {
                 $this->addParameter(Jaxon::JS_VALUE, 'function(){' . $xParameter->getScript() . ';}');
-            }
-            else
+            } else
             {
                 $this->pushParameter(Parameter::make($xParameter));
             }

src/Utils/Template/Template.php

Spacing +4 added lines, -4 removed lines

@@ -45,7 +45,7 @@ 
     public function addNamespace($sNamespace, $sDirectory, $sExtension = '')
     {
         // The 'jaxon' key cannot be overriden
-        if($sNamespace == 'jaxon')
+        if ($sNamespace == 'jaxon')
         {
             return;
         }
@@ -82,18 +82,18 @@ 
         // Get the namespace name
         $sNamespace = '';
         $iSeparatorPosition = strrpos($sTemplate, '::');
-        if($iSeparatorPosition !== false)
+        if ($iSeparatorPosition !== false)
         {
             $sNamespace = substr($sTemplate, 0, $iSeparatorPosition);
             $sTemplate = substr($sTemplate, $iSeparatorPosition + 2);
         }
         // The default namespace is 'jaxon'
-        if(!($sNamespace = trim($sNamespace)))
+        if (!($sNamespace = trim($sNamespace)))
         {
             $sNamespace = 'jaxon';
         }
         // Check if the namespace is defined
-        if(!key_exists($sNamespace, $this->aNamespaces))
+        if (!key_exists($sNamespace, $this->aNamespaces))
         {
             return false;
         }

src/Plugin/Plugin.php

Spacing +2 added lines, -2 removed lines

@@ -80,11 +80,11 @@
     protected function includeAssets()
     {
         $sPluginOptionName = 'assets.include.' . $this->getName();
-        if($this->hasOption($sPluginOptionName) && !$this->getOption($sPluginOptionName))
+        if ($this->hasOption($sPluginOptionName) && !$this->getOption($sPluginOptionName))
         {
             return false;
         }
-        if($this->hasOption('assets.include.all') && !$this->getOption('assets.include.all'))
+        if ($this->hasOption('assets.include.all') && !$this->getOption('assets.include.all'))
         {
             return false;
         }

templates/pagination/wrapper.php

Spacing +2 added lines, -2 removed lines

@@ -1,11 +1,11 @@
 <ul class="pagination">
 <?php
-    if(($this->prev))
+    if (($this->prev))
     {
         echo $this->prev;
     }
     echo $this->links;
-    if(($this->next))
+    if (($this->next))
     {
         echo $this->next;
     }

templates/support/function.js.php

Spacing +1 added lines, -1 removed lines

@@ -1,6 +1,6 @@
 <?php echo $this->sPrefix ?><?php echo $this->sAlias ?> = function() {
     return jaxon.request(
         { jxnfun: '<?php echo $this->sFunction ?>' },
-        { parameters: arguments<?php foreach($this->aConfig as $sKey => $sValue): ?>, <?php echo $sKey ?>: <?php echo $sValue ?><?php endforeach ?> }
+        { parameters: arguments<?php foreach ($this->aConfig as $sKey => $sValue): ?>, <?php echo $sKey ?>: <?php echo $sValue ?><?php endforeach ?> }
     );
 };

templates/support/object.js.php

Spacing +2 added lines, -2 removed lines

@@ -1,9 +1,9 @@
 <?php echo $this->sPrefix ?><?php echo $this->sClass ?> = {};
-<?php foreach($this->aMethods as $aMethod): ?>
+<?php foreach ($this->aMethods as $aMethod): ?>
 <?php echo $this->sPrefix ?><?php echo $this->sClass ?>.<?php echo $aMethod['name'] ?> = function() {
     return jaxon.request(
         { jxncls: '<?php echo $this->sClass ?>', jxnmthd: '<?php echo $aMethod['name'] ?>' },
-        { parameters: arguments<?php foreach($aMethod['config'] as $sKey => $sValue): ?>, <?php echo $sKey ?>: <?php echo $sValue ?><?php endforeach ?> }
+        { parameters: arguments<?php foreach ($aMethod['config'] as $sKey => $sValue): ?>, <?php echo $sKey ?>: <?php echo $sValue ?><?php endforeach ?> }
     );
 };
 <?php endforeach ?>

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 ?> }
     );
 };