jaxon-php / jaxon-core

src/Request/Plugin/FileUpload.php

Spacing +10 added lines, -10 removed lines

@@ -49,12 +49,12 @@ 
         $this->aUserFiles = [];
         $this->aFiles = [];
 
-        foreach($_FILES as $sVarName => $aFile)
+        foreach ($_FILES as $sVarName => $aFile)
         {
             $this->aFiles[$sVarName] = [];
-            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++)
                 {
                     // Copy the file data into the local array
                     $this->aFiles[$sVarName][] = [
@@ -158,25 +158,25 @@ 
         // Default upload dir
         $sDefaultUploadDir = $this->getOption('upload.default.dir');
         // Check validity of the uploaded files
-        foreach($this->aFiles as $sVarName => $aFiles)
+        foreach ($this->aFiles as $sVarName => $aFiles)
         {
             $this->aUserFiles[$sVarName] = [];
-            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());
                 }
                 // Verify that the upload dir exists and is writable
                 $sUploadDir = trim($this->getOption('upload.files.' . $sVarName . '.dir', $sDefaultUploadDir));
                 $sUploadDir = rtrim($sUploadDir, DIRECTORY_SEPARATOR) . DIRECTORY_SEPARATOR;
-                if(!is_writable($sUploadDir))
+                if (!is_writable($sUploadDir))
                 {
                     throw new \Jaxon\Exception\Error($this->trans('errors.upload.access'));
                 }
@@ -192,9 +192,9 @@ 
             }
         }
         // Copy the uploaded files from the temp dir to the user dir
-        foreach($this->aFiles as $sVarName => $aFiles)
+        foreach ($this->aFiles as $sVarName => $aFiles)
         {
-            for($i = 0; $i < count($aFiles); $i++)
+            for ($i = 0; $i < count($aFiles); $i++)
             {
                 // All's right, move the file to the user dir.
                 move_uploaded_file($aFiles[$i]["tmp_name"], $this->aUserFiles[$sVarName][$i]["path"]);

Braces +1 added lines, -2 removed lines

@@ -67,8 +67,7 @@
                         'extension' => pathinfo($aFile['name'][$i], PATHINFO_EXTENSION),
                     ];
                 }
-            }
-            else
+            } else
             {
                 // Copy the file data into the local array
                 $this->aFiles[$sVarName][] = [

src/Request/Support/UserFunction.php

Spacing +7 added lines, -7 removed lines

@@ -90,13 +90,13 @@ 
     {
         $this->aConfiguration = array();
         $this->sAlias = '';
-        if(is_array($sUserFunction))
+        if (is_array($sUserFunction))
         {
-            if(count($sUserFunction) != 2 && count($sUserFunction) != 3)
+            if (count($sUserFunction) != 2 && count($sUserFunction) != 3)
             {
                 throw new \Jaxon\Exception\Error($this->trans('errors.functions.invalid-declaration'));
             }
-            if(count($sUserFunction) == 3)
+            if (count($sUserFunction) == 3)
             {
                 $this->sAlias = $sUserFunction[0];
                 $this->sUserFunction = array_slice($sUserFunction, 1);
@@ -106,7 +106,7 @@ 
                 $this->sUserFunction = $sUserFunction;
             }
         }
-        elseif(is_string($sUserFunction))
+        elseif (is_string($sUserFunction))
         {
             $this->sUserFunction = $sUserFunction;
         }
@@ -124,7 +124,7 @@ 
     public function getName()
     {
         // Do not use sAlias here!
-        if(is_array($this->sUserFunction))
+        if (is_array($this->sUserFunction))
         {
             return $this->sUserFunction[1];
         }
@@ -141,7 +141,7 @@ 
      */
     public function configure($sName, $sValue)
     {
-        switch($sName)
+        switch ($sName)
         {
         case 'alias':
             $this->sAlias = $sValue;
@@ -195,7 +195,7 @@ 
      */
     public function call($aArgs = array())
     {
-        if(($this->sInclude))
+        if (($this->sInclude))
         {
             require_once $this->sInclude;
         }

src/Utils/Validation/Validator.php

Spacing +4 added lines, -4 removed lines

@@ -129,7 +129,7 @@ 
         // Verify the file extension
         $xDefault = $this->xConfig->getOption('upload.default.types');
         $aAllowed = $this->xConfig->getOption('upload.files.' . $sName . '.types', $xDefault);
-        if(is_array($aAllowed) && !in_array($aUploadedFile['type'], $aAllowed))
+        if (is_array($aAllowed) && !in_array($aUploadedFile['type'], $aAllowed))
         {
             $this->sErrorMessage = $this->xTranslator->trans('errors.upload.type', $aUploadedFile);
             return false;
@@ -137,7 +137,7 @@ 
         // Verify the file extension
         $xDefault = $this->xConfig->getOption('upload.default.extensions');
         $aAllowed = $this->xConfig->getOption('upload.files.' . $sName . '.extensions', $xDefault);
-        if(is_array($aAllowed) && !in_array($aUploadedFile['extension'], $aAllowed))
+        if (is_array($aAllowed) && !in_array($aUploadedFile['extension'], $aAllowed))
         {
             $this->sErrorMessage = $this->xTranslator->trans('errors.upload.extension', $aUploadedFile);
             return false;
@@ -145,7 +145,7 @@ 
         // Verify the max size
         $xDefault = $this->xConfig->getOption('upload.default.max-size', 0);
         $iSize = $this->xConfig->getOption('upload.files.' . $sName . '.max-size', $xDefault);
-        if($iSize > 0 && $aUploadedFile['size'] > $iSize)
+        if ($iSize > 0 && $aUploadedFile['size'] > $iSize)
         {
             $this->sErrorMessage = $this->xTranslator->trans('errors.upload.max-size', $aUploadedFile);
             return false;
@@ -153,7 +153,7 @@ 
         // Verify the min size
         $xDefault = $this->xConfig->getOption('upload.default.min-size', 0);
         $iSize = $this->xConfig->getOption('upload.files.' . $sName . '.min-size', $xDefault);
-        if($iSize > 0 && $aUploadedFile['size'] < $iSize)
+        if ($iSize > 0 && $aUploadedFile['size'] < $iSize)
         {
             $this->sErrorMessage = $this->xTranslator->trans('errors.upload.min-size', $aUploadedFile);
             return false;

src/Utils/Translation/Translator.php

Indentation +1 added lines, -1 removed lines

@@ -121,7 +121,7 @@
         }
         if(!array_key_exists($sLanguage, $this->aTranslations) || !array_key_exists($sText, $this->aTranslations[$sLanguage]))
         {
-           return $sText;
+            return $sText;
         }
         $message = $this->aTranslations[$sLanguage][$sText];
         foreach($aPlaceHolders as $name => $value)

Spacing +9 added lines, -9 removed lines

@@ -55,11 +55,11 @@ 
      */
     private function _loadTranslations($sLanguage, $sPrefix, array $aTranslations)
     {
-        foreach($aTranslations as $sName => $xTranslation)
+        foreach ($aTranslations as $sName => $xTranslation)
         {
             $sName = trim($sName);
             $sName = ($sPrefix) ? $sPrefix . '.' . $sName : $sName;
-            if(!is_array($xTranslation))
+            if (!is_array($xTranslation))
             {
                 // Save this translation
                 $this->aTranslations[$sLanguage][$sName] = $xTranslation;
@@ -82,17 +82,17 @@ 
      */
     public function loadTranslations($sFilePath, $sLanguage)
     {
-        if(!file_exists($sFilePath))
+        if (!file_exists($sFilePath))
         {
             return;
         }
         $aTranslations = require($sFilePath);
-        if(!is_array($aTranslations))
+        if (!is_array($aTranslations))
         {
             return;
         }
         // Load the translations
-        if(!array_key_exists($sLanguage, $this->aTranslations))
+        if (!array_key_exists($sLanguage, $this->aTranslations))
         {
             $this->aTranslations[$sLanguage] = [];
         }
@@ -111,20 +111,20 @@ 
     public function trans($sText, array $aPlaceHolders = array(), $sLanguage = null)
     {
         $sText = trim((string)$sText);
-        if(!$sLanguage)
+        if (!$sLanguage)
         {
             $sLanguage = $this->xConfig->getOption('language');
         }
-        if(!$sLanguage)
+        if (!$sLanguage)
         {
             $sLanguage = $this->sDefaultLocale;
         }
-        if(!array_key_exists($sLanguage, $this->aTranslations) || !array_key_exists($sText, $this->aTranslations[$sLanguage]))
+        if (!array_key_exists($sLanguage, $this->aTranslations) || !array_key_exists($sText, $this->aTranslations[$sLanguage]))
         {
            return $sText;
         }
         $message = $this->aTranslations[$sLanguage][$sText];
-        foreach($aPlaceHolders as $name => $value)
+        foreach ($aPlaceHolders as $name => $value)
         {
             $message = str_replace(':' . $name, $value, $message);
         }

Braces +1 added lines, -2 removed lines

@@ -63,8 +63,7 @@
             {
                 // Save this translation
                 $this->aTranslations[$sLanguage][$sName] = $xTranslation;
-            }
-            else
+            } else
             {
                 // Recursively read the translations in the array
                 $this->_loadTranslations($sLanguage, $sName, $xTranslation);

src/Utils/Container.php

Spacing +22 added lines, -22 removed lines

@@ -27,7 +27,7 @@ 
 
     public static function getInstance()
     {
-        if(!self::$xInstance)
+        if (!self::$xInstance)
         {
             self::$xInstance = new Container();
         }
@@ -65,19 +65,19 @@ 
          * Managers
          */
         // Plugin Manager
-        $this->di['plugin_manager'] = function ($c) {
+        $this->di['plugin_manager'] = function($c) {
             return new \Jaxon\Plugin\Manager();
         };
         // Request Manager
-        $this->di['request_manager'] = function ($c) {
+        $this->di['request_manager'] = function($c) {
             return new \Jaxon\Request\Manager();
         };
         // Request Factory
-        $this->di['request_factory'] = function ($c) {
+        $this->di['request_factory'] = function($c) {
             return new \Jaxon\Request\Factory();
         };
         // Response Manager
-        $this->di['response_manager'] = function ($c) {
+        $this->di['response_manager'] = function($c) {
             return new \Jaxon\Response\Manager();
         };
 
@@ -85,35 +85,35 @@ 
          * Services
          */
         // Config manager
-        $this->di['config'] = function ($c) {
+        $this->di['config'] = function($c) {
             return new Config\Config();
         };
         // Minifier
-        $this->di['minifier'] = function ($c) {
+        $this->di['minifier'] = function($c) {
             return new Template\Minifier();
         };
         // Translator
-        $this->di['translator'] = function ($c) {
+        $this->di['translator'] = function($c) {
             return new Translation\Translator($c['translation_dir'], $c['config']);
         };
         // Template engine
-        $this->di['template'] = function ($c) {
+        $this->di['template'] = function($c) {
             return new Template\Template($c['template_dir']);
         };
         // Validator
-        $this->di['validator'] = function ($c) {
+        $this->di['validator'] = function($c) {
             return new Validation\Validator($c['translator'], $c['config']);
         };
         // Pagination Renderer
-        $this->di['pagination.renderer'] = function ($c) {
+        $this->di['pagination.renderer'] = function($c) {
             return new Pagination\Renderer();
         };
         // Pagination Paginator
-        $this->di['pagination.paginator'] = function ($c) {
+        $this->di['pagination.paginator'] = function($c) {
             return new Pagination\Paginator($c['pagination.renderer']);
         };
         // Event Dispatcher
-        $this->di['events'] = function ($c) {
+        $this->di['events'] = function($c) {
             return new EventDispatcher();
         };
 
@@ -121,27 +121,27 @@ 
          * Core library objects
          */
         // Global Response
-        $this->di['response'] = function ($c) {
+        $this->di['response'] = function($c) {
             return new \Jaxon\Response\Response();
         };
         // Jaxon Core
-        $this->di['jaxon'] = function ($c) {
+        $this->di['jaxon'] = function($c) {
             return new \Jaxon\Jaxon();
         };
         // Jaxon Sentry
-        $this->di['sentry'] = function ($c) {
+        $this->di['sentry'] = function($c) {
             // This class is not defined in this package
             $sClass = '\\Jaxon\\Sentry\\Sentry';
             return new $sClass;
         };
         // Armada
-        $this->di['armada'] = function ($c) {
+        $this->di['armada'] = function($c) {
             // This class is not defined in this package
             $sClass = '\\Jaxon\\Armada\\Armada';
             return new $sClass;
         };
         // View Renderer Facade
-        $this->di['sentry.view.renderer'] = function ($c) {
+        $this->di['sentry.view.renderer'] = function($c) {
             $aRenderers = $c['view.data.renderers'];
             $sDefaultNamespace = $c['view.data.namespace.default'];
             return new \Jaxon\Sentry\View\Facade($aRenderers, $sDefaultNamespace);
@@ -391,14 +391,14 @@ 
         $this->di['sentry.view.base.' . $sId] = $xClosure;
 
         // Return the initialized view renderer
-        $this->di['sentry.view.' . $sId] = function ($c) use ($sId) {
+        $this->di['sentry.view.' . $sId] = function($c) use ($sId) {
             // Get the defined renderer
             $renderer = $c['sentry.view.base.' . $sId];
             // Init the renderer with the template namespaces
             $aNamespaces = $this->di['view.data.namespaces'];
-            if(key_exists($sId, $aNamespaces))
+            if (key_exists($sId, $aNamespaces))
             {
-                foreach($aNamespaces[$sId] as $ns)
+                foreach ($aNamespaces[$sId] as $ns)
                 {
                     $renderer->addNamespace($ns['namespace'], $ns['directory'], $ns['extension']);
                 }
@@ -416,7 +416,7 @@ 
      */
     public function getViewRenderer($sId = '')
     {
-        if(!$sId)
+        if (!$sId)
         {
             // Return the view renderer facade
             return $this->di['sentry.view.renderer'];