jaxon-php / jaxon-mono

jaxon-upload/src/Manager/UploadManager.php

Spacing +10 added lines, -10 removed lines

@@ -121,13 +121,13 @@ 
         try
         {
             $xFilesystem->createDirectory($sUploadDir);
-            if(!$xFilesystem->directoryExists($sUploadDir))
+            if (!$xFilesystem->directoryExists($sUploadDir))
             {
                 throw new RequestException($this->xTranslator->trans('errors.upload.access'));
             }
             return $sUploadDir;
         }
-        catch(FilesystemException $e)
+        catch (FilesystemException $e)
         {
             $this->xLogger->error('Filesystem error.', ['message' => $e->getMessage()]);
             throw new RequestException($this->xTranslator->trans('errors.upload.access'));
@@ -162,7 +162,7 @@ 
     {
         // Check the uploaded file validity
         $nErrorCode = $xHttpFile->getError();
-        if($nErrorCode !== UPLOAD_ERR_OK)
+        if ($nErrorCode !== UPLOAD_ERR_OK)
         {
             $this->xLogger->error('File upload error.', [
                 'code' => $nErrorCode,
@@ -176,7 +176,7 @@ 
 
         // Filename without the extension. Needs to be sanitized.
         $sName = pathinfo($xHttpFile->getClientFilename(), PATHINFO_FILENAME);
-        if($this->cNameSanitizer !== null)
+        if ($this->cNameSanitizer !== null)
         {
             $sName = (string)call_user_func($this->cNameSanitizer,
                 $sName, $sField, $this->sUploadFieldId);
@@ -185,7 +185,7 @@ 
         // Set the user file data
         $xFile = File::fromHttpFile($this->xFileStorage->filesystem($sField), $xHttpFile, $sUploadDir, $sName);
         // Verify file validity (format, size)
-        if(!$this->xValidator->validateUploadedFile($sField, $xFile))
+        if (!$this->xValidator->validateUploadedFile($sField, $xFile))
         {
             throw new RequestException($this->xValidator->getErrorMessage());
         }
@@ -209,16 +209,16 @@ 
 
         $aUserFiles = [];
         $aAllFiles = []; // A flat list of all uploaded files
-        foreach($aTempFiles as $sField => $aFiles)
+        foreach ($aTempFiles as $sField => $aFiles)
         {
             $aUserFiles[$sField] = [];
             // Get the path to the upload dir
             $sUploadDir = $this->getUploadDir($sField);
-            if(!is_array($aFiles))
+            if (!is_array($aFiles))
             {
                 $aFiles = [$aFiles];
             }
-            foreach($aFiles as $xHttpFile)
+            foreach ($aFiles as $xHttpFile)
             {
                 $aFile = $this->makeUploadedFile($xHttpFile, $sUploadDir, $sField);
                 $aUserFiles[$sField][] = $aFile['user'];
@@ -229,14 +229,14 @@ 
         // Copy the uploaded files from the temp dir to the user dir
         try
         {
-            foreach($aAllFiles as $aFiles)
+            foreach ($aAllFiles as $aFiles)
             {
                 $sPath = $aFiles['user']->path();
                 $xContent = $aFiles['temp']->getStream();
                 $aFiles['user']->filesystem()->write($sPath, $xContent);
             }
         }
-        catch(FilesystemException $e)
+        catch (FilesystemException $e)
         {
             $this->xLogger->error('Filesystem error.', ['message' => $e->getMessage()]);
             throw new RequestException($this->xTranslator->trans('errors.upload.access'));

Braces +2 added lines, -4 removed lines

@@ -126,8 +126,7 @@ 
                 throw new RequestException($this->xTranslator->trans('errors.upload.access'));
             }
             return $sUploadDir;
-        }
-        catch(FilesystemException $e)
+        } catch(FilesystemException $e)
         {
             $this->xLogger->error('Filesystem error.', ['message' => $e->getMessage()]);
             throw new RequestException($this->xTranslator->trans('errors.upload.access'));
@@ -235,8 +234,7 @@ 
                 $xContent = $aFiles['temp']->getStream();
                 $aFiles['user']->filesystem()->write($sPath, $xContent);
             }
-        }
-        catch(FilesystemException $e)
+        } catch(FilesystemException $e)
         {
             $this->xLogger->error('Filesystem error.', ['message' => $e->getMessage()]);
             throw new RequestException($this->xTranslator->trans('errors.upload.access'));

jaxon-annotations/tests/Attr/Ajax/CallbackError.php

Switch Indentation +20 added lines, -20 removed lines

@@ -6,38 +6,38 @@
 
 class CallbackError extends FuncComponent
 {
-    /**
+/**
      * @callback
      */
-    public function noName()
-    {
-    }
+public function noName()
+{
+}
 
-    /**
+/**
      * @callback('name' => [])
      */
-    public function wrongNameType()
-    {
-    }
+public function wrongNameType()
+{
+}
 
-    /**
+/**
      * @callback('class' => 'jaxon.ajax.callback.test')
      */
-    public function wrongNameAttr()
-    {
-    }
+public function wrongNameAttr()
+{
+}
 
-    /**
+/**
      * @callback('name' => 'jaxon.ajax callback.test')
      */
-    public function nameWithSpace()
-    {
-    }
+public function nameWithSpace()
+{
+}
 
-    /**
+/**
      * @callback('class' => '12jaxon.ajax.callback.test')
      */
-    public function startWithInt()
-    {
-    }
+public function startWithInt()
+{
+}
 }

jaxon-annotations/tests/Attr/Ajax/ContainerError.php

Switch Indentation +2 added lines, -2 removed lines

@@ -6,9 +6,9 @@
 
 class ContainerError extends FuncComponent
 {
-    /**
+/**
      * @di('class' => 'Class1')
      * @di('class' => 'Class2')
      */
-    public $prop;
+public $prop;
 }