jaxon-php / jaxon-core

src/Plugin/Code/AssetManager.php

Spacing +9 added lines, -9 removed lines

@@ -71,7 +71,7 @@ 
     public function shallIncludeAssets(Plugin $xPlugin): bool

     {

         $sPluginOptionName = 'assets.include.' . $xPlugin->getName();

-        if($this->xConfigManager->hasOption($sPluginOptionName))

+        if ($this->xConfigManager->hasOption($sPluginOptionName))

         {

             return $this->xConfigManager->getOption($sPluginOptionName);

         }

@@ -90,7 +90,7 @@ 
         $sJsLibUri = rtrim($this->xConfigManager->getOption('js.lib.uri', self::JS_LIB_URL), '/') . '/';

         // Add component files to the javascript file array;

         $aJsFiles = [$sJsLibUri . 'jaxon.core' . $sJsExtension];

-        if($this->xConfigManager->getOption('core.debug.on'))

+        if ($this->xConfigManager->getOption('core.debug.on'))

         {

             $sLanguage = $this->xConfigManager->getOption('core.language');

             $aJsFiles[] = $sJsLibUri . 'jaxon.debug' . $sJsExtension;

@@ -107,7 +107,7 @@ 
      */

     public function getOptionVars(): array

     {

-        if(!$this->xConfigManager->hasOption('core.request.uri'))

+        if (!$this->xConfigManager->hasOption('core.request.uri'))

         {

             $this->xConfigManager->setOption('core.request.uri', $this->xParameterReader->uri());

         }

@@ -140,7 +140,7 @@ 
         // Check config options

         // - The js.app.export option must be set to true

         // - The js.app.uri and js.app.dir options must be set to non null values

-        if(!$this->xConfigManager->getOption('js.app.export', false) ||

+        if (!$this->xConfigManager->getOption('js.app.export', false) ||

             !$this->xConfigManager->getOption('js.app.uri') ||

             !$this->xConfigManager->getOption('js.app.dir'))

         {

@@ -158,7 +158,7 @@ 
      */

     public function createJsFiles(CodeGenerator $xCodeGenerator): string

     {

-        if(!$this->shallCreateJsFiles())

+        if (!$this->shallCreateJsFiles())

         {

             return '';

         }

@@ -167,7 +167,7 @@ 
         $sJsFileName = $this->xConfigManager->getOption('js.app.file') ?: $xCodeGenerator->getHash();

         $sJsDirectory = rtrim($this->xConfigManager->getOption('js.app.dir'), '\/') . DIRECTORY_SEPARATOR;

         // - The js.app.dir must be writable

-        if(!$sJsFileName || !is_dir($sJsDirectory) || !is_writable($sJsDirectory))

+        if (!$sJsFileName || !is_dir($sJsDirectory) || !is_writable($sJsDirectory))

         {

             return '';

         }

@@ -175,15 +175,15 @@ 
         $sJsFilePath = $sJsDirectory . $sJsFileName . '.js';

         $sJsMinFilePath = $sJsDirectory . $sJsFileName . '.min.js';

         $sJsFileUri = rtrim($this->xConfigManager->getOption('js.app.uri'), '/') . "/$sJsFileName";

-        if(!is_file($sJsFilePath) && !@file_put_contents($sJsFilePath, $xCodeGenerator->getJsScript()))

+        if (!is_file($sJsFilePath) && !@file_put_contents($sJsFilePath, $xCodeGenerator->getJsScript()))

         {

             return '';

         }

-        if(!$this->xConfigManager->getOption('js.app.minify', false))

+        if (!$this->xConfigManager->getOption('js.app.minify', false))

         {

             return $sJsFileUri . '.js';

         }

-        if(!is_file($sJsMinFilePath) && !$this->xMinifier->minify($sJsFilePath, $sJsMinFilePath))

+        if (!is_file($sJsMinFilePath) && !$this->xMinifier->minify($sJsFilePath, $sJsMinFilePath))

         {

             // If the file cannot be minified, return the plain js file.

             return $sJsFileUri . '.js';

src/Plugin/Response/JQuery/DomSelector.php

Spacing +6 added lines, -7 removed lines

@@ -86,12 +86,12 @@ 
      */

     private function getPath(string $jQueryNs, string $sPath, $xContext)

     {

-        if(!$sPath)

+        if (!$sPath)

         {

             // If an empty selector is given, use the event target instead

             return "$jQueryNs(e.currentTarget)";

         }

-        if(!$xContext)

+        if (!$xContext)

         {

             return "$jQueryNs('" . $sPath . "')";

         }

@@ -110,12 +110,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;

@@ -188,12 +188,11 @@ 
     public function getScript(): string

     {

         $sScript = $this->sPath;

-        if(count($this->aCalls) > 0)

+        if (count($this->aCalls) > 0)

         {

             $sScript .= '.' . implode('.', $this->aCalls);

         }

-        return $this->bIsCallback ? '(e) => {' . $sScript . '}' :

-            ($this->bToInt ? "parseInt($sScript)" : $sScript);

+        return $this->bIsCallback ? '(e) => {' . $sScript . '}' : ($this->bToInt ? "parseInt($sScript)" : $sScript);

     }

 

     /**

src/Plugin/Request/CallableClass/CallableObjectOptions.php

Switch Indentation +27 added lines, -27 removed lines

@@ -235,19 +235,19 @@ 
         switch($sName)

         {

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

-        default:

-            break;

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

+            default:

+                break;

         }

     }

 

@@ -295,20 +295,20 @@ 
     {

         switch($sOptionName)

         {

-        case 'excluded':

-            if((bool)$xOptionValue)

-            {

-                $this->addProtectedMethods($sFunctionName);

-            }

-            break;

-        // 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 'excluded':

+                if((bool)$xOptionValue)

+                {

+                    $this->addProtectedMethods($sFunctionName);

+                }

+                break;

+            // 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);

         }

     }

 

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 +6 added lines, -6 removed lines

@@ -86,7 +86,7 @@ 
      */

     public function getOutput(): string

     {

-        if($this->getCommandCount() === 0)

+        if ($this->getCommandCount() === 0)

         {

             return '{}';

         }

@@ -175,7 +175,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);

     }

@@ -194,9 +194,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 === '';

@@ -229,7 +229,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/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/Call/Parameter.php

Spacing +9 added lines, -9 removed lines

@@ -134,23 +134,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);

         }

@@ -252,7 +252,7 @@ 
      */

     protected function getNumericValueScript(): string

     {

-        return (string)$this->xValue;

+        return (string) $this->xValue;

     }

 

     /**

@@ -262,7 +262,7 @@ 
      */

     protected function getUnquotedValueScript(): string

     {

-        return (string)$this->xValue;

+        return (string) $this->xValue;

     }

 

     /**

@@ -284,7 +284,7 @@ 
      */

     protected function getPageNumberScript(): string

     {

-        return (string)$this->xValue;

+        return (string) $this->xValue;

     }

 

     /**

@@ -305,7 +305,7 @@ 
     public function getScript(): string

     {

         $sMethodName = 'get' . $this->sType . 'Script';

-        if(!method_exists($this, $sMethodName))

+        if (!method_exists($this, $sMethodName))

         {

             return '';

         }