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

src/Response/Response.php

Spacing +2 added lines, -2 removed lines

@@ -82,7 +82,7 @@ 
      */
     public function getOutput(): string
     {
-        if($this->getCommandCount() === 0)
+        if ($this->getCommandCount() === 0)
         {
             return '{}';
         }
@@ -152,7 +152,7 @@ 
     public function toPsr(): PsrResponseInterface
     {
         $xPsrResponse = $this->xPsr17Factory->createResponse(200);
-        if($this->xRequest->getMethod() === 'GET')
+        if ($this->xRequest->getMethod() === 'GET')
         {
             $xPsrResponse = $xPsrResponse
                 ->withHeader('Expires', 'Mon, 26 Jul 1997 05:00:00 GMT')

src/Response/Traits/CommandTrait.php

Spacing +5 added lines, -6 removed lines

@@ -63,8 +63,7 @@ 
     public function appendCommands(array $aCommands, bool $bBefore = false)
     {
         $this->aCommands = ($bBefore) ?
-            array_merge($aCommands, $this->aCommands) :
-            array_merge($this->aCommands, $aCommands);
+            array_merge($aCommands, $this->aCommands) : array_merge($this->aCommands, $aCommands);
     }
 
     /**
@@ -107,7 +106,7 @@ 
     public function addCommand(array $aAttributes, $mData): ResponseInterface
     {
         $aAttributes = array_map(function($xAttribute) {
-            return is_integer($xAttribute) ? $xAttribute : trim((string)$xAttribute, " \t");
+            return is_integer($xAttribute) ? $xAttribute : trim((string) $xAttribute, " \t");
         }, $aAttributes);
         return $this->addRawCommand($aAttributes, $mData);
     }
@@ -126,9 +125,9 @@ 
         $mData, bool $bRemoveEmpty = false): ResponseInterface
     {
         $mData = is_array($mData) ? array_map(function($sData) {
-            return trim((string)$sData, " \t\n");
-        }, $mData) : trim((string)$mData, " \t\n");
-        if($bRemoveEmpty)
+            return trim((string) $sData, " \t\n");
+        }, $mData) : trim((string) $mData, " \t\n");
+        if ($bRemoveEmpty)
         {
             $aAttributes = array_filter($aAttributes, function($xValue) {
                 return $xValue === '';

src/Plugin/Response/Paginator/PaginatorPlugin.php

Spacing +3 added lines, -3 removed lines

@@ -124,17 +124,17 @@
     public function render(Call $xCall, Paginator $xPaginator, string $sWrapperId = '')
     {
         $aPages = $xPaginator->pages();
-        if(count($aPages) === 0)
+        if (count($aPages) === 0)
         {
             return;
         }
-        if(!($xStore = $this->_render($aPages)))
+        if (!($xStore = $this->_render($aPages)))
         {
             return;
         }
 
         // Append the page number to the parameter list, if not yet given.
-        if(!$xCall->hasPageNumber())
+        if (!$xCall->hasPageNumber())
         {
             $xCall->addParameter(Parameter::PAGE_NUMBER, 0);
         }

src/Request/Call/Parameter.php

Switch Indentation +23 added lines, -23 removed lines

@@ -166,29 +166,29 @@
     {
         switch($this->getType())
         {
-        case self::JS_CALL:
-            return $this->getValue()->toArray();
-        case self::JS_VALUE:
-            return [
-                '_type' => 'expr',
-                'calls' => [['_type' => 'attr', '_name' => $this->getValue()]],
-            ];
-        case self::FORM_VALUES:
-            return ['_type' => 'form', '_name' => $this->getValue()];
-        case self::INPUT_VALUE:
-            return ['_type' => 'input', '_name' => $this->getValue()];
-        case self::CHECKED_VALUE:
-            return ['_type' => 'checked', '_name' => $this->getValue()];
-        case self::ELEMENT_INNERHTML:
-            return ['_type' => 'html', '_name' => $this->getValue()];
-        case self::QUOTED_VALUE:
-        case self::BOOL_VALUE:
-        case self::NUMERIC_VALUE:
-        case self::JSON_VALUE:
-        case self::PAGE_NUMBER:
-        default:
-            // Return the value as is.
-            return $this->getValue();
+            case self::JS_CALL:
+                return $this->getValue()->toArray();
+            case self::JS_VALUE:
+                return [
+                    '_type' => 'expr',
+                    'calls' => [['_type' => 'attr', '_name' => $this->getValue()]],
+                ];
+            case self::FORM_VALUES:
+                return ['_type' => 'form', '_name' => $this->getValue()];
+            case self::INPUT_VALUE:
+                return ['_type' => 'input', '_name' => $this->getValue()];
+            case self::CHECKED_VALUE:
+                return ['_type' => 'checked', '_name' => $this->getValue()];
+            case self::ELEMENT_INNERHTML:
+                return ['_type' => 'html', '_name' => $this->getValue()];
+            case self::QUOTED_VALUE:
+            case self::BOOL_VALUE:
+            case self::NUMERIC_VALUE:
+            case self::JSON_VALUE:
+            case self::PAGE_NUMBER:
+            default:
+                // Return the value as is.
+                return $this->getValue();
         }
     }
 }

Spacing +6 added lines, -6 removed lines

@@ -131,23 +131,23 @@ 
      */
     public static function make($xValue): ParameterInterface
     {
-        if($xValue instanceof ParameterInterface)
+        if ($xValue instanceof ParameterInterface)
         {
             return $xValue;
         }
-        if(is_numeric($xValue))
+        if (is_numeric($xValue))
         {
             return new Parameter(self::NUMERIC_VALUE, $xValue);
         }
-        if(is_string($xValue))
+        if (is_string($xValue))
         {
             return new Parameter(self::QUOTED_VALUE, $xValue);
         }
-        if(is_bool($xValue))
+        if (is_bool($xValue))
         {
             return new Parameter(self::BOOL_VALUE, $xValue);
         }
-        if($xValue instanceof JsCall)
+        if ($xValue instanceof JsCall)
         {
             return new Parameter(self::JS_CALL, $xValue);
         }
@@ -164,7 +164,7 @@ 
      */
     public function forArray()
     {
-        switch($this->getType())
+        switch ($this->getType())
         {
         case self::JS_CALL:
             return $this->getValue()->toArray();

src/Request/Call/Call.php

Spacing +6 added lines, -6 removed lines

@@ -317,14 +317,14 @@ 
     public function toArray(): array
     {
         $aCall = parent::toArray();
-        if($this->bConfirm)
+        if ($this->bConfirm)
         {
             $aCall['confirm'] = $this->aConfirmArgs;
         }
-        if(($this->aCondition))
+        if (($this->aCondition))
         {
             $aCall['condition'] = $this->aCondition;
-            if(($this->aMessageArgs))
+            if (($this->aMessageArgs))
             {
                 $aCall['else'] = $this->getMessage();
             }
@@ -339,9 +339,9 @@ 
      */
     private function findPageNumber(): ?ParameterInterface
     {
-        foreach($this->aParameters as $xParameter)
+        foreach ($this->aParameters as $xParameter)
         {
-            if($xParameter->getType() === Parameter::PAGE_NUMBER)
+            if ($xParameter->getType() === Parameter::PAGE_NUMBER)
             {
                 return $xParameter;
             }
@@ -370,7 +370,7 @@ 
     {
         /** @var Parameter */
         $xParameter = $this->findPageNumber();
-        if($xParameter !== null)
+        if ($xParameter !== null)
         {
             $xParameter->setValue($nPageNumber);
         }

src/Request/Call/JsCall.php

Spacing +3 added lines, -3 removed lines

@@ -123,7 +123,7 @@ 
      */
     public function addParameters(array $aParameters): JsCall
     {
-        foreach($aParameters as $xParameter)
+        foreach ($aParameters as $xParameter)
         {
             $this->pushParameter(Parameter::make($xParameter));
         }
@@ -144,12 +144,12 @@ 
                 return $xParam->forArray();
             }, $this->aParameters),
         ]];
-        if($this->bToInt)
+        if ($this->bToInt)
         {
             $aCalls[] = [
                 '_type' => 'func',
                 '_name' => 'jaxon.utils.string.toInt',
-                'params' => [[ '_type' => '_', '_name' => 'this' ]],
+                'params' => [['_type' => '_', '_name' => 'this']],
             ];
         }
         return [