jaxon-php / jaxon-core

src/Request/Plugin/CallableDir.php

Spacing +46 added lines, -46 removed lines

@@ -82,19 +82,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'];
         }
@@ -145,34 +145,34 @@ 
      */
     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);
 
-        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;
         }
         $aOptions['directory'] = $sDirectory;
 
         $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'));
         }
@@ -180,14 +180,14 @@ 
 
         $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 = '.';
         }
         $aOptions['separator'] = $sSeparator;
 
         $sNamespace = key_exists('namespace', $aOptions) ? $aOptions['namespace'] : '';
-        if(!($sNamespace = trim($sNamespace, ' \\')))
+        if (!($sNamespace = trim($sNamespace, ' \\')))
         {
             $sNamespace = '';
         }
@@ -202,10 +202,10 @@ 
         // }
         // $aOptions['classes'] = $aNewOptions;
 
-        if(($sNamespace))
+        if (($sNamespace))
         {
             // Register the dir with PSR4 autoloading
-            if(($this->xAutoloader))
+            if (($this->xAutoloader))
             {
                 $this->xAutoloader->setPsr4($sNamespace . '\\', $sDirectory);
             }
@@ -221,20 +221,20 @@ 
             $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;
                 }
 
                 $sClassName = $xFile->getBasename('.php');
-                if(($this->xAutoloader))
+                if (($this->xAutoloader))
                 {
                     $this->xAutoloader->addClassMap([$sClassName => $xFile->getPathname()]);
                 }
-                elseif(!class_exists($sClassName))
+                elseif (!class_exists($sClassName))
                 {
                     $aOptions['include'] = $xFile->getPathname();
                 }
@@ -260,27 +260,27 @@ 
         $sClassName = trim(str_replace(['.', '_'], ['\\', '\\'], (string)$sClassName), '\\');
 
         // Make sure the registered class exists
-        if(!class_exists('\\' . $sClassName))
+        if (!class_exists('\\' . $sClassName))
         {
             return null;
         }
 
-        if(key_exists($sClassName, $this->aCallableObjects))
+        if (key_exists($sClassName, $this->aCallableObjects))
         {
             return $this->aCallableObjects[$sClassName];
         }
 
         // Find the corresponding namespace
         $sNamespace = null;
-        foreach(array_keys($this->aNamespaces) as $_sNamespace)
+        foreach (array_keys($this->aNamespaces) as $_sNamespace)
         {
-            if(substr($sClassName, 0, strlen($_sNamespace)) == $_sNamespace)
+            if (substr($sClassName, 0, strlen($_sNamespace)) == $_sNamespace)
             {
                 $sNamespace = $_sNamespace;
                 break;
             }
         }
-        if($sNamespace == null)
+        if ($sNamespace == null)
         {
             return null; // Class not registered
         }
@@ -288,13 +288,13 @@ 
         // Create the callable object
         $xCallableObject = new \Jaxon\Request\Support\CallableObject($sClassName);
         $aOptions = $this->aNamespaces[$sNamespace];
-        foreach($aOptions as $sClass => $aClassOptions)
+        foreach ($aOptions as $sClass => $aClassOptions)
         {
-            if($sClass == '*' || trim(str_replace(['.', '_'], ['\\', '\\'], $sClass), ' \\') == $sClassName)
+            if ($sClass == '*' || trim(str_replace(['.', '_'], ['\\', '\\'], $sClass), ' \\') == $sClassName)
             {
-                foreach($aClassOptions as $sMethod => $aValue)
+                foreach ($aClassOptions as $sMethod => $aValue)
                 {
-                    foreach($aValue as $sName => $sValue)
+                    foreach ($aValue as $sName => $sValue)
                     {
                         $xCallableObject->configure($sMethod, $sName, $sValue);
                     }
@@ -305,12 +305,12 @@ 
         $this->aCallableObjects[$sClassName] = $xCallableObject;
         // jaxon()->di()->set($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);
         });
@@ -341,9 +341,9 @@ 
     {
         $sDS = DIRECTORY_SEPARATOR;
 
-        foreach($this->aNamespaces as $sNamespace => $aOptions)
+        foreach ($this->aNamespaces as $sNamespace => $aOptions)
         {
-            if(key_exists($sNamespace, $this->aClassNames))
+            if (key_exists($sNamespace, $this->aClassNames))
             {
                 continue;
             }
@@ -354,10 +354,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;
                 }
@@ -366,11 +366,11 @@ 
                 $sClassPath = $sNamespace;
                 $sRelativePath = substr($xFile->getPath(), strlen($sDirectory));
                 $sRelativePath = trim(str_replace($sDS, '\\', $sRelativePath), '\\');
-                if($sRelativePath != '')
+                if ($sRelativePath != '')
                 {
                     $sClassPath .= '\\' . $sRelativePath;
                 }
-                if(!key_exists($sClassPath, $this->aClassNames))
+                if (!key_exists($sClassPath, $this->aClassNames))
                 {
                     $this->aClassNames[$sClassPath] = [];
                 }
@@ -389,7 +389,7 @@ 
      */
     public function generateHash()
     {
-        if(count($this->aNamespaces) == 0)
+        if (count($this->aNamespaces) == 0)
         {
             return '';
         }
@@ -397,11 +397,11 @@ 
         $this->createCallableObjects();
 
         $sHash = '';
-        foreach($this->aNamespaces as $sNamespace => $aOptions)
+        foreach ($this->aNamespaces as $sNamespace => $aOptions)
         {
             $sHash .= $sNamespace . $aOptions['directory'] . $aOptions['separator'];
         }
-        foreach($this->aCallableObjects as $sClassName => $xCallableObject)
+        foreach ($this->aCallableObjects as $sClassName => $xCallableObject)
         {
             $sHash .= $sClassName . implode('|', $xCallableObject->getMethods());
         }
@@ -422,7 +422,7 @@ 
         $sJaxonPrefix = $this->getOption('core.prefix.class');
         $aJsClasses = [];
         $sCode = '';
-        foreach(array_keys($this->aClassNames) as $sNamespace)
+        foreach (array_keys($this->aClassNames) as $sNamespace)
         {
             // if(key_exists('separator', $aOptions) && $aOptions['separator'] != '.')
             // {
@@ -431,11 +431,11 @@ 
             $offset = 0;
             $sJsClasses = str_replace('\\', '.', $sNamespace);
             $sJsClasses .= '.Null'; // This is a sentinel. The last token is not processed in the while loop.
-            while(($dotPosition = strpos($sJsClasses, '.', $offset)) !== false)
+            while (($dotPosition = strpos($sJsClasses, '.', $offset)) !== false)
             {
                 $sJsClass = substr($sJsClasses, 0, $dotPosition);
                 // Generate code for this object
-                if(!key_exists($sJsClass, $aJsClasses))
+                if (!key_exists($sJsClass, $aJsClasses))
                 {
                     $sCode .= "$sJaxonPrefix$sJsClass = {};\n";
                     $aJsClasses[$sJsClass] = $sJsClass;
@@ -443,7 +443,7 @@ 
                 $offset = $dotPosition + 1;
             }
         }
-        foreach($this->aCallableObjects as $xCallableObject)
+        foreach ($this->aCallableObjects as $xCallableObject)
         {
             $sCode .= $xCallableObject->getScript();
         }
@@ -459,13 +459,13 @@ 
     public function canProcessRequest()
     {
         // Check the validity of the class name
-        if($this->sRequestedClass !== null && !$this->validateClass($this->sRequestedClass))
+        if ($this->sRequestedClass !== null && !$this->validateClass($this->sRequestedClass))
         {
             $this->sRequestedClass = null;
             $this->sRequestedMethod = null;
         }
         // Check the validity of the method name
-        if($this->sRequestedMethod !== null && !$this->validateMethod($this->sRequestedMethod))
+        if ($this->sRequestedMethod !== null && !$this->validateMethod($this->sRequestedMethod))
         {
             $this->sRequestedClass = null;
             $this->sRequestedMethod = null;
@@ -480,7 +480,7 @@ 
      */
     public function processRequest()
     {
-        if(!$this->canProcessRequest())
+        if (!$this->canProcessRequest())
         {
             return false;
         }
@@ -489,7 +489,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',

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,18 +168,18 @@ 
     {
         // Check validity of the uploaded files
         $aTempFiles = [];
-        foreach($_FILES as $sVarName => $aFile)
+        foreach ($_FILES as $sVarName => $aFile)
         {
-            if(is_array($aFile['name']))
+            if (is_array($aFile['name']))
             {
                 $nFileCount = count($aFile['name']);
-                for($i = 0; $i < $nFileCount; $i++)
+                for ($i = 0; $i < $nFileCount; $i++)
                 {
-                    if(!$aFile['name'][$i])
+                    if (!$aFile['name'][$i])
                     {
                         continue;
                     }
-                    if(!array_key_exists($sVarName, $aTempFiles))
+                    if (!array_key_exists($sVarName, $aTempFiles))
                     {
                         $aTempFiles[$sVarName] = [];
                     }
@@ -199,11 +199,11 @@ 
             }
             else
             {
-                if(!$aFile['name'])
+                if (!$aFile['name'])
                 {
                     continue;
                 }
-                if(!array_key_exists($sVarName, $aTempFiles))
+                if (!array_key_exists($sVarName, $aTempFiles))
                 {
                     $aTempFiles[$sVarName] = [];
                 }
@@ -223,17 +223,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());
                 }
@@ -243,10 +243,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);
@@ -268,10 +268,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();
             }
@@ -292,10 +292,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);
             }
@@ -360,15 +360,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();
         }
@@ -383,7 +383,7 @@ 
     public function saveUploadedFiles()
     {
         // Process uploaded files
-        if(!$this->processRequest())
+        if (!$this->processRequest())
         {
             return '';
         }