jaxon-php / jaxon-core

src/Plugin/Request/CallableClass/CallableObjectOptions.php

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/CallableClassPlugin.php

Spacing +11 added lines, -11 removed lines

@@ -133,15 +133,15 @@ 
      */
     public function checkOptions(string $sCallable, $xOptions): array
     {
-        if(!$this->xValidator->validateClass(trim($sCallable)))
+        if (!$this->xValidator->validateClass(trim($sCallable)))
         {
             throw new SetupException($this->xTranslator->trans('errors.objects.invalid-declaration'));
         }
-        if(is_string($xOptions))
+        if (is_string($xOptions))
         {
             $xOptions = ['include' => $xOptions];
         }
-        elseif(!is_array($xOptions))
+        elseif (!is_array($xOptions))
         {
             throw new SetupException($this->xTranslator->trans('errors.objects.invalid-declaration'));
         }
@@ -186,16 +186,16 @@ 
         $sCode = '';
         $aJsClasses = [];
         $aNamespaces = $this->xRepository->getNamespaces();
-        foreach($aNamespaces as $sNamespace)
+        foreach ($aNamespaces as $sNamespace)
         {
             $offset = 0;
             $sJsNamespace = str_replace('\\', '.', $sNamespace);
             $sJsNamespace .= '.Null'; // This is a sentinel. The last token is not processed in the while loop.
-            while(($dotPosition = strpos($sJsNamespace, '.', $offset)) !== false)
+            while (($dotPosition = strpos($sJsNamespace, '.', $offset)) !== false)
             {
                 $sJsClass = substr($sJsNamespace, 0, $dotPosition);
                 // Generate code for this object
-                if(!isset($aJsClasses[$sJsClass]))
+                if (!isset($aJsClasses[$sJsClass]))
                 {
                     $sCode .= $this->sPrefix . "$sJsClass = {};\n";
                     $aJsClasses[$sJsClass] = $sJsClass;
@@ -215,7 +215,7 @@ 
      */
     private function getCallableScript(CallableObject $xCallableObject): string
     {
-        if($xCallableObject->excluded())
+        if ($xCallableObject->excluded())
         {
             return '';
         }
@@ -253,7 +253,7 @@ 
     public static function canProcessRequest(ServerRequestInterface $xRequest): bool
     {
         $aBody = $xRequest->getParsedBody();
-        if(is_array($aBody))
+        if (is_array($aBody))
         {
             return isset($aBody['jxncls']) && isset($aBody['jxnmthd']);
         }
@@ -267,7 +267,7 @@ 
     public function setTarget(ServerRequestInterface $xRequest)
     {
         $aBody = $xRequest->getParsedBody();
-        if(is_array($aBody))
+        if (is_array($aBody))
         {
             $this->xTarget = Target::makeClass(trim($aBody['jxncls']), trim($aBody['jxnmthd']));
             return;
@@ -286,7 +286,7 @@ 
         $sMethodName = $this->xTarget->getMethodName();
         $this->xTarget->setMethodArgs($this->xParameterReader->args());
 
-        if(!$this->xValidator->validateClass($sClassName) || !$this->xValidator->validateMethod($sMethodName))
+        if (!$this->xValidator->validateClass($sClassName) || !$this->xValidator->validateMethod($sMethodName))
         {
             // Unable to find the requested object or method
             throw new RequestException($this->xTranslator->trans('errors.objects.invalid',
@@ -299,7 +299,7 @@ 
             $xCallableObject = $this->xRegistry->getCallableObject($sClassName);
             return $xCallableObject->call($this->xTarget);
         }
-        catch(ReflectionException|SetupException $e)
+        catch (ReflectionException | SetupException $e)
         {
             // Unable to find the requested class or method
             $this->di->getLogger()->error($e->getMessage());

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];