jaxon-php / jaxon-core

src/Traits/Upload.php

Spacing +7 added lines, -7 removed lines

@@ -36,7 +36,7 @@ 
      */
     public function hasUploadedFiles()
     {
-        if(($xUploadPlugin = $this->getPluginManager()->getRequestPlugin(self::FILE_UPLOAD)) == null)
+        if (($xUploadPlugin = $this->getPluginManager()->getRequestPlugin(self::FILE_UPLOAD)) == null)
         {
             return false;
         }
@@ -52,11 +52,11 @@ 
     {
         try
         {
-            if(($xUploadPlugin = $this->getPluginManager()->getRequestPlugin(self::FILE_UPLOAD)) == null)
+            if (($xUploadPlugin = $this->getPluginManager()->getRequestPlugin(self::FILE_UPLOAD)) == null)
             {
                 throw new Exception($this->trans('errors.upload.plugin'));
             }
-            elseif(!$xUploadPlugin->canProcessRequest())
+            elseif (!$xUploadPlugin->canProcessRequest())
             {
                 throw new Exception($this->trans('errors.upload.request'));
             }
@@ -65,14 +65,14 @@ 
             $sResponse = '{"code": "success", "upl": "' . $sKey . '"}';
             $return = true;
         }
-        catch(Exception $e)
+        catch (Exception $e)
         {
             $sResponse = '{"code": "error", "msg": "' . addslashes($e->getMessage()) . '"}';
             $return = false;
         }
         // Send the response back to the browser
         echo '<script>var res = ', $sResponse, '; </script>';
-        if(($this->getOption('core.process.exit')))
+        if (($this->getOption('core.process.exit')))
         {
             exit();
         }
@@ -86,7 +86,7 @@ 
      */
     public function getUploadedFiles()
     {
-        if(($xUploadPlugin = $this->getPluginManager()->getRequestPlugin(self::FILE_UPLOAD)) == null)
+        if (($xUploadPlugin = $this->getPluginManager()->getRequestPlugin(self::FILE_UPLOAD)) == null)
         {
             return [];
         }
@@ -102,7 +102,7 @@ 
      */
     public function setUploadFileFilter(Closure $fFileFilter)
     {
-        if(($xUploadPlugin = $this->getPluginManager()->getRequestPlugin(self::FILE_UPLOAD)) == null)
+        if (($xUploadPlugin = $this->getPluginManager()->getRequestPlugin(self::FILE_UPLOAD)) == null)
         {
             return;
         }

Braces +2 added lines, -4 removed lines

@@ -55,8 +55,7 @@ 
             if(($xUploadPlugin = $this->getPluginManager()->getRequestPlugin(self::FILE_UPLOAD)) == null)
             {
                 throw new Exception($this->trans('errors.upload.plugin'));
-            }
-            elseif(!$xUploadPlugin->canProcessRequest())
+            } elseif(!$xUploadPlugin->canProcessRequest())
             {
                 throw new Exception($this->trans('errors.upload.request'));
             }
@@ -64,8 +63,7 @@ 
             $sKey = $xUploadPlugin->saveUploadedFiles();
             $sResponse = '{"code": "success", "upl": "' . $sKey . '"}';
             $return = true;
-        }
-        catch(Exception $e)
+        } catch(Exception $e)
         {
             $sResponse = '{"code": "error", "msg": "' . addslashes($e->getMessage()) . '"}';
             $return = false;

src/Response/Plugin/JQuery/Dom/Element.php

Spacing +3 added lines, -3 removed lines

@@ -58,11 +58,11 @@ 
         $this->aCalls = [];
 
         $jQueryNs = jaxon()->getOption('core.jquery.no_conflict', false) ? 'jQuery' : '$';
-        if(!$sSelector)
+        if (!$sSelector)
         {
             $this->sSelector = "$jQueryNs(this)"; // If an empty selector is given, use javascript "this" instead
         }
-        elseif(($sContext))
+        elseif (($sContext))
         {
             $this->sSelector = "$jQueryNs('" . $sSelector . "', $jQueryNs('" . $sContext . "'))";
         }
@@ -118,7 +118,7 @@ 
      */
     public function getScript()
     {
-        if(count($this->aCalls) == 0)
+        if (count($this->aCalls) == 0)
         {
             return $this->sSelector;
         }

Braces +2 added lines, -4 removed lines

@@ -57,12 +57,10 @@
         if(!$sSelector)
         {
             $this->sSelector = "$jQueryNs(this)"; // If an empty selector is given, use javascript "this" instead
-        }
-        elseif(($sContext))
+        } elseif(($sContext))
         {
             $this->sSelector = "$jQueryNs('" . $sSelector . "', $jQueryNs('" . $sContext . "'))";
-        }
-        else
+        } else
         {
             $this->sSelector = "$jQueryNs('" . $sSelector . "')";
         }

src/Utils/Template/Renderer.php

Spacing +1 added lines, -1 removed lines

@@ -27,7 +27,7 @@
     public function render($sPath, array $aVars = [])
     {
         // Make the template vars available as attributes
-        foreach($aVars as $sName => $xValue)
+        foreach ($aVars as $sName => $xValue)
         {
             $sName = (string)$sName;
             $this->$sName = $xValue;

src/Factory/Request.php

Doc Comments +2 added lines, -5 removed lines

@@ -35,7 +35,7 @@ 
      *
      * @param string|null            $sClass              The callable class
      *
-     * @return Factory
+     * @return Request
      */
     public function setClassName($sClass)
     {
@@ -58,7 +58,7 @@ 
      *
      * @param CallableObject          $xCallable              The callable object
      *
-     * @return Factory
+     * @return Request
      */
     public function setCallable(CallableObject $xCallable)
     {
@@ -71,7 +71,6 @@ 
      * Return the javascript call to a Jaxon function or object method
      *
      * @param string            $sFunction          The function or method (without class) name
-     * @param ...               $xParams            The parameters of the function or method
      *
      * @return \Jaxon\Request\Request
      */
@@ -100,7 +99,6 @@ 
      * Return the javascript call to a generic function
      *
      * @param string            $sFunction          The function or method (with class) name
-     * @param ...               $xParams            The parameters of the function or method
      *
      * @return \Jaxon\Request\Request
      */
@@ -124,7 +122,6 @@ 
      * @param integer       $nItemsPerPage          The number of items per page page
      * @param integer       $nCurrentPage           The current page
      * @param string        $sMethod                The name of function or a method prepended with its class name
-     * @param ...           $xParams                The parameters of the function or method
      *
      * @return string the pagination links
      */

Spacing +3 added lines, -3 removed lines

@@ -61,12 +61,12 @@ 
         $this->sPrefix = $this->getOption('core.prefix.function');
 
         $sClass = trim($sClass, '.\\ ');
-        if(!$sClass)
+        if (!$sClass)
         {
             return $this;
         }
 
-        if(!($xCallable = $this->xRepository->getCallableObject($sClass)))
+        if (!($xCallable = $this->xRepository->getCallableObject($sClass)))
         {
             // Todo: decide which of these values to return
             // return null;
@@ -107,7 +107,7 @@ 
         array_shift($aArguments);
 
         // Makes legacy code works
-        if(strpos($sFunction, '.') !== false)
+        if (strpos($sFunction, '.') !== false)
         {
             // If there is a dot in the name, then it is a call to a class
             $this->sPrefix = $this->getOption('core.prefix.class');

src/Request/Plugin/UserFunction.php

Doc Comments +1 added lines, -1 removed lines

@@ -78,7 +78,7 @@
      * @param string        $sUserFunction  The name of the function being registered
      * @param array|string  $aOptions       The associated options
      *
-     * @return \Jaxon\Request\Request
+     * @return boolean
      */
     public function register($sType, $sUserFunction, $aOptions)
     {

Spacing +15 added lines, -15 removed lines

@@ -45,11 +45,11 @@ 
 
     public function __construct()
     {
-        if(isset($_GET['jxnfun']))
+        if (isset($_GET['jxnfun']))
         {
             $this->sRequestedFunction = $_GET['jxnfun'];
         }
-        if(isset($_POST['jxnfun']))
+        if (isset($_POST['jxnfun']))
         {
             $this->sRequestedFunction = $_POST['jxnfun'];
         }
@@ -76,30 +76,30 @@ 
      */
     public function register($sType, $sUserFunction, $aOptions)
     {
-        if($sType != $this->getName())
+        if ($sType != $this->getName())
         {
             return false;
         }
 
-        if(!is_string($sUserFunction))
+        if (!is_string($sUserFunction))
         {
             throw new \Jaxon\Exception\Error($this->trans('errors.functions.invalid-declaration'));
         }
 
-        if(is_string($aOptions))
+        if (is_string($aOptions))
         {
             $aOptions = ['include' => $aOptions];
         }
-        if(!is_array($aOptions))
+        if (!is_array($aOptions))
         {
             throw new \Jaxon\Exception\Error($this->trans('errors.functions.invalid-declaration'));
         }
 
         // Check if an alias is defined
         $sFunctionName = $sUserFunction;
-        foreach($aOptions as $sName => $sValue)
+        foreach ($aOptions as $sName => $sValue)
         {
-            if($sName == 'alias')
+            if ($sName == 'alias')
             {
                 $sFunctionName = $sValue;
                 break;
@@ -107,11 +107,11 @@ 
         }
 
         $this->aFunctions[$sFunctionName] = $aOptions;
-        jaxon()->di()->set($sFunctionName, function () use ($sFunctionName, $sUserFunction) {
+        jaxon()->di()->set($sFunctionName, function() use ($sFunctionName, $sUserFunction) {
             $xUserFunction = new \Jaxon\Request\Support\UserFunction($sUserFunction);
 
             $aOptions = $this->aFunctions[$sFunctionName];
-            foreach($aOptions as $sName => $sValue)
+            foreach ($aOptions as $sName => $sValue)
             {
                 $xUserFunction->configure($sName, $sValue);
             }
@@ -141,7 +141,7 @@ 
     {
         $di = jaxon()->di();
         $code = '';
-        foreach(array_keys($this->aFunctions) as $sName)
+        foreach (array_keys($this->aFunctions) as $sName)
         {
             $xFunction = $di->get($sName);
             $code .= $xFunction->getScript();
@@ -157,7 +157,7 @@ 
     public function canProcessRequest()
     {
         // Check the validity of the function name
-        if(($this->sRequestedFunction) && !$this->validateFunction($this->sRequestedFunction))
+        if (($this->sRequestedFunction) && !$this->validateFunction($this->sRequestedFunction))
         {
             $this->sRequestedFunction = null;
         }
@@ -171,13 +171,13 @@ 
      */
     public function processRequest()
     {
-        if(!$this->canProcessRequest())
+        if (!$this->canProcessRequest())
         {
             return false;
         }
 
         // Security check: make sure the requested function was registered.
-        if(!key_exists($this->sRequestedFunction, $this->aFunctions))
+        if (!key_exists($this->sRequestedFunction, $this->aFunctions))
         {
             // Unable to find the requested function
             throw new \Jaxon\Exception\Error($this->trans('errors.functions.invalid',
@@ -188,7 +188,7 @@ 
         $jaxon = jaxon();
         $aArgs = $jaxon->getRequestHandler()->processArguments();
         $xResponse = $xFunction->call($aArgs);
-        if(($xResponse))
+        if (($xResponse))
         {
             $jaxon->getResponseManager()->append($xResponse);
         }

src/Request/Support/CallableObject.php

Braces +2 added lines, -4 removed lines

@@ -134,8 +134,7 @@ 
             if(is_array($sValue))
             {
                 $this->aProtectedMethods = array_merge($this->aProtectedMethods, $sValue);
-            }
-            elseif(is_string($sValue))
+            } elseif(is_string($sValue))
             {
                 $this->aProtectedMethods[] = $sValue;
             }
@@ -192,8 +191,7 @@ 
                     $parameterInstances[] = $di->get($parameter->getClass()->getName());
                 }
                 $this->registeredObject = $this->reflectionClass->newInstanceArgs($parameterInstances);
-            }
-            else
+            } else
             {
                 $this->registeredObject = $this->reflectionClass->newInstance();
             }

Spacing +11 added lines, -11 removed lines

@@ -120,22 +120,22 @@ 
      */
     public function configure($sName, $sValue)
     {
-        switch($sName)
+        switch ($sName)
         {
         // Set the separator
         case 'separator':
-            if($sValue == '_' || $sValue == '.')
+            if ($sValue == '_' || $sValue == '.')
             {
                 $this->separator = $sValue;
             }
             break;
         // Set the protected methods
         case 'protected':
-            if(is_array($sValue))
+            if (is_array($sValue))
             {
                 $this->aProtectedMethods = array_merge($this->aProtectedMethods, $sValue);
             }
-            elseif(is_string($sValue))
+            elseif (is_string($sValue))
             {
                 $this->aProtectedMethods[] = $sValue;
             }
@@ -153,16 +153,16 @@ 
     public function getMethods()
     {
         $aMethods = [];
-        foreach($this->reflectionClass->getMethods(\ReflectionMethod::IS_PUBLIC) as $xMethod)
+        foreach ($this->reflectionClass->getMethods(\ReflectionMethod::IS_PUBLIC) as $xMethod)
         {
             $sMethodName = $xMethod->getShortName();
             // Don't take magic __call, __construct, __destruct methods
-            if(strlen($sMethodName) > 2 && substr($sMethodName, 0, 2) == '__')
+            if (strlen($sMethodName) > 2 && substr($sMethodName, 0, 2) == '__')
             {
                 continue;
             }
             // Don't take excluded methods
-            if(in_array($sMethodName, $this->aProtectedMethods))
+            if (in_array($sMethodName, $this->aProtectedMethods))
             {
                 continue;
             }
@@ -178,15 +178,15 @@ 
      */
     public function getRegisteredObject()
     {
-        if($this->registeredObject == null)
+        if ($this->registeredObject == null)
         {
             $di = jaxon()->di();
             // Use the Reflection class to get the parameters of the constructor
-            if(($constructor = $this->reflectionClass->getConstructor()) != null)
+            if (($constructor = $this->reflectionClass->getConstructor()) != null)
             {
                 $parameters = $constructor->getParameters();
                 $parameterInstances = [];
-                foreach($parameters as $parameter)
+                foreach ($parameters as $parameter)
                 {
                     // Get the parameter instance from the DI
                     $parameterInstances[] = $di->get($parameter->getClass()->getName());
@@ -223,7 +223,7 @@ 
      */
     public function call($sMethod, $aArgs)
     {
-        if(!$this->hasMethod($sMethod))
+        if (!$this->hasMethod($sMethod))
         {
             return;
         }

src/Request/Support/CallableRepository.php

Braces +1 added lines, -2 removed lines

@@ -243,8 +243,7 @@
             if($sName == 'separator' || $sName == 'protected')
             {
                 $xCallableObject->configure($sName, $xValue);
-            }
-            elseif(is_array($xValue) && $sName != 'include')
+            } elseif(is_array($xValue) && $sName != 'include')
             {
                 // These options are to be included in javascript code.
                 $this->aCallableOptions[$sClassName][$sName] = $xValue;

Spacing +34 added lines, -34 removed lines

@@ -88,19 +88,19 @@ 
     private function getClassOptions($sClassName, array $aDirectoryOptions, array $aDefaultOptions = [])
     {
         $aOptions = $aDefaultOptions;
-        if(key_exists('separator', $aDirectoryOptions))
+        if (key_exists('separator', $aDirectoryOptions))
         {
             $aOptions['separator'] = $aDirectoryOptions['separator'];
         }
-        if(key_exists('protected', $aDirectoryOptions))
+        if (key_exists('protected', $aDirectoryOptions))
         {
             $aOptions['protected'] = $aDirectoryOptions['protected'];
         }
-        if(key_exists('*', $aDirectoryOptions))
+        if (key_exists('*', $aDirectoryOptions))
         {
             $aOptions = array_merge($aOptions, $aDirectoryOptions['*']);
         }
-        if(key_exists($sClassName, $aDirectoryOptions))
+        if (key_exists($sClassName, $aDirectoryOptions))
         {
             $aOptions = array_merge($aOptions, $aDirectoryOptions[$sClassName]);
         }
@@ -120,17 +120,17 @@ 
         $itDir = new RecursiveDirectoryIterator($sDirectory);
         $itFile = new RecursiveIteratorIterator($itDir);
         // Iterate on dir content
-        foreach($itFile as $xFile)
+        foreach ($itFile as $xFile)
         {
             // skip everything except PHP files
-            if(!$xFile->isFile() || $xFile->getExtension() != 'php')
+            if (!$xFile->isFile() || $xFile->getExtension() != 'php')
             {
                 continue;
             }
 
             $aClassOptions = [];
             // No more classmap autoloading. The file will be included when needed.
-            if(($aOptions['autoload']))
+            if (($aOptions['autoload']))
             {
                 $aClassOptions['include'] = $xFile->getPathname();
             }
@@ -162,7 +162,7 @@ 
      */
     private function getOptionsFromClass($sClassName)
     {
-        if(!key_exists($sClassName, $this->aClassOptions))
+        if (!key_exists($sClassName, $this->aClassOptions))
         {
             return null; // Class not registered
         }
@@ -180,15 +180,15 @@ 
     {
         // Find the corresponding namespace
         $sNamespace = null;
-        foreach(array_keys($this->aNamespaceOptions) as $_sNamespace)
+        foreach (array_keys($this->aNamespaceOptions) as $_sNamespace)
         {
-            if(substr($sClassName, 0, strlen($_sNamespace) + 1) == $_sNamespace . '\\')
+            if (substr($sClassName, 0, strlen($_sNamespace) + 1) == $_sNamespace . '\\')
             {
                 $sNamespace = $_sNamespace;
                 break;
             }
         }
-        if($sNamespace == null)
+        if ($sNamespace == null)
         {
             return null; // Class not registered
         }
@@ -210,27 +210,27 @@ 
         // at the beginning and the end of the class name.
         $sClassName = trim(str_replace(['.', '_'], ['\\', '\\'], (string)$sClassName), '\\');
 
-        if(key_exists($sClassName, $this->aCallableObjects))
+        if (key_exists($sClassName, $this->aCallableObjects))
         {
             return $this->aCallableObjects[$sClassName];
         }
 
         $aOptions = $this->getOptionsFromClass($sClassName);
-        if($aOptions === null)
+        if ($aOptions === null)
         {
             $aOptions = $this->getOptionsFromNamespace($sClassName);
         }
-        if($aOptions === null)
+        if ($aOptions === null)
         {
             return null;
         }
 
         // Make sure the registered class exists
-        if(key_exists('include', $aOptions))
+        if (key_exists('include', $aOptions))
         {
             require_once($aOptions['include']);
         }
-        if(!class_exists('\\' . $sClassName))
+        if (!class_exists('\\' . $sClassName))
         {
             return null;
         }
@@ -238,13 +238,13 @@ 
         // Create the callable object
         $xCallableObject = new \Jaxon\Request\Support\CallableObject($sClassName);
         $this->aCallableOptions[$sClassName] = [];
-        foreach($aOptions as $sName => $xValue)
+        foreach ($aOptions as $sName => $xValue)
         {
-            if($sName == 'separator' || $sName == 'protected')
+            if ($sName == 'separator' || $sName == 'protected')
             {
                 $xCallableObject->configure($sName, $xValue);
             }
-            elseif(is_array($xValue) && $sName != 'include')
+            elseif (is_array($xValue) && $sName != 'include')
             {
                 // These options are to be included in javascript code.
                 $this->aCallableOptions[$sClassName][$sName] = $xValue;
@@ -253,12 +253,12 @@ 
         $this->aCallableObjects[$sClassName] = $xCallableObject;
 
         // Register the request factory for this callable object
-        jaxon()->di()->set($sClassName . '_Factory_Rq', function () use ($sClassName) {
+        jaxon()->di()->set($sClassName . '_Factory_Rq', function() use ($sClassName) {
             $xCallableObject = $this->aCallableObjects[$sClassName];
             return new \Jaxon\Factory\Request\Portable($xCallableObject);
         });
         // Register the paginator factory for this callable object
-        jaxon()->di()->set($sClassName . '_Factory_Pg', function () use ($sClassName) {
+        jaxon()->di()->set($sClassName . '_Factory_Pg', function() use ($sClassName) {
             $xCallableObject = $this->aCallableObjects[$sClassName];
             return new \Jaxon\Factory\Request\Paginator($xCallableObject);
         });
@@ -274,16 +274,16 @@ 
     private function createCallableObjects()
     {
         // Create callable objects for registered classes
-        foreach(array_keys($this->aClassOptions) as $sClassName)
+        foreach (array_keys($this->aClassOptions) as $sClassName)
         {
             $this->getCallableObject($sClassName);
         }
 
         // Create callable objects for registered namespaces
         $sDS = DIRECTORY_SEPARATOR;
-        foreach($this->aNamespaceOptions as $sNamespace => $aOptions)
+        foreach ($this->aNamespaceOptions as $sNamespace => $aOptions)
         {
-            if(key_exists($sNamespace, $this->aNamespaces))
+            if (key_exists($sNamespace, $this->aNamespaces))
             {
                 continue;
             }
@@ -294,10 +294,10 @@ 
             $sDirectory = $aOptions['directory'];
             $itDir = new RecursiveDirectoryIterator($sDirectory);
             $itFile = new RecursiveIteratorIterator($itDir);
-            foreach($itFile as $xFile)
+            foreach ($itFile as $xFile)
             {
                 // skip everything except PHP files
-                if(!$xFile->isFile() || $xFile->getExtension() != 'php')
+                if (!$xFile->isFile() || $xFile->getExtension() != 'php')
                 {
                     continue;
                 }
@@ -306,7 +306,7 @@ 
                 $sClassPath = $sNamespace;
                 $sRelativePath = substr($xFile->getPath(), strlen($sDirectory));
                 $sRelativePath = trim(str_replace($sDS, '\\', $sRelativePath), '\\');
-                if($sRelativePath != '')
+                if ($sRelativePath != '')
                 {
                     $sClassPath .= '\\' . $sRelativePath;
                 }
@@ -342,11 +342,11 @@ 
         $this->createCallableObjects();
 
         $sHash = '';
-        foreach($this->aNamespaces as $sNamespace => $aOptions)
+        foreach ($this->aNamespaces as $sNamespace => $aOptions)
         {
             $sHash .= $sNamespace . $aOptions['separator'];
         }
-        foreach($this->aCallableObjects as $sClassName => $xCallableObject)
+        foreach ($this->aCallableObjects as $sClassName => $xCallableObject)
         {
             $sHash .= $sClassName . implode('|', $xCallableObject->getMethods());
         }
@@ -367,16 +367,16 @@ 
 
         $aJsClasses = [];
         $sCode = '';
-        foreach(array_keys($this->aNamespaces) as $sNamespace)
+        foreach (array_keys($this->aNamespaces) as $sNamespace)
         {
             $offset = 0;
             $sJsNamespace = str_replace('\\', '.', $sNamespace);
             $sJsNamespace .= '.Null'; // This is a sentinel. The last token is not processed in the while loop.
-            while(($dotPosition = strpos($sJsNamespace, '.', $offset)) !== false)
+            while (($dotPosition = strpos($sJsNamespace, '.', $offset)) !== false)
             {
                 $sJsClass = substr($sJsNamespace, 0, $dotPosition);
                 // Generate code for this object
-                if(!key_exists($sJsClass, $aJsClasses))
+                if (!key_exists($sJsClass, $aJsClasses))
                 {
                     $sCode .= "$sPrefix$sJsClass = {};\n";
                     $aJsClasses[$sJsClass] = $sJsClass;
@@ -385,13 +385,13 @@ 
             }
         }
 
-        foreach($this->aCallableObjects as $sClassName => $xCallableObject)
+        foreach ($this->aCallableObjects as $sClassName => $xCallableObject)
         {
             $aConfig = $this->aCallableOptions[$sClassName];
             $aCommonConfig = key_exists('*', $aConfig) ? $aConfig['*'] : [];
 
             $aMethods = [];
-            foreach($xCallableObject->getMethods() as $sMethodName)
+            foreach ($xCallableObject->getMethods() as $sMethodName)
             {
                 // Specific options for this method
                 $aMethodConfig = key_exists($sMethodName, $aConfig) ?

src/Request/Plugin/CallableDir.php

Indentation +1 added lines, -1 removed lines

@@ -164,7 +164,7 @@
         }
         else
         {
-             // Use underscore as separator, so there's no need to deal with namespace
+                // Use underscore as separator, so there's no need to deal with namespace
             // when generating javascript code.
             $aOptions['separator'] = '_';
             $aOptions['autoload'] = $this->bAutoloadEnabled;

Spacing +9 added lines, -9 removed lines

@@ -105,33 +105,33 @@ 
      */
     public function register($sType, $sDirectory, $aOptions)
     {
-        if($sType != $this->getName())
+        if ($sType != $this->getName())
         {
             return false;
         }
 
-        if(!is_string($sDirectory) || !is_dir($sDirectory))
+        if (!is_string($sDirectory) || !is_dir($sDirectory))
         {
             throw new \Jaxon\Exception\Error($this->trans('errors.objects.invalid-declaration'));
         }
-        if(is_string($aOptions))
+        if (is_string($aOptions))
         {
             $aOptions = ['namespace' => $aOptions];
         }
-        if(!is_array($aOptions))
+        if (!is_array($aOptions))
         {
             throw new \Jaxon\Exception\Error($this->trans('errors.objects.invalid-declaration'));
         }
 
         $sDirectory = rtrim(trim($sDirectory), DIRECTORY_SEPARATOR);
-        if(!is_dir($sDirectory))
+        if (!is_dir($sDirectory))
         {
             return false;
         }
         $aOptions['directory'] = $sDirectory;
 
         $sNamespace = key_exists('namespace', $aOptions) ? $aOptions['namespace'] : '';
-        if(!($sNamespace = trim($sNamespace, ' \\')))
+        if (!($sNamespace = trim($sNamespace, ' \\')))
         {
             $sNamespace = '';
         }
@@ -145,17 +145,17 @@ 
 
         // Change the keys in $aOptions to have "\" as separator
         $_aOptions = [];
-        foreach($aOptions as $sName => $aOption)
+        foreach ($aOptions as $sName => $aOption)
         {
             $sName = trim(str_replace('.', '\\', $sName), ' \\');
             $_aOptions[$sName] = $aOption;
         }
         $aOptions = $_aOptions;
 
-        if(($sNamespace))
+        if (($sNamespace))
         {
             // Register the dir with PSR4 autoloading
-            if(($this->xAutoloader))
+            if (($this->xAutoloader))
             {
                 $this->xAutoloader->setPsr4($sNamespace . '\\', $sDirectory);
             }

Braces +1 added lines, -2 removed lines

@@ -161,8 +161,7 @@
             }
 
             $this->xRepository->addNamespace($sNamespace, $aOptions);
-        }
-        else
+        } else
         {
              // Use underscore as separator, so there's no need to deal with namespace
             // when generating javascript code.

src/Utils/Pagination/Renderer.php

Spacing +4 added lines, -4 removed lines

@@ -63,7 +63,7 @@ 
      */
     protected function getPrevLink()
     {
-        if(!($sCall = $this->xPaginator->getPrevCall()))
+        if (!($sCall = $this->xPaginator->getPrevCall()))
         {
             return '';
         }
@@ -78,7 +78,7 @@ 
      */
     protected function getNextLink()
     {
-        if(!($sCall = $this->xPaginator->getNextCall()))
+        if (!($sCall = $this->xPaginator->getNextCall()))
         {
             return '';
         }
@@ -94,9 +94,9 @@ 
     protected function getLinks()
     {
         $sLinks = '';
-        foreach($this->xPaginator->getPages() as $page)
+        foreach ($this->xPaginator->getPages() as $page)
         {
-            if($page['call'])
+            if ($page['call'])
             {
                 $sTemplate = ($page['isCurrent'] ? 'pagination::links/current' : 'pagination::links/enabled');
                 $sLinks .= $this->xTemplate->render($sTemplate, ['call' => $page['call'], 'text' => $page['num']]);

Braces +1 added lines, -2 removed lines

@@ -100,8 +100,7 @@
             {
                 $sTemplate = ($page['isCurrent'] ? 'pagination::links/current' : 'pagination::links/enabled');
                 $sLinks .= $this->xTemplate->render($sTemplate, ['call' => $page['call'], 'text' => $page['num']]);
-            }
-            else
+            } else
             {
                 $sLinks .= $this->xTemplate->render('pagination::links/disabled', ['text' => $page['num']]);
             }