jaxon-php / jaxon-core

src/Plugin/Request/CallableClass/CallableObjectOptions.php

Switch Indentation +37 added lines, -37 removed lines

@@ -173,36 +173,36 @@ 
         switch($sName)
         {
         // Set the separator
-        case 'separator':
-            if($xValue === '_' || $xValue === '.')
-            {
-                $this->sSeparator = $xValue;
-            }
-            break;
-        // Set the protected methods
-        case 'protected':
-            if(is_array($xValue))
-            {
-                $this->aProtectedMethods = array_merge($this->aProtectedMethods, $xValue);
-            }
-            break;
-        // Set the methods to call before processing the request
-        case '__before':
-            $this->setHookMethods($this->aBeforeMethods, $xValue);
-            break;
-        // Set the methods to call after processing the request
-        case '__after':
-            $this->setHookMethods($this->aAfterMethods, $xValue);
-            break;
-        // Set the attributes to inject in the callable object
-        case '__di':
-            $this->addDiOption($xValue);
-            break;
-        case 'excluded':
-            $this->bExcluded = (bool)$xValue;
-            break;
-        default:
-            break;
+            case 'separator':
+                if($xValue === '_' || $xValue === '.')
+                {
+                    $this->sSeparator = $xValue;
+                }
+                break;
+            // Set the protected methods
+            case 'protected':
+                if(is_array($xValue))
+                {
+                    $this->aProtectedMethods = array_merge($this->aProtectedMethods, $xValue);
+                }
+                break;
+            // Set the methods to call before processing the request
+            case '__before':
+                $this->setHookMethods($this->aBeforeMethods, $xValue);
+                break;
+            // Set the methods to call after processing the request
+            case '__after':
+                $this->setHookMethods($this->aAfterMethods, $xValue);
+                break;
+            // Set the attributes to inject in the callable object
+            case '__di':
+                $this->addDiOption($xValue);
+                break;
+            case 'excluded':
+                $this->bExcluded = (bool)$xValue;
+                break;
+            default:
+                break;
         }
     }
 
@@ -251,13 +251,13 @@ 
         switch($sOptionName)
         {
         // For databags, all the value are merged in a single array.
-        case 'bags':
-            $this->_addJsArrayOption($sFunctionName, $sOptionName, $xOptionValue);
-            return;
-        // For all the other options, including callback, only the last value is kept.
-        case 'callback':
-        default:
-            $this->_setJsOption($sFunctionName, $sOptionName, $xOptionValue);
+            case 'bags':
+                $this->_addJsArrayOption($sFunctionName, $sOptionName, $xOptionValue);
+                return;
+            // For all the other options, including callback, only the last value is kept.
+            case 'callback':
+            default:
+                $this->_setJsOption($sFunctionName, $sOptionName, $xOptionValue);
         }
     }
 

Braces +1 added lines, -2 removed lines

@@ -186,8 +186,7 @@
             if(is_array($xMethodToCall))
             {
                 $aHookMethods[$sCalledMethod] = $xMethodToCall;
-            }
-            elseif(is_string($xMethodToCall))
+            } elseif(is_string($xMethodToCall))
             {
                 $aHookMethods[$sCalledMethod] = [$xMethodToCall];
             }

Spacing +19 added lines, -21 removed lines

@@ -80,8 +80,8 @@ 
     public function __construct(array $aOptions, array $aAnnotations)
     {
         [$bExcluded, $aAnnotationOptions, $aAnnotationProtected] = $aAnnotations;
-        $this->bExcluded = $bExcluded || (bool)($aOptions['excluded'] ?? false);
-        if($this->bExcluded)
+        $this->bExcluded = $bExcluded || (bool) ($aOptions['excluded'] ?? false);
+        if ($this->bExcluded)
         {
             return;
         }
@@ -89,15 +89,15 @@ 
         $this->addOption('separator', $aOptions['separator']);
         $this->addOption('protected', array_merge($aOptions['protected'], $aAnnotationProtected));
 
-        foreach($aOptions['functions'] as $sNames => $aFunctionOptions)
+        foreach ($aOptions['functions'] as $sNames => $aFunctionOptions)
         {
             $aFunctionNames = explode(',', $sNames); // Names are in comma-separated list.
-            foreach($aFunctionNames as $sFunctionName)
+            foreach ($aFunctionNames as $sFunctionName)
             {
                 $this->addFunctionOptions($sFunctionName, $aFunctionOptions);
             }
         }
-        foreach($aAnnotationOptions as $sFunctionName => $aFunctionOptions)
+        foreach ($aAnnotationOptions as $sFunctionName => $aFunctionOptions)
         {
             $this->addFunctionOptions($sFunctionName, $aFunctionOptions);
         }
@@ -171,13 +171,13 @@ 
      */
     private function setHookMethods(array &$aHookMethods, $xValue)
     {
-        foreach($xValue as $sCalledMethod => $xMethodToCall)
+        foreach ($xValue as $sCalledMethod => $xMethodToCall)
         {
-            if(is_array($xMethodToCall))
+            if (is_array($xMethodToCall))
             {
                 $aHookMethods[$sCalledMethod] = $xMethodToCall;
             }
-            elseif(is_string($xMethodToCall))
+            elseif (is_string($xMethodToCall))
             {
                 $aHookMethods[$sCalledMethod] = [$xMethodToCall];
             }
@@ -202,18 +202,18 @@ 
      */
     public function addOption(string $sName, $xValue)
     {
-        switch($sName)
+        switch ($sName)
         {
         // Set the separator
         case 'separator':
-            if($xValue === '_' || $xValue === '.')
+            if ($xValue === '_' || $xValue === '.')
             {
                 $this->sSeparator = $xValue;
             }
             break;
         // Set the protected methods
         case 'protected':
-            if(is_array($xValue))
+            if (is_array($xValue))
             {
                 $this->aProtectedMethods = array_merge($this->aProtectedMethods, $xValue);
             }
@@ -231,7 +231,7 @@ 
             $this->addDiOption($xValue);
             break;
         case 'excluded':
-            $this->bExcluded = (bool)$xValue;
+            $this->bExcluded = (bool) $xValue;
             break;
         default:
             break;
@@ -247,11 +247,11 @@ 
      */
     private function _addJsArrayOption(string $sFunctionName, string $sOptionName, $xOptionValue)
     {
-        if(is_string($xOptionValue))
+        if (is_string($xOptionValue))
         {
             $xOptionValue = [$xOptionValue];
         }
-        if(!is_array($xOptionValue))
+        if (!is_array($xOptionValue))
         {
             return; // Do not save.
         }
@@ -280,7 +280,7 @@ 
      */
     private function addJsOption(string $sFunctionName, string $sOptionName, $xOptionValue)
     {
-        switch($sOptionName)
+        switch ($sOptionName)
         {
         // For databags, all the value are merged in a single array.
         case 'bags':
@@ -301,12 +301,11 @@ 
      */
     private function addFunctionOptions(string $sFunctionName, array $aFunctionOptions)
     {
-        foreach($aFunctionOptions as $sOptionName => $xOptionValue)
+        foreach ($aFunctionOptions as $sOptionName => $xOptionValue)
         {
             substr($sOptionName, 0, 2) === '__' ?
                 // Options for PHP classes. They start with "__".
-                $this->addOption($sOptionName, [$sFunctionName => $xOptionValue]) :
-                // Options for javascript code.
+                $this->addOption($sOptionName, [$sFunctionName => $xOptionValue]) : // Options for javascript code.
                 $this->addJsOption($sFunctionName, $sOptionName, $xOptionValue);
         }
     }
@@ -322,12 +321,11 @@ 
         $aOptions = array_merge($this->aJsOptions['*'] ?? []); // Clone the array
         // Then add the method options.
         $aMethodOptions = $this->aJsOptions[$sMethodName] ?? [];
-        foreach($aMethodOptions as $sOptionName => $xOptionValue)
+        foreach ($aMethodOptions as $sOptionName => $xOptionValue)
         {
             // For databags, merge the values in a single array.
             // For all the other options, including callback, keep the last value.
-            $aOptions[$sOptionName] = $sOptionName !== 'bags' ? $xOptionValue :
-                array_unique(array_merge($aOptions[$sOptionName] ?? [], $xOptionValue));
+            $aOptions[$sOptionName] = $sOptionName !== 'bags' ? $xOptionValue : array_unique(array_merge($aOptions[$sOptionName] ?? [], $xOptionValue));
         }
         return $aOptions;
     }

src/Plugin/Request/CallableClass/CallableObject.php

Spacing +2 added lines, -2 removed lines

@@ -298,11 +298,11 @@
         $sMethod = $this->xTarget->getMethodName();
         // The hooks defined at method level are merged with those defined at class level.
         $aMethods = array_merge($aHookMethods['*'] ?? [], $aHookMethods[$sMethod] ?? []);
-        foreach($aMethods as $xKey => $xValue)
+        foreach ($aMethods as $xKey => $xValue)
         {
             $sHookName = $xValue;
             $aHookArgs = [];
-            if(is_string($xKey))
+            if (is_string($xKey))
             {
                 $sHookName = $xKey;
                 $aHookArgs = is_array($xValue) ? $xValue : [$xValue];