jaxon-php / jaxon-core

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 +40 added lines, -40 removed lines

@@ -91,19 +91,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]);
         }
@@ -123,17 +123,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();
             }
@@ -154,7 +154,7 @@ 
     public function addNamespace($sNamespace, array $aOptions)
     {
         // Separator default value
-        if(!key_exists('separator', $aOptions))
+        if (!key_exists('separator', $aOptions))
         {
             $aOptions['separator'] = '.';
         }
@@ -170,7 +170,7 @@ 
      */
     private function getOptionsFromClass($sClassName)
     {
-        if(!key_exists($sClassName, $this->aClassOptions))
+        if (!key_exists($sClassName, $this->aClassOptions))
         {
             return null; // Class not registered
         }
@@ -188,18 +188,18 @@ 
     private function getOptionsFromNamespace($sClassName, $sNamespace = null)
     {
         // Find the corresponding namespace
-        if($sNamespace === null)
+        if ($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
         }
@@ -207,7 +207,7 @@ 
         // Get the class options
         $aOptions = $this->aNamespaceOptions[$sNamespace];
         $aDefaultOptions = []; // ['namespace' => $aOptions['namespace']];
-        if(key_exists('separator', $aOptions))
+        if (key_exists('separator', $aOptions))
         {
             $aDefaultOptions['separator'] = $aOptions['separator'];
         }
@@ -225,11 +225,11 @@ 
     protected function _getCallableObject($sClassName, array $aOptions)
     {
         // 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;
         }
@@ -237,13 +237,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;
@@ -252,12 +252,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);
         });
@@ -278,17 +278,17 @@ 
         // 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;
         }
@@ -304,9 +304,9 @@ 
     private function createCallableObjects()
     {
         // Create callable objects for registered classes
-        foreach($this->aClassOptions as $sClassName => $aClassOptions)
+        foreach ($this->aClassOptions as $sClassName => $aClassOptions)
         {
-            if(!key_exists($sClassName, $this->aCallableObjects))
+            if (!key_exists($sClassName, $this->aCallableObjects))
             {
                 $this->_getCallableObject($sClassName, $aClassOptions);
             }
@@ -314,9 +314,9 @@ 
 
         // 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;
             }
@@ -327,10 +327,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;
                 }
@@ -339,7 +339,7 @@ 
                 $sClassPath = $sNamespace;
                 $sRelativePath = substr($xFile->getPath(), strlen($sDirectory));
                 $sRelativePath = trim(str_replace($sDS, '\\', $sRelativePath), '\\');
-                if($sRelativePath != '')
+                if ($sRelativePath != '')
                 {
                     $sClassPath .= '\\' . $sRelativePath;
                 }
@@ -347,10 +347,10 @@ 
                 $this->aNamespaces[$sClassPath] = ['separator' => $aOptions['separator']];
                 $sClassName = $sClassPath . '\\' . $xFile->getBasename('.php');
 
-                if(!key_exists($sClassName, $this->aCallableObjects))
+                if (!key_exists($sClassName, $this->aCallableObjects))
                 {
                     $aClassOptions = $this->getOptionsFromNamespace($sClassName, $sNamespace);
-                    if($aClassOptions !== null)
+                    if ($aClassOptions !== null)
                     {
                         $this->_getCallableObject($sClassName, $aClassOptions);
                     }
@@ -383,11 +383,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());
         }
@@ -408,16 +408,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;
@@ -426,13 +426,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;

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.

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'] = realpath($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);
             }

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

src/Request/Support/UserFunction.php

Spacing +3 added lines, -3 removed lines

@@ -84,7 +84,7 @@ 
      */
     public function configure($sName, $sValue)
     {
-        switch($sName)
+        switch ($sName)
         {
         case 'class': // The user function is a method in the given class
             $this->xUserFunction = [$sValue, $this->xUserFunction];
@@ -139,13 +139,13 @@ 
      */
     public function call($aArgs = [])
     {
-        if(($this->sInclude))
+        if (($this->sInclude))
         {
             require_once $this->sInclude;
         }
 
         // If the function is an alias for a class method, then instanciate the class
-        if(is_array($this->xUserFunction) && is_string($this->xUserFunction[0]))
+        if (is_array($this->xUserFunction) && is_string($this->xUserFunction[0]))
         {
             $sClassName = $this->xUserFunction[0];
             $this->xUserFunction[0] = new $sClassName;

src/Config/Php.php

Spacing +2 added lines, -2 removed lines

@@ -26,12 +26,12 @@
     public static function read($sConfigFile)
     {
         $sConfigFile = realpath($sConfigFile);
-        if(!is_readable($sConfigFile))
+        if (!is_readable($sConfigFile))
         {
             throw new \Jaxon\Config\Exception\File(jaxon_trans('config.errors.file.access', array('path' => $sConfigFile)));
         }
         $aConfigOptions = include($sConfigFile);
-        if(!is_array($aConfigOptions))
+        if (!is_array($aConfigOptions))
         {
             throw new \Jaxon\Config\Exception\File(jaxon_trans('config.errors.file.content', array('path' => $sConfigFile)));
         }

src/Config/Config.php

Spacing +9 added lines, -10 removed lines

@@ -45,14 +45,14 @@ 
         $sPrefix = trim((string)$sPrefix);
         $nDepth = intval($nDepth);
         // Check the max depth
-        if($nDepth < 0 || $nDepth > 9)
+        if ($nDepth < 0 || $nDepth > 9)
         {
             throw new \Jaxon\Config\Exception\Data(jaxon_trans('config.errors.data.depth',
                 array('key' => $sPrefix, 'depth' => $nDepth)));
         }
-        foreach($aOptions as $sName => $xOption)
+        foreach ($aOptions as $sName => $xOption)
         {
-            if(is_int($sName))
+            if (is_int($sName))
             {
                 continue;
             }
@@ -62,7 +62,7 @@ 
             // Save the value of this option
             $this->aOptions[$sFullName] = $xOption;
             // Save the values of its sub-options
-            if(is_array($xOption))
+            if (is_array($xOption))
             {
                 // Recursively read the options in the array
                 $this->_setOptions($xOption, $sFullName, $nDepth + 1);
@@ -84,9 +84,9 @@ 
         $aKeys = explode('.', (string)$sKeys);
         foreach ($aKeys as $sKey)
         {
-            if(($sKey))
+            if (($sKey))
             {
-                if(!array_key_exists($sKey, $aOptions) || !is_array($aOptions[$sKey]))
+                if (!array_key_exists($sKey, $aOptions) || !is_array($aOptions[$sKey]))
                 {
                     return;
                 }
@@ -134,13 +134,12 @@ 
         $sPrefix = rtrim($sPrefix, '.') . '.';
         $sPrefixLen = strlen($sPrefix);
         $aOptions = [];
-        foreach($this->aOptions as $sName => $xValue)
+        foreach ($this->aOptions as $sName => $xValue)
         {
-            if(substr($sName, 0, $sPrefixLen) == $sPrefix)
+            if (substr($sName, 0, $sPrefixLen) == $sPrefix)
             {
                 $iNextDotPos = strpos($sName, '.', $sPrefixLen);
-                $sOptionName = $iNextDotPos === false ? substr($sName, $sPrefixLen) :
-                    substr($sName, $sPrefixLen, $iNextDotPos - $sPrefixLen);
+                $sOptionName = $iNextDotPos === false ? substr($sName, $sPrefixLen) : substr($sName, $sPrefixLen, $iNextDotPos - $sPrefixLen);
                 $aOptions[$sOptionName] = $sPrefix . $sOptionName;
             }
         }

src/Config/Yaml.php

Spacing +3 added lines, -3 removed lines

@@ -26,16 +26,16 @@
     public static function read($sConfigFile)
     {
         $sConfigFile = realpath($sConfigFile);
-        if(!extension_loaded('yaml'))
+        if (!extension_loaded('yaml'))
         {
             throw new \Jaxon\Config\Exception\Yaml(jaxon_trans('config.errors.yaml.install'));
         }
-        if(!is_readable($sConfigFile))
+        if (!is_readable($sConfigFile))
         {
             throw new \Jaxon\Config\Exception\File(jaxon_trans('config.errors.file.access', array('path' => $sConfigFile)));
         }
         $aConfigOptions = yaml_parse_file($sConfigFile);
-        if(!is_array($aConfigOptions))
+        if (!is_array($aConfigOptions))
         {
             throw new \Jaxon\Config\Exception\File(jaxon_trans('config.errors.file.content', array('path' => $sConfigFile)));
         }

src/Config/Reader.php

Spacing +1 added lines, -1 removed lines

@@ -24,7 +24,7 @@
     public function read($sConfigFile)
     {
         $sExt = pathinfo($sConfigFile, PATHINFO_EXTENSION);
-        switch($sExt)
+        switch ($sExt)
         {
         case 'php':
             $aConfigOptions = Php::read($sConfigFile);