jaxon-php / jaxon-core

src/Utils/Pagination/Paginator.php

Doc Comments +1 added lines, -1 removed lines

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

Spacing +20 added lines, -20 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 < 4)
+        if ($maxPagesToShow < 4)
         {
             throw new \InvalidArgumentException('maxPagesToShow cannot be less than 4.');
         }
@@ -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(Parameter::PAGE_NUMBER, 0);
         }
@@ -197,7 +197,7 @@ 
 
     public function getNextPage()
     {
-        if($this->currentPage < $this->numPages)
+        if ($this->currentPage < $this->numPages)
         {
             return $this->currentPage + 1;
         }
@@ -207,7 +207,7 @@ 
 
     public function getPrevPage()
     {
-        if($this->currentPage > 1)
+        if ($this->currentPage > 1)
         {
             return $this->currentPage - 1;
         }
@@ -217,7 +217,7 @@ 
 
     public function getNextCall()
     {
-        if(!$this->getNextPage())
+        if (!$this->getNextPage())
         {
             return null;
         }
@@ -230,7 +230,7 @@ 
      */
     public function getPrevCall()
     {
-        if(!$this->getPrevPage())
+        if (!$this->getPrevPage())
         {
             return null;
         }
@@ -258,14 +258,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);
             }
@@ -273,11 +273,11 @@ 
         else
         {
             // Determine the sliding range, centered around the current page.
-            $numAdjacents = (int) floor(($this->maxPagesToShow - 4) / 2);
+            $numAdjacents = (int)floor(($this->maxPagesToShow - 4) / 2);
 
             $slidingStart = 1;
             $slidingEndOffset = $numAdjacents + 3 - $this->currentPage;
-            if($slidingEndOffset < 0)
+            if ($slidingEndOffset < 0)
             {
                 $slidingStart = $this->currentPage - $numAdjacents;
                 $slidingEndOffset = 0;
@@ -285,23 +285,23 @@ 
 
             $slidingEnd = $this->numPages;
             $slidingStartOffset = $this->currentPage + $numAdjacents + 2 - $this->numPages;
-            if($slidingStartOffset < 0)
+            if ($slidingStartOffset < 0)
             {
                 $slidingEnd = $this->currentPage + $numAdjacents;
                 $slidingStartOffset = 0;
             }
 
             // Build the list of pages.
-            if($slidingStart > 1)
+            if ($slidingStart > 1)
             {
                 $pages[] = $this->createPage(1);
                 $pages[] = $this->createPageEllipsis();
             }
-            for($i = $slidingStart - $slidingStartOffset; $i <= $slidingEnd + $slidingEndOffset; $i++)
+            for ($i = $slidingStart - $slidingStartOffset; $i <= $slidingEnd + $slidingEndOffset; $i++)
             {
                 $pages[] = $this->createPage($i);
             }
-            if($slidingEnd < $this->numPages)
+            if ($slidingEnd < $this->numPages)
             {
                 $pages[] = $this->createPageEllipsis();
                 $pages[] = $this->createPage($this->numPages);
@@ -344,7 +344,7 @@ 
     {
         $first = ($this->currentPage - 1) * $this->itemsPerPage + 1;
 
-        if($first > $this->totalItems)
+        if ($first > $this->totalItems)
         {
             return null;
         }
@@ -355,13 +355,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;
         }
@@ -398,7 +398,7 @@ 
      */
     public function render()
     {
-        if($this->getNumPages() <= 1)
+        if ($this->getNumPages() <= 1)
         {
             return '';
         }

Braces +1 added lines, -2 removed lines

@@ -269,8 +269,7 @@
             {
                 $pages[] = $this->createPage($i);
             }
-        }
-        else
+        } else
         {
             // Determine the sliding range, centered around the current page.
             $numAdjacents = (int) floor(($this->maxPagesToShow - 4) / 2);

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

templates/plugins/includes.js.php

Spacing +1 added lines, -1 removed lines

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

src/Utils/Translation/Translator.php

Indentation +1 added lines, -1 removed lines

@@ -121,7 +121,7 @@
         }
         if(!array_key_exists($sLanguage, $this->aTranslations) || !array_key_exists($sText, $this->aTranslations[$sLanguage]))
         {
-           return $sText;
+            return $sText;
         }
         $message = $this->aTranslations[$sLanguage][$sText];
         foreach($aPlaceHolders as $name => $value)

Braces +1 added lines, -2 removed lines

@@ -63,8 +63,7 @@
             {
                 // Save this translation
                 $this->aTranslations[$sLanguage][$sName] = $xTranslation;
-            }
-            else
+            } else
             {
                 // Recursively read the translations in the array
                 $this->_loadTranslations($sLanguage, $sName, $xTranslation);

Spacing +9 added lines, -9 removed lines

@@ -55,11 +55,11 @@ 
      */
     private function _loadTranslations($sLanguage, $sPrefix, array $aTranslations)
     {
-        foreach($aTranslations as $sName => $xTranslation)
+        foreach ($aTranslations as $sName => $xTranslation)
         {
             $sName = trim($sName);
             $sName = ($sPrefix) ? $sPrefix . '.' . $sName : $sName;
-            if(!is_array($xTranslation))
+            if (!is_array($xTranslation))
             {
                 // Save this translation
                 $this->aTranslations[$sLanguage][$sName] = $xTranslation;
@@ -82,17 +82,17 @@ 
      */
     public function loadTranslations($sFilePath, $sLanguage)
     {
-        if(!file_exists($sFilePath))
+        if (!file_exists($sFilePath))
         {
             return;
         }
         $aTranslations = require($sFilePath);
-        if(!is_array($aTranslations))
+        if (!is_array($aTranslations))
         {
             return;
         }
         // Load the translations
-        if(!array_key_exists($sLanguage, $this->aTranslations))
+        if (!array_key_exists($sLanguage, $this->aTranslations))
         {
             $this->aTranslations[$sLanguage] = [];
         }
@@ -111,20 +111,20 @@ 
     public function trans($sText, array $aPlaceHolders = [], $sLanguage = null)
     {
         $sText = trim((string)$sText);
-        if(!$sLanguage)
+        if (!$sLanguage)
         {
             $sLanguage = $this->xConfig->getOption('language');
         }
-        if(!$sLanguage)
+        if (!$sLanguage)
         {
             $sLanguage = $this->sDefaultLocale;
         }
-        if(!array_key_exists($sLanguage, $this->aTranslations) || !array_key_exists($sText, $this->aTranslations[$sLanguage]))
+        if (!array_key_exists($sLanguage, $this->aTranslations) || !array_key_exists($sText, $this->aTranslations[$sLanguage]))
         {
            return $sText;
         }
         $message = $this->aTranslations[$sLanguage][$sText];
-        foreach($aPlaceHolders as $name => $value)
+        foreach ($aPlaceHolders as $name => $value)
         {
             $message = str_replace(':' . $name, $value, $message);
         }

src/Request/Plugin/FileUpload.php

Indentation +1 added lines, -1 removed lines

@@ -217,7 +217,7 @@
             $aFiles[$sVarName] = [];
             foreach($aUserFiles as $aUserFile)
             {
-                 $aFiles[$sVarName][] = $aUserFile->toTempData();
+                    $aFiles[$sVarName][] = $aUserFile->toTempData();
             }
         }
         // Save upload data in a temp file

Unused Use Statements -1 removed lines

@@ -16,7 +16,6 @@
 use Jaxon\Plugin\Request as RequestPlugin;
 use Jaxon\Request\Support\UploadedFile;
 use Jaxon\Response\UploadResponse;
-
 use Exception;
 use Closure;
 

Braces +4 added lines, -8 removed lines

@@ -71,8 +71,7 @@ 
         if(array_key_exists('jxnupl', $_POST))
         {
             $this->sTempFile = $_POST['jxnupl'];
-        }
-        elseif(array_key_exists('jxnupl', $_GET))
+        } elseif(array_key_exists('jxnupl', $_GET))
         {
             $this->sTempFile = $_GET['jxnupl'];
         }
@@ -212,8 +211,7 @@ 
                         'extension' => pathinfo($aFile['name'][$i], PATHINFO_EXTENSION),
                     ];
                 }
-            }
-            else
+            } else
             {
                 if(!$aFile['name'])
                 {
@@ -420,15 +418,13 @@ 
                 {
                     $this->saveToTempFile();
                     $xResponse->setUploadedFile($this->sTempFile);
-                }
-                catch(Exception $e)
+                } catch(Exception $e)
                 {
                     $xResponse->setErrorMessage($e->getMessage());
                 }
                 jaxon()->di()->getResponseManager()->append($xResponse);
             }
-        }
-        elseif(($this->sTempFile))
+        } elseif(($this->sTempFile))
         {
             // Ajax request following and HTTP upload
             $this->readFromTempFile();

Spacing +29 added lines, -29 removed lines

@@ -68,11 +68,11 @@ 
     {
         $this->sUploadSubdir = uniqid() . DIRECTORY_SEPARATOR;
 
-        if(array_key_exists('jxnupl', $_POST))
+        if (array_key_exists('jxnupl', $_POST))
         {
             $this->sTempFile = $_POST['jxnupl'];
         }
-        elseif(array_key_exists('jxnupl', $_GET))
+        elseif (array_key_exists('jxnupl', $_GET))
         {
             $this->sTempFile = $_GET['jxnupl'];
         }
@@ -100,7 +100,7 @@ 
      */
     protected function filterFilename($sFilename, $sVarName)
     {
-        if(($this->cFileFilter))
+        if (($this->cFileFilter))
         {
             $cFileFilter = $this->cFileFilter;
             $sFilename = (string)$cFileFilter($sFilename, $sVarName);
@@ -120,12 +120,12 @@ 
     {
         $sUploadDir = rtrim(trim($sUploadDir), '/\\') . DIRECTORY_SEPARATOR;
         // Verify that the upload dir exists and is writable
-        if(!is_writable($sUploadDir))
+        if (!is_writable($sUploadDir))
         {
             throw new \Jaxon\Exception\Error($this->trans('errors.upload.access'));
         }
         $sUploadDir .= $sUploadSubDir;
-        if(!file_exists($sUploadDir) && !@mkdir($sUploadDir))
+        if (!file_exists($sUploadDir) && !@mkdir($sUploadDir))
         {
             throw new \Jaxon\Exception\Error($this->trans('errors.upload.access'));
         }
@@ -172,7 +172,7 @@ 
         $sUploadDir = rtrim(trim($sUploadDir), '/\\') . DIRECTORY_SEPARATOR;
         $sUploadDir .= 'tmp' . DIRECTORY_SEPARATOR;
         $sUploadTempFile = $sUploadDir . $this->sTempFile . '.json';
-        if(!is_readable($sUploadTempFile))
+        if (!is_readable($sUploadTempFile))
         {
             throw new \Jaxon\Exception\Error($this->trans('errors.upload.access'));
         }
@@ -188,18 +188,18 @@ 
     {
         // Check validity of the uploaded files
         $aTempFiles = [];
-        foreach($_FILES as $sVarName => $aFile)
+        foreach ($_FILES as $sVarName => $aFile)
         {
-            if(is_array($aFile['name']))
+            if (is_array($aFile['name']))
             {
                 $nFileCount = count($aFile['name']);
-                for($i = 0; $i < $nFileCount; $i++)
+                for ($i = 0; $i < $nFileCount; $i++)
                 {
-                    if(!$aFile['name'][$i])
+                    if (!$aFile['name'][$i])
                     {
                         continue;
                     }
-                    if(!array_key_exists($sVarName, $aTempFiles))
+                    if (!array_key_exists($sVarName, $aTempFiles))
                     {
                         $aTempFiles[$sVarName] = [];
                     }
@@ -219,11 +219,11 @@ 
             }
             else
             {
-                if(!$aFile['name'])
+                if (!$aFile['name'])
                 {
                     continue;
                 }
-                if(!array_key_exists($sVarName, $aTempFiles))
+                if (!array_key_exists($sVarName, $aTempFiles))
                 {
                     $aTempFiles[$sVarName] = [];
                 }
@@ -243,17 +243,17 @@ 
         }
 
         // Check uploaded files validity
-        foreach($aTempFiles as $sVarName => $aFiles)
+        foreach ($aTempFiles as $sVarName => $aFiles)
         {
-            foreach($aFiles as $aFile)
+            foreach ($aFiles as $aFile)
             {
                 // Verify upload result
-                if($aFile['error'] != 0)
+                if ($aFile['error'] != 0)
                 {
                     throw new \Jaxon\Exception\Error($this->trans('errors.upload.failed', $aFile));
                 }
                 // Verify file validity (format, size)
-                if(!$this->validateUploadedFile($sVarName, $aFile))
+                if (!$this->validateUploadedFile($sVarName, $aFile))
                 {
                     throw new \Jaxon\Exception\Error($this->getValidatorMessage());
                 }
@@ -263,10 +263,10 @@ 
         }
 
         // Copy the uploaded files from the temp dir to the user dir
-        foreach($aTempFiles as $sVarName => $_aTempFiles)
+        foreach ($aTempFiles as $sVarName => $_aTempFiles)
         {
             $this->aUserFiles[$sVarName] = [];
-            foreach($_aTempFiles as $aFile)
+            foreach ($_aTempFiles as $aFile)
             {
                 // Get the path to the upload dir
                 $sUploadDir = $this->getUploadDir($sVarName);
@@ -288,10 +288,10 @@ 
     {
         // Convert uploaded file to an array
         $aFiles = [];
-        foreach($this->aUserFiles as $sVarName => $aUserFiles)
+        foreach ($this->aUserFiles as $sVarName => $aUserFiles)
         {
             $aFiles[$sVarName] = [];
-            foreach($aUserFiles as $aUserFile)
+            foreach ($aUserFiles as $aUserFile)
             {
                  $aFiles[$sVarName][] = $aUserFile->toTempData();
             }
@@ -312,10 +312,10 @@ 
         // Upload temp file
         $sUploadTempFile = $this->getUploadTempFile();
         $aFiles = json_decode(file_get_contents($sUploadTempFile), true);
-        foreach($aFiles as $sVarName => $aUserFiles)
+        foreach ($aFiles as $sVarName => $aUserFiles)
         {
             $this->aUserFiles[$sVarName] = [];
-            foreach($aUserFiles as $aUserFile)
+            foreach ($aUserFiles as $aUserFile)
             {
                 $this->aUserFiles[$sVarName][] = UploadedFile::fromTempData($aUserFile);
             }
@@ -382,7 +382,7 @@ 
      */
     public function noRequestPluginFound()
     {
-        if(count($_FILES) > 0)
+        if (count($_FILES) > 0)
         {
             $this->bRequestIsHttpUpload = true;
         }
@@ -405,17 +405,17 @@ 
      */
     public function processRequest()
     {
-        if(!$this->canProcessRequest())
+        if (!$this->canProcessRequest())
         {
             return false;
         }
 
-        if(count($_FILES) > 0)
+        if (count($_FILES) > 0)
         {
             // Ajax request with upload
             $this->readFromHttpData();
 
-            if($this->bRequestIsHttpUpload)
+            if ($this->bRequestIsHttpUpload)
             {
                 // Process an HTTP upload request
                 // This requires to set the response to be returned.
@@ -425,14 +425,14 @@ 
                     $this->saveToTempFile();
                     $xResponse->setUploadedFile($this->sTempFile);
                 }
-                catch(Exception $e)
+                catch (Exception $e)
                 {
                     $xResponse->setErrorMessage($e->getMessage());
                 }
                 jaxon()->di()->getResponseManager()->append($xResponse);
             }
         }
-        elseif(($this->sTempFile))
+        elseif (($this->sTempFile))
         {
             // Ajax request following and HTTP upload
             $this->readFromTempFile();