jaxon-php / jaxon-core

src/Di/Container.php

Indentation +2 added lines, -2 removed lines

@@ -214,7 +214,7 @@ 
      */
     public function set(string $sClass, Closure $xClosure)
     {
-       $this->xLibContainer->offsetSet($sClass, function() use($xClosure) {
+        $this->xLibContainer->offsetSet($sClass, function() use($xClosure) {
             return $xClosure($this);
         });
     }
@@ -229,7 +229,7 @@ 
      */
     public function val(string $sKey, $xValue)
     {
-       $this->xLibContainer->offsetSet($sKey, $xValue);
+        $this->xLibContainer->offsetSet($sKey, $xValue);
     }
 
     /**

Spacing +9 added lines, -9 removed lines

@@ -157,7 +157,7 @@ 
      */
     public function has(string $sClass): bool
     {
-        if($this->xAppContainer != null && $this->xAppContainer->has($sClass))
+        if ($this->xAppContainer != null && $this->xAppContainer->has($sClass))
         {
             return true;
         }
@@ -188,13 +188,13 @@ 
     {
         try
         {
-            if($this->xAppContainer != null && $this->xAppContainer->has($sClass))
+            if ($this->xAppContainer != null && $this->xAppContainer->has($sClass))
             {
                 return $this->xAppContainer->get($sClass);
             }
             return $this->xLibContainer->offsetGet($sClass);
         }
-        catch(Exception|Throwable $e)
+        catch (Exception | Throwable $e)
         {
             $xLogger = $this->g(LoggerInterface::class);
             $xTranslator = $this->g(Translator::class);
@@ -258,15 +258,15 @@ 
     {
         $xType = $xParameter->getType();
         // Check the parameter class first.
-        if($xType instanceof ReflectionNamedType)
+        if ($xType instanceof ReflectionNamedType)
         {
             // Check the class + the name
-            if($this->has($xType->getName() . ' $' . $xParameter->getName()))
+            if ($this->has($xType->getName() . ' $' . $xParameter->getName()))
             {
                 return $this->get($xType->getName() . ' $' . $xParameter->getName());
             }
             // Check the class only
-            if($this->get($xType->getName()))
+            if ($this->get($xType->getName()))
             {
                 return $this->get($xType->getName());
             }
@@ -286,16 +286,16 @@ 
      */
     public function make($xClass)
     {
-        if(is_string($xClass))
+        if (is_string($xClass))
         {
             $xClass = new ReflectionClass($xClass); // Create the reflection class instance
         }
-        if(!($xClass instanceof ReflectionClass))
+        if (!($xClass instanceof ReflectionClass))
         {
             return null;
         }
         // Use the Reflection class to get the parameters of the constructor
-        if(($constructor = $xClass->getConstructor()) === null)
+        if (($constructor = $xClass->getConstructor()) === null)
         {
             return $xClass->newInstance();
         }

Braces +1 added lines, -2 removed lines

@@ -193,8 +193,7 @@
                 return $this->xAppContainer->get($sClass);
             }
             return $this->xLibContainer->offsetGet($sClass);
-        }
-        catch(Exception|Throwable $e)
+        } catch(Exception|Throwable $e)
         {
             $xLogger = $this->g(LoggerInterface::class);
             $xTranslator = $this->g(Translator::class);

src/Request/Handler/RequestHandler.php

Spacing +13 added lines, -13 removed lines

@@ -108,7 +108,7 @@ 
         $this->xUploadHandler = $this->di->getUploadHandler();
 
         // Return true if the request plugin was already found
-        if($this->xRequestPlugin !== null)
+        if ($this->xRequestPlugin !== null)
         {
             return true;
         }
@@ -116,9 +116,9 @@ 
         // The HTTP request
         $xRequest = $this->di->getRequest();
         // Find a plugin to process the request
-        foreach($this->xPluginManager->getRequestHandlers() as $sClassName)
+        foreach ($this->xPluginManager->getRequestHandlers() as $sClassName)
         {
-            if($sClassName::canProcessRequest($xRequest))
+            if ($sClassName::canProcessRequest($xRequest))
             {
                 $this->xRequestPlugin = $this->di->g($sClassName);
                 $this->xRequestPlugin->setTarget($xRequest);
@@ -127,7 +127,7 @@ 
         }
 
         // Check if the upload plugin is enabled
-        if($this->xUploadHandler === null)
+        if ($this->xUploadHandler === null)
         {
             return false;
         }
@@ -149,15 +149,15 @@ 
         // The HTTP request
         $xRequest = $this->di->getRequest();
         // Process uploaded files, if the upload plugin is enabled
-        if($this->xUploadHandler !== null && $this->xUploadHandler->canProcessRequest($xRequest))
+        if ($this->xUploadHandler !== null && $this->xUploadHandler->canProcessRequest($xRequest))
         {
             $this->xUploadHandler->processRequest($xRequest);
         }
         // Process the request
-        if(($this->xRequestPlugin))
+        if (($this->xRequestPlugin))
         {
             $xResponse = $this->xRequestPlugin->processRequest();
-            if(($xResponse))
+            if (($xResponse))
             {
                 $this->xResponseManager->append($xResponse);
             }
@@ -178,7 +178,7 @@ 
     public function processRequest()
     {
         // Check if there is a plugin to process this request
-        if(!$this->canProcessRequest())
+        if (!$this->canProcessRequest())
         {
             return;
         }
@@ -187,11 +187,11 @@ 
         {
             $bEndRequest = false;
             // Handle before processing event
-            if(($this->xRequestPlugin))
+            if (($this->xRequestPlugin))
             {
                 $this->xCallbackManager->onBefore($this->xRequestPlugin->getTarget(), $bEndRequest);
             }
-            if($bEndRequest)
+            if ($bEndRequest)
             {
                 return;
             }
@@ -199,7 +199,7 @@ 
             $this->_processRequest();
 
             // Handle after processing event
-            if(($this->xRequestPlugin))
+            if (($this->xRequestPlugin))
             {
                 $this->xCallbackManager->onAfter($this->xRequestPlugin->getTarget(), $bEndRequest);
             }
@@ -207,12 +207,12 @@ 
         // An exception was thrown while processing the request.
         // The request missed the corresponding handler function,
         // or an error occurred while attempting to execute the handler.
-        catch(RequestException $e)
+        catch (RequestException $e)
         {
             $this->xResponseManager->error($e->getMessage());
             $this->xCallbackManager->onInvalid($e);
         }
-        catch(Exception $e)
+        catch (Exception $e)
         {
             $this->xResponseManager->error($e->getMessage());
             $this->xCallbackManager->onError($e);

Braces +1 added lines, -2 removed lines

@@ -211,8 +211,7 @@
         {
             $this->xResponseManager->error($e->getMessage());
             $this->xCallbackManager->onInvalid($e);
-        }
-        catch(Exception $e)
+        } catch(Exception $e)
         {
             $this->xResponseManager->error($e->getMessage());
             $this->xCallbackManager->onError($e);

src/Request/Handler/CallbackManager.php

Spacing +10 added lines, -10 removed lines

@@ -99,7 +99,7 @@ 
      */
     public function popBootCallbacks(): array
     {
-        if(empty($this->aBootCallbacks))
+        if (empty($this->aBootCallbacks))
         {
             return [];
         }
@@ -118,9 +118,9 @@ 
     private function getExceptionCallbacks(Exception $xException): array
     {
         $aExceptionCallbacks = [];
-        foreach($this->aExceptionCallbacks as $sExClass => $aCallbacks)
+        foreach ($this->aExceptionCallbacks as $sExClass => $aCallbacks)
         {
-            if(is_a($xException, $sExClass))
+            if (is_a($xException, $sExClass))
             {
                 $aExceptionCallbacks = array_merge($aExceptionCallbacks, $aCallbacks);
             }
@@ -190,13 +190,13 @@ 
      */
     public function error(callable $xCallable, string $sExClass = ''): CallbackManager
     {
-        if($sExClass === '' || $sExClass === Exception::class)
+        if ($sExClass === '' || $sExClass === Exception::class)
         {
             $this->aErrorCallbacks[] = $xCallable;
             return $this;
         }
         // Callback for a given exception class
-        if(isset($this->aExceptionCallbacks[$sExClass]))
+        if (isset($this->aExceptionCallbacks[$sExClass]))
         {
             $this->aExceptionCallbacks[$sExClass][] = $xCallable;
             return $this;
@@ -227,7 +227,7 @@ 
     private function executeCallback(callable $xCallback, array $aParameters)
     {
         $xReturn = call_user_func_array($xCallback, $aParameters);
-        if($xReturn instanceof ResponseInterface)
+        if ($xReturn instanceof ResponseInterface)
         {
             $this->xResponseManager->append($xReturn);
         }
@@ -241,7 +241,7 @@ 
      */
     private function executeCallbacks(array $aCallbacks, array $aParameters)
     {
-        foreach($aCallbacks as $xCallback)
+        foreach ($aCallbacks as $xCallback)
         {
             $this->executeCallback($xCallback, $aParameters);
         }
@@ -271,10 +271,10 @@ 
     public function onBefore(Target $xTarget, bool &$bEndRequest)
     {
         // Call the user defined callback
-        foreach($this->aBeforeCallbacks as $xCallback)
+        foreach ($this->aBeforeCallbacks as $xCallback)
         {
             $this->executeCallback($xCallback, [$xTarget, &$bEndRequest]);
-            if($bEndRequest)
+            if ($bEndRequest)
             {
                 return;
             }
@@ -321,7 +321,7 @@ 
     {
         $aExceptionCallbacks = $this->getExceptionCallbacks($xException);
         $this->executeCallbacks($aExceptionCallbacks, [$xException]);
-        if(count($aExceptionCallbacks) > 0)
+        if (count($aExceptionCallbacks) > 0)
         {
             // Do not throw the exception if a custom handler is defined
             return;

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/Plugin/Response/Pagination/Paginator.php

Spacing +13 added lines, -16 removed lines

@@ -154,8 +154,7 @@ 
      */
     protected function updateTotalPages(): Paginator
     {
-        $this->nTotalPages = ($this->nItemsPerPage === 0 ? 0 :
-            (int)ceil($this->nTotalItems / $this->nItemsPerPage));
+        $this->nTotalPages = ($this->nItemsPerPage === 0 ? 0 : (int) ceil($this->nTotalItems / $this->nItemsPerPage));
         return $this;
     }
 
@@ -219,8 +218,7 @@ 
     protected function getPrevPage(): Page
     {
         return $this->nCurrentPage <= 1 ?
-            new Page('disabled', $this->sPreviousText, 0) :
-            new Page('enabled', $this->sPreviousText, $this->nCurrentPage - 1);
+            new Page('disabled', $this->sPreviousText, 0) : new Page('enabled', $this->sPreviousText, $this->nCurrentPage - 1);
     }
 
     /**
@@ -231,8 +229,7 @@ 
     protected function getNextPage(): Page
     {
         return $this->nCurrentPage >= $this->nTotalPages ?
-            new Page('disabled', $this->sNextText, 0) :
-            new Page('enabled', $this->sNextText, $this->nCurrentPage + 1);
+            new Page('disabled', $this->sNextText, 0) : new Page('enabled', $this->sNextText, $this->nCurrentPage + 1);
     }
 
     /**
@@ -244,7 +241,7 @@ 
      */
     protected function getPage(int $nNumber): Page
     {
-        if($nNumber < 1)
+        if ($nNumber < 1)
         {
             return new Page('disabled', $this->sEllipsysText, 0);
         }
@@ -263,9 +260,9 @@ 
     {
         $aPageNumbers = [];
 
-        if($this->nTotalPages <= $this->nMaxPages)
+        if ($this->nTotalPages <= $this->nMaxPages)
         {
-            for($i = 0; $i < $this->nTotalPages; $i++)
+            for ($i = 0; $i < $this->nTotalPages; $i++)
             {
                 $aPageNumbers[] = $i + 1;
             }
@@ -274,11 +271,11 @@ 
         }
 
         // Determine the sliding range, centered around the current page.
-        $nNumAdjacents = (int)floor(($this->nMaxPages - 4) / 2);
+        $nNumAdjacents = (int) floor(($this->nMaxPages - 4) / 2);
 
         $nSlidingStart = 1;
         $nSlidingEndOffset = $nNumAdjacents + 3 - $this->nCurrentPage;
-        if($nSlidingEndOffset < 0)
+        if ($nSlidingEndOffset < 0)
         {
             $nSlidingStart = $this->nCurrentPage - $nNumAdjacents;
             $nSlidingEndOffset = 0;
@@ -286,23 +283,23 @@ 
 
         $nSlidingEnd = $this->nTotalPages;
         $nSlidingStartOffset = $this->nCurrentPage + $nNumAdjacents + 2 - $this->nTotalPages;
-        if($nSlidingStartOffset < 0)
+        if ($nSlidingStartOffset < 0)
         {
             $nSlidingEnd = $this->nCurrentPage + $nNumAdjacents;
             $nSlidingStartOffset = 0;
         }
 
         // Build the list of page numbers.
-        if($nSlidingStart > 1)
+        if ($nSlidingStart > 1)
         {
             $aPageNumbers[] = 1;
             $aPageNumbers[] = 0; // Ellipsys;
         }
-        for($i = $nSlidingStart - $nSlidingStartOffset; $i <= $nSlidingEnd + $nSlidingEndOffset; $i++)
+        for ($i = $nSlidingStart - $nSlidingStartOffset; $i <= $nSlidingEnd + $nSlidingEndOffset; $i++)
         {
             $aPageNumbers[] = $i;
         }
-        if($nSlidingEnd < $this->nTotalPages)
+        if ($nSlidingEnd < $this->nTotalPages)
         {
             $aPageNumbers[] = 0; // Ellipsys;
             $aPageNumbers[] = $this->nTotalPages;
@@ -318,7 +315,7 @@ 
      */
     public function pages(): array
     {
-        if($this->nTotalPages < 2)
+        if ($this->nTotalPages < 2)
         {
             return [];
         }

src/Request/Call/Parameter.php

Switch Indentation +24 added lines, -24 removed lines

@@ -166,30 +166,30 @@
     {
         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::PAGE_NUMBER:
-            return ['_type' => 'page', '_name' => ''];
-        case self::QUOTED_VALUE:
-        case self::BOOL_VALUE:
-        case self::NUMERIC_VALUE:
-        case self::JSON_VALUE:
-        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::PAGE_NUMBER:
+                return ['_type' => 'page', '_name' => ''];
+            case self::QUOTED_VALUE:
+            case self::BOOL_VALUE:
+            case self::NUMERIC_VALUE:
+            case self::JSON_VALUE:
+            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 jsonSerialize()
     {
-        switch($this->getType())
+        switch ($this->getType())
         {
         case self::JS_CALL:
             return $this->getValue()->toArray();

src/Plugin/Response/JQuery/JQueryPlugin.php

Spacing +1 added lines, -1 removed lines

@@ -75,7 +75,7 @@
     public function selector(string $sPath = '', $xContext = null): DomSelector
     {
         $xSelector = new DomSelector($sPath, $xContext);
-        if($this->bCommand && $this->response() !== null)
+        if ($this->bCommand && $this->response() !== null)
         {
             $this->addCommand('jquery', ['selector' => $xSelector]);
         }

src/Plugin/Response/JQuery/DomSelector.php

Spacing +8 added lines, -8 removed lines

@@ -99,12 +99,12 @@ 
      */
     public function __call(string $sMethod, array $aArguments)
     {
-        if(count($aArguments) === 1)
+        if (count($aArguments) === 1)
         {
             // If the only parameter is a selector, and the first call
             // on that selector is a method, then the selector is a callback.
             $xArgument = $aArguments[0];
-            if(is_a($xArgument, self::class) && $xArgument->bIsCallback === null &&
+            if (is_a($xArgument, self::class) && $xArgument->bIsCallback === null &&
                 count($xArgument->aCalls) > 0 && is_a($xArgument->aCalls[0], JsCall::class))
             {
                 $xArgument->bIsCallback = true;
@@ -174,12 +174,12 @@ 
      */
     private function selectCalls()
     {
-        if(!$this->sPath)
+        if (!$this->sPath)
         {
             // If an empty selector is given, use the event target instead
             return [['_type' => 'select', '_name' => 'this']];
         }
-        if(!$this->xContext)
+        if (!$this->xContext)
         {
             return [['_type' => 'select', '_name' => $this->sPath]];
         }
@@ -195,7 +195,7 @@ 
      */
     private function makeCallsArray($xParam): array
     {
-        if(!is_a($xParam, Method::class))
+        if (!is_a($xParam, Method::class))
         {
             // Return an array of array.
             return [$xParam->jsonSerialize()];
@@ -213,17 +213,17 @@ 
     public function toArray(): array
     {
         $aCalls = $this->selectCalls();
-        foreach($this->aCalls as $xCall)
+        foreach ($this->aCalls as $xCall)
         {
             $aCalls = array_merge($aCalls, $this->makeCallsArray($xCall));
         }
-        if($this->bToInt)
+        if ($this->bToInt)
         {
             $aCalls[] = [
                 '_type' => 'func',
                 '_name' => 'jaxon.utils.string.toInt',
                 'params' => [
-                    [ '_type' => '_', '_name' => 'this' ],
+                    ['_type' => '_', '_name' => 'this'],
                 ],
             ];
         }

src/Plugin/Response/DataBag/DataBagPlugin.php

Spacing +4 added lines, -6 removed lines

@@ -39,7 +39,7 @@ 
      */
     private function initDataBag()
     {
-        if($this->xDataBag !== null)
+        if ($this->xDataBag !== null)
         {
             return;
         }
@@ -48,8 +48,7 @@ 
         $aBody = $xRequest->getParsedBody();
         $aParams = $xRequest->getQueryParams();
         $aData = is_array($aBody) ?
-            $this->readData($aBody['jxnbags'] ?? []) :
-            $this->readData($aParams['jxnbags'] ?? []);
+            $this->readData($aBody['jxnbags'] ?? []) : $this->readData($aParams['jxnbags'] ?? []);
         $this->xDataBag = new DataBag($aData);
     }
 
@@ -70,8 +69,7 @@ 
     {
         // Todo: clean input data.
         return is_string($xData) ?
-            (json_decode($xData, true) ?: []) :
-            (is_array($xData) ? $xData : []);
+            (json_decode($xData, true) ?: []) : (is_array($xData) ? $xData : []);
     }
 
     /**
@@ -89,7 +87,7 @@ 
     public function writeCommand()
     {
         $this->initDataBag();
-        if($this->xDataBag->touched())
+        if ($this->xDataBag->touched())
         {
             $this->addCommand('bags.set', ['bags' => $this->xDataBag]);
         }