jaxon-php / jaxon-core

src/Plugin/Request/CallableClass/CallableObjectOptions.php

Spacing +23 added lines, -25 removed lines

@@ -81,29 +81,29 @@ 
     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;
         }
 
         $sSeparator = $aOptions['separator'];
-        if($sSeparator === '_' || $sSeparator === '.')
+        if ($sSeparator === '_' || $sSeparator === '.')
         {
             $this->sSeparator = $sSeparator;
         }
         $this->addProtectedMethods($aOptions['protected']);
         $this->addProtectedMethods($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);
         }
@@ -116,14 +116,14 @@ 
      */
     private function addProtectedMethods($xMethods)
     {
-        if(!is_array($xMethods))
+        if (!is_array($xMethods))
         {
-            $this->aProtectedMethods[trim((string)$xMethods)] = true;
+            $this->aProtectedMethods[trim((string) $xMethods)] = true;
             return;
         }
-        foreach($xMethods as $sMethod)
+        foreach ($xMethods as $sMethod)
         {
-            $this->aProtectedMethods[trim((string)$sMethod)] = true;
+            $this->aProtectedMethods[trim((string) $sMethod)] = true;
         }
     }
 
@@ -197,17 +197,17 @@ 
      */
     private function setHookMethods(array &$aHookMethods, $xValue)
     {
-        foreach($xValue as $sCalledMethod => $xMethodToCall)
+        foreach ($xValue as $sCalledMethod => $xMethodToCall)
         {
-            if(!isset($aHookMethods[$sCalledMethod]))
+            if (!isset($aHookMethods[$sCalledMethod]))
             {
                 $aHookMethods[$sCalledMethod] = [];
             }
-            if(is_array($xMethodToCall))
+            if (is_array($xMethodToCall))
             {
                 $aHookMethods[$sCalledMethod] = array_merge($aHookMethods[$sCalledMethod], $xMethodToCall);
             }
-            elseif(is_string($xMethodToCall))
+            elseif (is_string($xMethodToCall))
             {
                 $aHookMethods[$sCalledMethod][] = $xMethodToCall;
             }
@@ -232,7 +232,7 @@ 
      */
     private function addOption(string $sName, $xValue)
     {
-        switch($sName)
+        switch ($sName)
         {
         // Set the methods to call before processing the request
         case '__before':
@@ -260,11 +260,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.
         }
@@ -293,10 +293,10 @@ 
      */
     private function addJsOption(string $sFunctionName, string $sOptionName, $xOptionValue)
     {
-        switch($sOptionName)
+        switch ($sOptionName)
         {
         case 'excluded':
-            if((bool)$xOptionValue)
+            if ((bool) $xOptionValue)
             {
                 $this->addProtectedMethods($sFunctionName);
             }
@@ -320,12 +320,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);
         }
     }
@@ -341,12 +340,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;
     }

Braces +1 added lines, -2 removed lines

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