jaxon-php / jaxon-core

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
      */

src/Request/Support/CallableRepository.php

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/FileUpload.php

Spacing +29 added lines, -29 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,12 +112,12 @@ 
         $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'));
         }
         $sUploadDir .= $this->sUploadSubdir;
-        if(!@mkdir($sUploadDir))
+        if (!@mkdir($sUploadDir))
         {
             throw new \Jaxon\Exception\Error($this->trans('errors.upload.access'));
         }
@@ -135,12 +135,12 @@ 
         $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'));
         }
         $sUploadDir .= 'tmp' . DIRECTORY_SEPARATOR;
-        if(!@mkdir($sUploadDir))
+        if (!@mkdir($sUploadDir))
         {
             throw new \Jaxon\Exception\Error($this->trans('errors.upload.access'));
         }
@@ -158,7 +158,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'));
         }
@@ -174,18 +174,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] = [];
                     }
@@ -205,11 +205,11 @@ 
             }
             else
             {
-                if(!$aFile['name'])
+                if (!$aFile['name'])
                 {
                     continue;
                 }
-                if(!array_key_exists($sVarName, $aTempFiles))
+                if (!array_key_exists($sVarName, $aTempFiles))
                 {
                     $aTempFiles[$sVarName] = [];
                 }
@@ -229,17 +229,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());
                 }
@@ -249,10 +249,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);
@@ -274,10 +274,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();
             }
@@ -298,10 +298,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);
             }
@@ -366,15 +366,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();
         }
@@ -389,7 +389,7 @@ 
     public function saveUploadedFiles()
     {
         // Process uploaded files
-        if(!$this->processRequest())
+        if (!$this->processRequest())
         {
             return '';
         }