jaxon-php / jaxon-core

src/Utils/Validation/Validator.php

Doc Comments +4 added lines, -4 removed lines

@@ -28,7 +28,7 @@ 
      *
      * @param string        $sName            The function name
      *
-     * @return bool            True if the function name is valid, and false if not
+     * @return integer            True if the function name is valid, and false if not
      */
     public function validateFunction($sName)
     {
@@ -40,7 +40,7 @@ 
      *
      * @param string        $sName            The event name
      *
-     * @return bool            True if the event name is valid, and false if not
+     * @return integer            True if the event name is valid, and false if not
      */
     public function validateEvent($sName)
     {
@@ -52,7 +52,7 @@ 
      *
      * @param string        $sName            The class name
      *
-     * @return bool            True if the class name is valid, and false if not
+     * @return integer            True if the class name is valid, and false if not
      */
     public function validateClass($sName)
     {
@@ -64,7 +64,7 @@ 
      *
      * @param string        $sName            The function name
      *
-     * @return bool            True if the method name is valid, and false if not
+     * @return integer            True if the method name is valid, and false if not
      */
     public function validateMethod($sName)
     {

Spacing +6 added lines, -6 removed lines

@@ -129,7 +129,7 @@ 
     {
         $xDefault = $this->xConfig->getOption('upload.default.' . $sProperty);
         $aAllowed = $this->xConfig->getOption('upload.files.' . $sName . '.' . $sProperty, $xDefault);
-        if(is_array($aAllowed) && !in_array($sValue, $aAllowed))
+        if (is_array($aAllowed) && !in_array($sValue, $aAllowed))
         {
             $this->sErrorMessage = $this->xTranslator->trans('errors.upload.' . $sField, $aUploadedFile);
             return false;
@@ -150,7 +150,7 @@ 
     {
         $xDefault = $this->xConfig->getOption('upload.default.' . $sProperty, 0);
         $iSize = $this->xConfig->getOption('upload.files.' . $sName . '.' . $sProperty, $xDefault);
-        if($iSize > 0 && (
+        if ($iSize > 0 && (
             ($sProperty == 'max-size' && $iFileSize > $iSize) ||
             ($sProperty == 'min-size' && $iFileSize < $iSize)))
         {
@@ -172,25 +172,25 @@ 
     {
         $this->sErrorMessage = '';
         // Verify the file extension
-        if(!$this->validateFileProperty($sName, $aUploadedFile['type'], 'types', 'type'))
+        if (!$this->validateFileProperty($sName, $aUploadedFile['type'], 'types', 'type'))
         {
             return false;
         }
 
         // Verify the file extension
-        if(!$this->validateFileProperty($sName, $aUploadedFile['extension'], 'extensions', 'extension'))
+        if (!$this->validateFileProperty($sName, $aUploadedFile['extension'], 'extensions', 'extension'))
         {
             return false;
         }
 
         // Verify the max size
-        if(!$this->validateFileSize($sName, $aUploadedFile['size'], 'max-size'))
+        if (!$this->validateFileSize($sName, $aUploadedFile['size'], 'max-size'))
         {
             return false;
         }
 
         // Verify the min size
-        if(!$this->validateFileSize($sName, $aUploadedFile['size'], 'min-size'))
+        if (!$this->validateFileSize($sName, $aUploadedFile['size'], 'min-size'))
         {
             return false;
         }

src/App/App.php

Spacing +5 added lines, -5 removed lines

@@ -28,7 +28,7 @@ 
      */
     public function setup($sConfigFile)
     {
-        if(!file_exists($sConfigFile))
+        if (!file_exists($sConfigFile))
         {
             throw new Exception("Unable to find config file at $sConfigFile");
         }
@@ -38,13 +38,13 @@ 
         $aLibOptions = key_exists('lib', $aOptions) ? $aOptions['lib'] : [];
         $aAppOptions = key_exists('app', $aOptions) ? $aOptions['app'] : [];
 
-        if(!is_array($aLibOptions) || !is_array($aAppOptions))
+        if (!is_array($aLibOptions) || !is_array($aAppOptions))
         {
             throw new Exception("Unexpected content in config file at $sConfigFile");
         }
 
         // Set the session manager
-        jaxon()->di()->setSessionManager(function () {
+        jaxon()->di()->setSessionManager(function() {
             return new SessionManager();
         });
 
@@ -67,7 +67,7 @@ 
     {
         $jaxon = jaxon();
         // Only if the response is not yet sent
-        if(!$jaxon->getOption('core.response.send'))
+        if (!$jaxon->getOption('core.response.send'))
         {
             // Set the HTTP response code
             http_response_code(intval($code));
@@ -75,7 +75,7 @@ 
             // Send the response
             $jaxon->di()->getResponseManager()->sendOutput();
 
-            if(($jaxon->getOption('core.process.exit')))
+            if (($jaxon->getOption('core.process.exit')))
             {
                 exit();
             }

src/Request/Handler.php

Spacing +19 added lines, -19 removed lines

@@ -144,7 +144,7 @@ 
     public function onBefore(&$bEndRequest)
     {
         // Call the user defined callback
-        if(($xCallback = $this->xCallbackManager->before()))
+        if (($xCallback = $this->xCallbackManager->before()))
         {
             call_user_func_array($xCallback, [$this->xTargetRequestPlugin->getTarget(), &$bEndRequest]);
         }
@@ -157,7 +157,7 @@ 
      */
     public function onAfter($bEndRequest)
     {
-        if(($xCallback = $this->xCallbackManager->after()))
+        if (($xCallback = $this->xCallbackManager->after()))
         {
             call_user_func_array($xCallback, [$this->xTargetRequestPlugin->getTarget(), $bEndRequest]);
         }
@@ -170,7 +170,7 @@ 
      */
     public function onInvalid($sMessage)
     {
-        if(($xCallback = $this->xCallbackManager->invalid()))
+        if (($xCallback = $this->xCallbackManager->invalid()))
         {
             call_user_func_array($xCallback, [$sMessage]);
         }
@@ -183,7 +183,7 @@ 
      */
     public function onError(Exception $xException)
     {
-        if(($xCallback = $this->xCallbackManager->error()))
+        if (($xCallback = $this->xCallbackManager->error()))
         {
             call_user_func_array($xCallback, [$xException]);
         }
@@ -203,15 +203,15 @@ 
     public function canProcessRequest()
     {
         // Return true if the request plugin was already found
-        if(($this->xTargetRequestPlugin))
+        if (($this->xTargetRequestPlugin))
         {
             return true;
         }
 
         // Find a plugin to process the request
-        foreach($this->xPluginManager->getRequestPlugins() as $xPlugin)
+        foreach ($this->xPluginManager->getRequestPlugins() as $xPlugin)
         {
-            if($xPlugin->getName() != Jaxon::FILE_UPLOAD && $xPlugin->canProcessRequest())
+            if ($xPlugin->getName() != Jaxon::FILE_UPLOAD && $xPlugin->canProcessRequest())
             {
                 $this->xTargetRequestPlugin = $xPlugin;
                 return true;
@@ -235,7 +235,7 @@ 
     public function processRequest()
     {
         // Check to see if headers have already been sent out, in which case we can't do our job
-        if(headers_sent($filename, $linenumber))
+        if (headers_sent($filename, $linenumber))
         {
             echo $this->trans('errors.output.already-sent', [
                 'location' => $filename . ':' . $linenumber
@@ -244,7 +244,7 @@ 
         }
 
         // Check if there is a plugin to process this request
-        if(!$this->canProcessRequest())
+        if (!$this->canProcessRequest())
         {
             return;
         }
@@ -252,12 +252,12 @@ 
         $bEndRequest = false;
 
         // Handle before processing event
-        if(($this->xTargetRequestPlugin))
+        if (($this->xTargetRequestPlugin))
         {
             $this->onBefore($bEndRequest);
         }
 
-        if(!$bEndRequest)
+        if (!$bEndRequest)
         {
             try
             {
@@ -265,12 +265,12 @@ 
                 $this->xUploadRequestPlugin->processRequest();
 
                 // Process the request
-                if(($this->xTargetRequestPlugin))
+                if (($this->xTargetRequestPlugin))
                 {
                     $this->xTargetRequestPlugin->processRequest();
                 }
             }
-            catch(Exception $e)
+            catch (Exception $e)
             {
                 // An exception was thrown while processing the request.
                 // The request missed the corresponding handler function,
@@ -278,7 +278,7 @@ 
 
                 $this->xResponseManager->error($e->getMessage());
 
-                if($e instanceof \Jaxon\Exception\Error)
+                if ($e instanceof \Jaxon\Exception\Error)
                 {
                     $this->onInvalid($e->getMessage());
                 }
@@ -290,7 +290,7 @@ 
         }
 
         // Clean the processing buffer
-        if(($this->getOption('core.process.clean')))
+        if (($this->getOption('core.process.clean')))
         {
             $er = error_reporting(0);
             while (ob_get_level() > 0)
@@ -300,25 +300,25 @@ 
             error_reporting($er);
         }
 
-        if(($this->xTargetRequestPlugin))
+        if (($this->xTargetRequestPlugin))
         {
             // Handle after processing event
             $this->onAfter($bEndRequest);
         }
 
         // If the called function returned no response, take the the global response
-        if(!$this->xResponseManager->getResponse())
+        if (!$this->xResponseManager->getResponse())
         {
             $this->xResponseManager->append(jaxon()->getResponse());
         }
 
         $this->xResponseManager->printDebug();
 
-        if(($this->getOption('core.response.send')))
+        if (($this->getOption('core.response.send')))
         {
             $this->xResponseManager->sendOutput();
 
-            if(($this->getOption('core.process.exit')))
+            if (($this->getOption('core.process.exit')))
             {
                 exit();
             }