jaxon-php / jaxon-core

src/Request/Request.php

Spacing +17 added lines, -17 removed lines

@@ -70,9 +70,9 @@ 
      */
     public function hasPageNumber()
     {
-        foreach($this->aParameters as $xParameter)
+        foreach ($this->aParameters as $xParameter)
         {
-            if($xParameter->getType() == Jaxon::PAGE_NUMBER)
+            if ($xParameter->getType() == Jaxon::PAGE_NUMBER)
             {
                 return true;
             }
@@ -90,9 +90,9 @@ 
     public function setPageNumber($nPageNumber)
     {
         // Set the value of the Jaxon::PAGE_NUMBER parameter
-        foreach($this->aParameters as $xParameter)
+        foreach ($this->aParameters as $xParameter)
         {
-            if($xParameter->getType() == Jaxon::PAGE_NUMBER)
+            if ($xParameter->getType() == Jaxon::PAGE_NUMBER)
             {
                 $xParameter->setValue(intval($nPageNumber));
                 break;
@@ -112,7 +112,7 @@ 
     {
         $this->sCondition = '__confirm__';
         $this->aMessageArgs = func_get_args();
-        array_walk($this->aMessageArgs, function (&$xParameter) {
+        array_walk($this->aMessageArgs, function(&$xParameter) {
             $xParameter = Parameter::make($xParameter);
         });
         return $this;
@@ -245,7 +245,7 @@ 
     public function else($sMessage)
     {
         $this->aMessageArgs = func_get_args();
-        array_walk($this->aMessageArgs, function (&$xParameter) {
+        array_walk($this->aMessageArgs, function(&$xParameter) {
             $xParameter = Parameter::make($xParameter);
         });
         return $this;
@@ -270,12 +270,12 @@ 
         // This array will avoid declaring multiple variables with the same value.
         // The array key is the variable value, while the array value is the variable name.
         $aVariables = array(); // Array of local variables.
-        foreach($this->aParameters as &$xParameter)
+        foreach ($this->aParameters as &$xParameter)
         {
             $sParameterStr = $xParameter->getScript();
-            if($xParameter instanceof \Jaxon\JQuery\Dom\Element)
+            if ($xParameter instanceof \Jaxon\JQuery\Dom\Element)
             {
-                if(!array_key_exists($sParameterStr, $aVariables))
+                if (!array_key_exists($sParameterStr, $aVariables))
                 {
                     // The value is not yet defined. A new variable is created.
                     $sVarName = "jxnVar$nVarId";
@@ -293,19 +293,19 @@ 
         }
 
         $sPhrase = '';
-        if(count($this->aMessageArgs) > 0)
+        if (count($this->aMessageArgs) > 0)
         {
             $sPhrase = array_shift($this->aMessageArgs); // The first array entry is the question.
             // $sPhrase = "'" . addslashes($sPhrase) . "'"; // Wrap the phrase with single quotes
-            if(count($this->aMessageArgs) > 0)
+            if (count($this->aMessageArgs) > 0)
             {
                 $nParamId = 1;
-                foreach($this->aMessageArgs as &$xParameter)
+                foreach ($this->aMessageArgs as &$xParameter)
                 {
                     $sParameterStr = $xParameter->getScript();
-                    if($xParameter instanceof \Jaxon\JQuery\Dom\Element)
+                    if ($xParameter instanceof \Jaxon\JQuery\Dom\Element)
                     {
-                        if(!array_key_exists($sParameterStr, $aVariables))
+                        if (!array_key_exists($sParameterStr, $aVariables))
                         {
                             // The value is not yet defined. A new variable is created.
                             $sVarName = "jxnVar$nVarId";
@@ -328,15 +328,15 @@ 
         }
 
         $sScript = $this->getOption('core.prefix.' . $this->sType) . parent::getScript();
-        if($this->sCondition == '__confirm__')
+        if ($this->sCondition == '__confirm__')
         {
             $xConfirm = $this->getPluginManager()->getConfirm();
             $sScript = $xConfirm->confirm($sPhrase, $sScript, '');
         }
-        elseif($this->sCondition !== null)
+        elseif ($this->sCondition !== null)
         {
             $sScript = 'if(' . $this->sCondition . '){' . $sScript . ';}';
-            if(($sPhrase))
+            if (($sPhrase))
             {
                 $xAlert = $this->getPluginManager()->getAlert();
                 $xAlert->setReturn(true);

Braces +6 added lines, -7 removed lines

@@ -242,9 +242,11 @@ 
      *
      * @return Request
      */
-    public function else($sMessage)
+    public function else {
+        ($sMessage)
     {
         $this->aMessageArgs = func_get_args();
+    }
         array_walk($this->aMessageArgs, function (&$xParameter) {
             $xParameter = Parameter::make($xParameter);
         });
@@ -282,8 +284,7 @@ 
                     $aVariables[$sParameterStr] = $sVarName;
                     $sVars .= "$sVarName=$xParameter;";
                     $nVarId++;
-                }
-                else
+                } else
                 {
                     // The value is already defined. The corresponding variable is assigned.
                     $sVarName = $aVariables[$sParameterStr];
@@ -312,8 +313,7 @@ 
                             $aVariables[$sParameterStr] = $sVarName;
                             $sVars .= "$sVarName=$xParameter;";
                             $nVarId++;
-                        }
-                        else
+                        } else
                         {
                             // The value is already defined. The corresponding variable is assigned.
                             $sVarName = $aVariables[$sParameterStr];
@@ -332,8 +332,7 @@ 
         {
             $xConfirm = $this->getPluginManager()->getConfirm();
             $sScript = $xConfirm->confirm($sPhrase, $sScript, '');
-        }
-        elseif($this->sCondition !== null)
+        } elseif($this->sCondition !== null)
         {
             $sScript = 'if(' . $this->sCondition . '){' . $sScript . ';}';
             if(($sPhrase))

src/Request/Plugin/CallableObject.php

Spacing +23 added lines, -23 removed lines

@@ -67,19 +67,19 @@ 
         $this->sRequestedClass = null;
         $this->sRequestedMethod = null;
 
-        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'];
         }
@@ -104,33 +104,33 @@ 
      */
     public function register($aArgs)
     {
-        if(count($aArgs) > 1)
+        if (count($aArgs) > 1)
         {
             $sType = $aArgs[0];
 
-            if($sType == Jaxon::CALLABLE_OBJECT)
+            if ($sType == Jaxon::CALLABLE_OBJECT)
             {
                 $xCallableObject = $aArgs[1];
 
-                if(!is_object($xCallableObject) && !is_string($xCallableObject))
+                if (!is_object($xCallableObject) && !is_string($xCallableObject))
                 {
                     throw new \Jaxon\Exception\Error($this->trans('errors.objects.instance'));
                 }
-                if(is_string($xCallableObject) && !class_exists($xCallableObject))
+                if (is_string($xCallableObject) && !class_exists($xCallableObject))
                 {
                     throw new \Jaxon\Exception\Error($this->trans('errors.objects.instance'));
                 }
-                if(!($xCallableObject instanceof \Jaxon\Request\Support\CallableObject))
+                if (!($xCallableObject instanceof \Jaxon\Request\Support\CallableObject))
                 {
                     $xCallableObject = new \Jaxon\Request\Support\CallableObject($xCallableObject);
                 }
-                if(count($aArgs) > 2 && is_array($aArgs[2]))
+                if (count($aArgs) > 2 && is_array($aArgs[2]))
                 {
-                    foreach($aArgs[2] as $sKey => $aValue)
+                    foreach ($aArgs[2] as $sKey => $aValue)
                     {
-                        foreach($aValue as $sName => $sValue)
+                        foreach ($aValue as $sName => $sValue)
                         {
-                            if($sName == 'classpath' && $sValue != '')
+                            if ($sName == 'classpath' && $sValue != '')
                                 $this->aClassPaths[] = $sValue;
                             $xCallableObject->configure($sKey, $sName, $sValue);
                         }
@@ -155,7 +155,7 @@ 
     public function generateHash()
     {
         $sHash = '';
-        foreach($this->aCallableObjects as $xCallableObject)
+        foreach ($this->aCallableObjects as $xCallableObject)
         {
             $sHash .= $xCallableObject->getName();
             $sHash .= implode('|', $xCallableObject->getMethods());
@@ -174,15 +174,15 @@ 
         // Generate code for javascript classes declaration
         $code = '';
         $classes = array();
-        foreach($this->aClassPaths as $sClassPath)
+        foreach ($this->aClassPaths as $sClassPath)
         {
             $offset = 0;
             $sClassPath .= '.Null'; // This is a sentinel. The last token is not processed in the while loop.
-            while(($dotPosition = strpos($sClassPath, '.', $offset)) !== false)
+            while (($dotPosition = strpos($sClassPath, '.', $offset)) !== false)
             {
                 $class = substr($sClassPath, 0, $dotPosition);
                 // Generate code for this class
-                if(!array_key_exists($class, $classes))
+                if (!array_key_exists($class, $classes))
                 {
                     $code .= "$sJaxonPrefix$class = {};\n";
                     $classes[$class] = $class;
@@ -191,7 +191,7 @@ 
             }
         }
 
-        foreach($this->aCallableObjects as $xCallableObject)
+        foreach ($this->aCallableObjects as $xCallableObject)
         {
             $code .= $xCallableObject->getScript();
         }
@@ -206,13 +206,13 @@ 
     public function canProcessRequest()
     {
         // Check the validity of the class name
-        if(($this->sRequestedClass) && !$this->validateClass($this->sRequestedClass))
+        if (($this->sRequestedClass) && !$this->validateClass($this->sRequestedClass))
         {
             $this->sRequestedClass = null;
             $this->sRequestedMethod = null;
         }
         // Check the validity of the method name
-        if(($this->sRequestedMethod) && !$this->validateMethod($this->sRequestedMethod))
+        if (($this->sRequestedMethod) && !$this->validateMethod($this->sRequestedMethod))
         {
             $this->sRequestedClass = null;
             $this->sRequestedMethod = null;
@@ -227,20 +227,20 @@ 
      */
     public function processRequest()
     {
-        if(!$this->canProcessRequest())
+        if (!$this->canProcessRequest())
             return false;
 
         $aArgs = $this->getRequestManager()->process();
 
         // Register an instance of the requested class, if it isn't yet
-        if(!($xCallableObject = $this->getCallableObject($this->sRequestedClass)))
+        if (!($xCallableObject = $this->getCallableObject($this->sRequestedClass)))
         {
             $this->getPluginManager()->registerClass($this->sRequestedClass);
             $xCallableObject = $this->getCallableObject($this->sRequestedClass);
         }
 
         // Find the requested method
-        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',