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/Validation/Validator.php

Spacing +4 added lines, -4 removed lines

@@ -129,7 +129,7 @@ 
         // Verify the file extension
         $xDefault = $this->xConfig->getOption('upload.default.types');
         $aAllowed = $this->xConfig->getOption('upload.files.' . $sName . '.types', $xDefault);
-        if(is_array($aAllowed) && !in_array($aUploadedFile['type'], $aAllowed))
+        if (is_array($aAllowed) && !in_array($aUploadedFile['type'], $aAllowed))
         {
             $this->sErrorMessage = $this->xTranslator->trans('errors.upload.type', $aUploadedFile);
             return false;
@@ -137,7 +137,7 @@ 
         // Verify the file extension
         $xDefault = $this->xConfig->getOption('upload.default.extensions');
         $aAllowed = $this->xConfig->getOption('upload.files.' . $sName . '.extensions', $xDefault);
-        if(is_array($aAllowed) && !in_array($aUploadedFile['extension'], $aAllowed))
+        if (is_array($aAllowed) && !in_array($aUploadedFile['extension'], $aAllowed))
         {
             $this->sErrorMessage = $this->xTranslator->trans('errors.upload.extension', $aUploadedFile);
             return false;
@@ -145,7 +145,7 @@ 
         // Verify the max size
         $xDefault = $this->xConfig->getOption('upload.default.max-size', 0);
         $iSize = $this->xConfig->getOption('upload.files.' . $sName . '.max-size', $xDefault);
-        if($iSize > 0 && $aUploadedFile['size'] > $iSize)
+        if ($iSize > 0 && $aUploadedFile['size'] > $iSize)
         {
             $this->sErrorMessage = $this->xTranslator->trans('errors.upload.max-size', $aUploadedFile);
             return false;
@@ -153,7 +153,7 @@ 
         // Verify the min size
         $xDefault = $this->xConfig->getOption('upload.default.min-size', 0);
         $iSize = $this->xConfig->getOption('upload.files.' . $sName . '.min-size', $xDefault);
-        if($iSize > 0 && $aUploadedFile['size'] < $iSize)
+        if ($iSize > 0 && $aUploadedFile['size'] < $iSize)
         {
             $this->sErrorMessage = $this->xTranslator->trans('errors.upload.min-size', $aUploadedFile);
             return false;

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