jaxon-php / jaxon-core

src/Request/Plugin/CallableDir.php

Spacing +29 added lines, -29 removed lines

@@ -97,68 +97,68 @@ 
      */
     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'));
         }
         $sDirectory = trim($sDirectory, DIRECTORY_SEPARATOR);
         $this->aCallableDirs[] = $sDirectory;
 
-        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'));
         }
 
-        if(!is_dir(($sDirectory = trim($sDirectory))))
+        if (!is_dir(($sDirectory = trim($sDirectory))))
         {
             return false;
         }
 
         $aProtected = key_exists('protected', $aOptions) ? $aOptions['protected'] : [];
-        if(!is_array($aProtected))
+        if (!is_array($aProtected))
         {
             throw new \Jaxon\Exception\Error($this->trans('errors.objects.invalid-declaration'));
         }
 
         $sSeparator = key_exists('separator', $aOptions) ? $aOptions['separator'] : '.';
         // Only '.' and '_' are allowed to be used as separator. Any other value is ignored and '.' is used instead.
-        if(($sSeparator = trim($sSeparator)) != '_')
+        if (($sSeparator = trim($sSeparator)) != '_')
         {
             $sSeparator = '.';
         }
 
         $sNamespace = key_exists('namespace', $aOptions) ? $aOptions['namespace'] : '';
-        if(!($sNamespace = trim($sNamespace, ' \\')))
+        if (!($sNamespace = trim($sNamespace, ' \\')))
         {
             $sNamespace = '';
         }
-        if(($sNamespace))
+        if (($sNamespace))
         {
             // If there is an autoloader, register the dir with PSR4 autoloading
-            if(($this->xAutoloader))
+            if (($this->xAutoloader))
             {
                 $this->xAutoloader->setPsr4($sNamespace . '\\', $sDirectory);
             }
         }
-        elseif(($this->xAutoloader))
+        elseif (($this->xAutoloader))
         {
             // If there is an autoloader, register the dir with classmap autoloading
             $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;
                 }
@@ -195,33 +195,33 @@ 
         $sClassPath = substr($xFile->getPath(), strlen($sDirectory));
         $sClassPath = str_replace($sDS, '\\', trim($sClassPath, $sDS));
         $sClassName = $xFile->getBasename('.php');
-        if(($sNamespace))
+        if (($sNamespace))
         {
             $sClassPath = ($sClassPath) ? $sNamespace . '\\' . $sClassPath : $sNamespace;
             $sClassName = '\\' . $sClassPath . '\\' . $sClassName;
         }
         // Require the file only if autoload is enabled but there is no autoloader
-        if(($this->bAutoloadEnabled) && !($this->xAutoloader))
+        if (($this->bAutoloadEnabled) && !($this->xAutoloader))
         {
             require_once($xFile->getPathname());
         }
         // Create and register an instance of the class
-        if(!array_key_exists('*', $aOptions) || !is_array($aOptions['*']))
+        if (!array_key_exists('*', $aOptions) || !is_array($aOptions['*']))
         {
             $aOptions['*'] = [];
         }
         $aOptions['*']['separator'] = $sSeparator;
-        if(($sNamespace))
+        if (($sNamespace))
         {
             $aOptions['*']['namespace'] = $sNamespace;
         }
-        if(($sClassPath))
+        if (($sClassPath))
         {
             $aOptions['*']['classpath'] = $sClassPath;
         }
         // Filter excluded methods
-        $aProtected = array_filter($aProtected, function ($sName) {return is_string($sName);});
-        if(count($aProtected) > 0)
+        $aProtected = array_filter($aProtected, function($sName) {return is_string($sName); });
+        if (count($aProtected) > 0)
         {
             $aOptions['*']['protected'] = $aProtected;
         }
@@ -244,13 +244,13 @@ 
         $sDS = DIRECTORY_SEPARATOR;
         // Change the keys in $aOptions to have "\" as separator
         $aNewOptions = [];
-        foreach($aOptions as $key => $aOption)
+        foreach ($aOptions as $key => $aOption)
         {
             $key = trim(str_replace(['.', '_'], ['\\', '\\'], $key), ' \\');
             $aNewOptions[$key] = $aOption;
         }
 
-        foreach($this->aCallableDirs as $sDirectory => $aDirOptions)
+        foreach ($this->aCallableDirs as $sDirectory => $aDirOptions)
         {
             // Get the namespace
             $sNamespace = $aDirOptions['namespace'];
@@ -258,10 +258,10 @@ 
             $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;
                 }
@@ -270,17 +270,17 @@ 
                 $sClassPath = substr($xFile->getPath(), strlen($sDirectory));
                 $sClassPath = trim(str_replace($sDS, '\\', $sClassPath), '\\');
                 $sClassName = $xFile->getBasename('.php');
-                if(($sClassPath))
+                if (($sClassPath))
                 {
                     $sClassName = $sClassPath . '\\' . $sClassName;
                 }
-                if(($sNamespace))
+                if (($sNamespace))
                 {
                     $sClassName = $sNamespace . '\\' . $sClassName;
                 }
                 // Get the class options
                 $aClassOptions = [];
-                if(array_key_exists($sClassName, $aNewOptions))
+                if (array_key_exists($sClassName, $aNewOptions))
                 {
                     $aClassOptions = $aNewOptions[$sClassName];
                 }
@@ -298,12 +298,12 @@ 
      */
     public function generateHash()
     {
-        if(count($this->aCallableDirs) == 0)
+        if (count($this->aCallableDirs) == 0)
         {
             return '';
         }
         $sHash = '';
-        foreach($this->aCallableDirs as $sDirectory => $aDirOptions)
+        foreach ($this->aCallableDirs as $sDirectory => $aDirOptions)
         {
             $sHash .= $sDirectory . $aDirOptions['namespace'] . $aDirOptions['separator'];
         }

Braces +1 added lines, -2 removed lines

@@ -148,8 +148,7 @@
             {
                 $this->xAutoloader->setPsr4($sNamespace . '\\', $sDirectory);
             }
-        }
-        elseif(($this->xAutoloader))
+        } elseif(($this->xAutoloader))
         {
             // If there is an autoloader, register the dir with classmap autoloading
             $itDir = new RecursiveDirectoryIterator($sDirectory);

src/Request/Plugin/CallableClass.php

Spacing +26 added lines, -26 removed lines

@@ -61,19 +61,19 @@ 
 
     public function __construct()
     {
-        if(!empty($_GET['jxncls']))
+        if (!empty($_GET['jxncls']))
         {
             $this->sRequestedClass = $_GET['jxncls'];
         }
-        if(!empty($_GET['jxnmthd']))
+        if (!empty($_GET['jxnmthd']))
         {
             $this->sRequestedMethod = $_GET['jxnmthd'];
         }
-        if(!empty($_POST['jxncls']))
+        if (!empty($_POST['jxncls']))
         {
             $this->sRequestedClass = $_POST['jxncls'];
         }
-        if(!empty($_POST['jxnmthd']))
+        if (!empty($_POST['jxnmthd']))
         {
             $this->sRequestedMethod = $_POST['jxnmthd'];
         }
@@ -100,39 +100,39 @@ 
      */
     public function register($sType, $sClassName, $aOptions)
     {
-        if($sType != $this->getName())
+        if ($sType != $this->getName())
         {
             return false;
         }
 
-        if(!is_string($sClassName) || !class_exists($sClassName))
+        if (!is_string($sClassName) || !class_exists($sClassName))
         {
             throw new \Jaxon\Exception\Error($this->trans('errors.objects.invalid-declaration'));
         }
         $sClassName = trim($sClassName, '\\');
         $this->aCallableClasses[] = $sClassName;
 
-        if(!is_array($aOptions))
+        if (!is_array($aOptions))
         {
             throw new \Jaxon\Exception\Error($this->trans('errors.objects.invalid-declaration'));
         }
 
         // Save the classpath and the separator in this class
-        if(key_exists('*', $aOptions) && is_array($aOptions['*']))
+        if (key_exists('*', $aOptions) && is_array($aOptions['*']))
         {
             $_aOptions = $aOptions['*'];
             $sSeparator = '.';
-            if(key_exists('separator', $_aOptions))
+            if (key_exists('separator', $_aOptions))
             {
                 $sSeparator = trim($_aOptions['separator']);
             }
-            if(!in_array($sSeparator, ['.', '_']))
+            if (!in_array($sSeparator, ['.', '_']))
             {
                 $sSeparator = '.';
             }
             $_aOptions['separator'] = $sSeparator;
 
-            if(array_key_exists('classpath', $_aOptions))
+            if (array_key_exists('classpath', $_aOptions))
             {
                 $_aOptions['classpath'] = trim($_aOptions['classpath'], ' \\._');
                 // Save classpath with "\" in the parameters
@@ -143,12 +143,12 @@ 
         }
 
         // Register the callable object
-        jaxon()->di()->set($sClassName, function () use ($sClassName, $aOptions) {
+        jaxon()->di()->set($sClassName, function() use ($sClassName, $aOptions) {
             $xCallableObject = new \Jaxon\Request\Support\CallableObject($sClassName);
 
-            foreach($aOptions as $sMethod => $aValue)
+            foreach ($aOptions as $sMethod => $aValue)
             {
-                foreach($aValue as $sName => $sValue)
+                foreach ($aValue as $sName => $sValue)
                 {
                     $xCallableObject->configure($sMethod, $sName, $sValue);
                 }
@@ -158,13 +158,13 @@ 
         });
 
         // Register the request factory for this callable object
-        jaxon()->di()->set($sClassName . '\Factory\Rq', function ($di) use ($sClassName) {
+        jaxon()->di()->set($sClassName . '\Factory\Rq', function($di) use ($sClassName) {
             $xCallableObject = $di->get($sClassName);
             return new \Jaxon\Factory\Request\Portable($xCallableObject);
         });
 
         // Register the paginator factory for this callable object
-        jaxon()->di()->set($sClassName . '\Factory\Pg', function ($di) use ($sClassName) {
+        jaxon()->di()->set($sClassName . '\Factory\Pg', function($di) use ($sClassName) {
             $xCallableObject = $di->get($sClassName);
             return new \Jaxon\Factory\Request\Paginator($xCallableObject);
         });
@@ -181,7 +181,7 @@ 
     {
         $di = jaxon()->di();
         $sHash = '';
-        foreach($this->aCallableClasses as $sName)
+        foreach ($this->aCallableClasses as $sName)
         {
             $xCallableObject = $di->get($sName);
             $sHash .= $sName . implode('|', $xCallableObject->getMethods());
@@ -201,15 +201,15 @@ 
         // Generate code for javascript objects declaration
         $sJaxonPrefix = $this->getOption('core.prefix.class');
         $classes = [];
-        foreach($this->aClassPaths as $sClassPath)
+        foreach ($this->aClassPaths as $sClassPath)
         {
             $offset = 0;
             $sClassPath .= '.Null'; // This is a sentinel. The last token is not processed in the while loop.
-            while(($dotPosition = strpos($sClassPath, '.', $offset)) !== false)
+            while (($dotPosition = strpos($sClassPath, '.', $offset)) !== false)
             {
                 $class = substr($sClassPath, 0, $dotPosition);
                 // Generate code for this object
-                if(!key_exists($class, $classes))
+                if (!key_exists($class, $classes))
                 {
                     $code .= "$sJaxonPrefix$class = {};\n";
                     $classes[$class] = $class;
@@ -220,7 +220,7 @@ 
 
         // Generate code for javascript methods
         $di = jaxon()->di();
-        foreach($this->aCallableClasses as $sName)
+        foreach ($this->aCallableClasses as $sName)
         {
             $xCallableObject = $di->get($sName);
             $code .= $xCallableObject->getScript();
@@ -236,13 +236,13 @@ 
     public function canProcessRequest()
     {
         // Check the validity of the class name
-        if(($this->sRequestedClass) && !$this->validateClass($this->sRequestedClass))
+        if (($this->sRequestedClass) && !$this->validateClass($this->sRequestedClass))
         {
             $this->sRequestedClass = null;
             $this->sRequestedMethod = null;
         }
         // Check the validity of the method name
-        if(($this->sRequestedMethod) && !$this->validateMethod($this->sRequestedMethod))
+        if (($this->sRequestedMethod) && !$this->validateMethod($this->sRequestedMethod))
         {
             $this->sRequestedClass = null;
             $this->sRequestedMethod = null;
@@ -257,7 +257,7 @@ 
      */
     public function processRequest()
     {
-        if(!$this->canProcessRequest())
+        if (!$this->canProcessRequest())
         {
             return false;
         }
@@ -266,7 +266,7 @@ 
 
         // Find the requested method
         $xCallableObject = $this->getCallableObject($this->sRequestedClass);
-        if(!$xCallableObject || !$xCallableObject->hasMethod($this->sRequestedMethod))
+        if (!$xCallableObject || !$xCallableObject->hasMethod($this->sRequestedMethod))
         {
             // Unable to find the requested object or method
             throw new \Jaxon\Exception\Error($this->trans('errors.objects.invalid',
@@ -291,7 +291,7 @@ 
         // at the beginning and the end of the class name.
         $sClassName = trim(str_replace(['.', '_'], ['\\', '\\'], (string)$sClassName), '\\');
         // Register an instance of the requested class, if it isn't yet
-        if(!key_exists($sClassName, $this->aCallableClasses))
+        if (!key_exists($sClassName, $this->aCallableClasses))
         {
             $this->getPluginManager()->registerClass($sClassName);
         }

src/Request/Plugin/UserFunction.php

Spacing +14 added lines, -14 removed lines

@@ -47,11 +47,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'];
         }
@@ -78,30 +78,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;
@@ -109,10 +109,10 @@ 
         }
 
         $this->aFunctions[$sFunctionName] = $sUserFunction;
-        jaxon()->di()->set($sFunctionName, function () use ($sUserFunction, $aOptions) {
+        jaxon()->di()->set($sFunctionName, function() use ($sUserFunction, $aOptions) {
             $xUserFunction = new \Jaxon\Request\Support\UserFunction($sUserFunction);
 
-            foreach($aOptions as $sName => $sValue)
+            foreach ($aOptions as $sName => $sValue)
             {
                 $xUserFunction->configure($sName, $sValue);
             }
@@ -142,7 +142,7 @@ 
     {
         $di = jaxon()->di();
         $code = '';
-        foreach($this->aFunctions as $sName)
+        foreach ($this->aFunctions as $sName)
         {
             $xFunction = $di->get($sName);
             $code .= $xFunction->getScript();
@@ -158,7 +158,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;
         }
@@ -172,12 +172,12 @@ 
      */
     public function processRequest()
     {
-        if(!$this->canProcessRequest())
+        if (!$this->canProcessRequest())
         {
             return false;
         }
 
-        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',

src/Request/Plugin/FileUpload.php

Spacing +27 added lines, -27 removed lines

@@ -58,11 +58,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'];
         }
@@ -90,7 +90,7 @@ 
      */
     protected function filterFilename($sFilename, $sVarName)
     {
-        if(($this->fFileFilter))
+        if (($this->fFileFilter))
         {
             $fFileFilter = $this->fFileFilter;
             $sFilename = (string)$fFileFilter($sFilename, $sVarName);
@@ -112,7 +112,7 @@ 
         $sUploadDir = $this->getOption('upload.files.' . $sFieldId . '.dir', $sDefaultUploadDir);
         $sUploadDir = rtrim(trim($sUploadDir), DIRECTORY_SEPARATOR) . 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'));
         }
@@ -132,7 +132,7 @@ 
         $sUploadDir = $this->getOption('upload.default.dir');
         $sUploadDir = rtrim(trim($sUploadDir), DIRECTORY_SEPARATOR) . 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'));
         }
@@ -152,7 +152,7 @@ 
         $sUploadDir = rtrim(trim($sUploadDir), DIRECTORY_SEPARATOR) . 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'));
         }
@@ -168,17 +168,17 @@ 
     {
         // 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']))
             {
-                for($i = 0; $i < count($aFile['name']); $i++)
+                for ($i = 0; $i < count($aFile['name']); $i++)
                 {
-                    if(!$aFile['name'][$i])
+                    if (!$aFile['name'][$i])
                     {
                         continue;
                     }
-                    if(!array_key_exists($sVarName, $aTempFiles))
+                    if (!array_key_exists($sVarName, $aTempFiles))
                     {
                         $aTempFiles[$sVarName] = [];
                     }
@@ -198,11 +198,11 @@ 
             }
             else
             {
-                if(!$aFile['name'])
+                if (!$aFile['name'])
                 {
                     continue;
                 }
-                if(!array_key_exists($sVarName, $aTempFiles))
+                if (!array_key_exists($sVarName, $aTempFiles))
                 {
                     $aTempFiles[$sVarName] = [];
                 }
@@ -222,17 +222,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());
                 }
@@ -242,10 +242,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);
@@ -267,10 +267,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();
             }
@@ -291,10 +291,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);
             }
@@ -359,15 +359,15 @@ 
      */
     public function processRequest()
     {
-        if(!$this->canProcessRequest())
+        if (!$this->canProcessRequest())
         {
             return false;
         }
-        if(count($_FILES) > 0)
+        if (count($_FILES) > 0)
         {
             $this->readFromHttpData();
         }
-        elseif(($this->sTempFile))
+        elseif (($this->sTempFile))
         {
             $this->readFromTempFile();
         }
@@ -382,7 +382,7 @@ 
     public function saveUploadedFiles()
     {
         // Process uploaded files
-        if(!$this->processRequest())
+        if (!$this->processRequest())
         {
             return '';
         }