jaxon-php / jaxon-core

src/Plugin/Manager/PluginManager.php

Spacing +7 added lines, -7 removed lines

@@ -124,28 +124,28 @@ 
     {
         $bIsUsed = false;
         $aInterfaces = class_implements($sClassName);
-        if(in_array(CodeGeneratorInterface::class, $aInterfaces))
+        if (in_array(CodeGeneratorInterface::class, $aInterfaces))
         {
             $this->xCodeGenerator->addCodeGenerator($sClassName, $nPriority);
             $bIsUsed = true;
         }
-        if(in_array(CallableRegistryInterface::class, $aInterfaces))
+        if (in_array(CallableRegistryInterface::class, $aInterfaces))
         {
             $this->aRegistryPlugins[$sPluginName] = $sClassName;
             $bIsUsed = true;
         }
-        if(in_array(RequestHandlerInterface::class, $aInterfaces))
+        if (in_array(RequestHandlerInterface::class, $aInterfaces))
         {
             $this->aRequestHandlers[$sPluginName] = $sClassName;
             $bIsUsed = true;
         }
-        if(in_array(ResponsePluginInterface::class, $aInterfaces))
+        if (in_array(ResponsePluginInterface::class, $aInterfaces))
         {
             $this->aResponsePlugins[$sPluginName] = $sClassName;
             $bIsUsed = true;
         }
 
-        if(!$bIsUsed)
+        if (!$bIsUsed)
         {
             // The class is invalid.
             $sMessage = $this->xTranslator->trans('errors.register.invalid', ['name' => $sClassName]);
@@ -153,7 +153,7 @@ 
         }
 
         // Register the plugin in the DI container, if necessary
-        if(!$this->di->has($sClassName))
+        if (!$this->di->has($sClassName))
         {
             $this->di->auto($sClassName);
         }
@@ -186,7 +186,7 @@ 
      */
     public function registerCallable(string $sType, string $sCallable, $xOptions = [])
     {
-        if(isset($this->aRegistryPlugins[$sType]) &&
+        if (isset($this->aRegistryPlugins[$sType]) &&
             ($xPlugin = $this->di->g($this->aRegistryPlugins[$sType])))
         {
             $xPlugin->register($sType, $sCallable, $xPlugin->checkOptions($sCallable, $xOptions));

src/Plugin/CallableMetadataInterface.php

Spacing +1 added lines, -1 removed lines

@@ -27,6 +27,6 @@
      *
      * @return array
      */
-    public function getAttributes(ReflectionClass|string $xReflectionClass,
+    public function getAttributes(ReflectionClass | string $xReflectionClass,
         array $aMethods = [], array $aProperties = []): array;
 }

src/Plugin/Request/CallableClass/CallableClassPlugin.php

Spacing +11 added lines, -11 removed lines

@@ -81,15 +81,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'));
         }
@@ -133,16 +133,16 @@ 
     {
         $sCode = '';
         $aJsClasses = [];
-        foreach($this->xRegistry->getNamespaces() as $sNamespace)
+        foreach ($this->xRegistry->getNamespaces() 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;
@@ -162,7 +162,7 @@ 
      */
     private function getCallableScript(CallableObject $xCallableObject): string
     {
-        if($xCallableObject->excluded())
+        if ($xCallableObject->excluded())
         {
             return '';
         }
@@ -200,7 +200,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']);
         }
@@ -214,7 +214,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;
@@ -233,7 +233,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',
@@ -245,7 +245,7 @@ 
         {
             return $this->getCallable($sClassName)->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());

Braces +2 added lines, -4 removed lines

@@ -88,8 +88,7 @@ 
         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'));
         }
@@ -244,8 +243,7 @@ 
         try
         {
             return $this->getCallable($sClassName)->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/CallableRegistry.php

Spacing +38 added lines, -39 removed lines

@@ -120,7 +120,7 @@ 
     public function __construct(protected ClassContainer $cls)
     {
         // Set the composer autoloader
-        if(file_exists(($sAutoloadFile = __DIR__ . '/../../../../../../autoload.php')) ||
+        if (file_exists(($sAutoloadFile = __DIR__ . '/../../../../../../autoload.php')) ||
             file_exists(($sAutoloadFile = __DIR__ . '/../../../../../vendor/autoload.php')) ||
             file_exists(($sAutoloadFile = __DIR__ . '/../../../../vendor/autoload.php')))
         {
@@ -129,7 +129,7 @@ 
 
         // The methods of the AbstractCallable class must not be exported
         $xAbstractCallable = new ReflectionClass(AbstractCallable::class);
-        foreach($xAbstractCallable->getMethods(ReflectionMethod::IS_PUBLIC) as $xMethod)
+        foreach ($xAbstractCallable->getMethods(ReflectionMethod::IS_PUBLIC) as $xMethod)
         {
             $this->aProtectedMethods[] = $xMethod->getName();
         }
@@ -176,15 +176,15 @@ 
      */
     private function makeClassOptions(string $sClassName, array $aClassOptions, array $aDirectoryOptions): array
     {
-        foreach($this->aDefaultClassOptions as $sOption => $xValue)
+        foreach ($this->aDefaultClassOptions as $sOption => $xValue)
         {
-            if(!isset($aClassOptions[$sOption]))
+            if (!isset($aClassOptions[$sOption]))
             {
                 $aClassOptions[$sOption] = $xValue;
             }
         }
-        $aClassOptions['excluded'] = (bool)($aClassOptions['excluded'] ?? false); // Convert to bool.
-        if(is_string($aClassOptions['protected']))
+        $aClassOptions['excluded'] = (bool) ($aClassOptions['excluded'] ?? false); // Convert to bool.
+        if (is_string($aClassOptions['protected']))
         {
             $aClassOptions['protected'] = [$aClassOptions['protected']]; // Convert to array.
         }
@@ -195,30 +195,30 @@ 
             $aDirectoryOptions['classes']['*'] ?? [], // Options for all classes
             $aDirectoryOptions['classes'][$sClassName] ?? [], // Options for this specific class
         ];
-        foreach($aOptionGroups as $aOptionGroup)
+        foreach ($aOptionGroups as $aOptionGroup)
         {
-            if(isset($aOptionGroup['separator']))
+            if (isset($aOptionGroup['separator']))
             {
-                $aClassOptions['separator'] = (string)$aOptionGroup['separator'];
+                $aClassOptions['separator'] = (string) $aOptionGroup['separator'];
             }
-            if(isset($aOptionGroup['excluded']))
+            if (isset($aOptionGroup['excluded']))
             {
-                $aClassOptions['excluded'] = (bool)$aOptionGroup['excluded'];
+                $aClassOptions['excluded'] = (bool) $aOptionGroup['excluded'];
             }
-            if(isset($aOptionGroup['protected']))
+            if (isset($aOptionGroup['protected']))
             {
-                if(is_string($aOptionGroup['protected']))
+                if (is_string($aOptionGroup['protected']))
                 {
                     $aOptionGroup['protected'] = [$aOptionGroup['protected']]; // Convert to array.
                 }
                 $aClassOptions['protected'] = array_merge($aClassOptions['protected'], $aOptionGroup['protected']);
             }
-            if(isset($aOptionGroup['functions']))
+            if (isset($aOptionGroup['functions']))
             {
                 $aClassOptions['functions'] = array_merge($aClassOptions['functions'], $aOptionGroup['functions']);
             }
         }
-        if(isset($aDirectoryOptions['config']) && !isset($aClassOptions['config']))
+        if (isset($aDirectoryOptions['config']) && !isset($aClassOptions['config']))
         {
             $aClassOptions['config'] = $aDirectoryOptions['config'];
         }
@@ -250,7 +250,7 @@ 
      */
     public function addClass(string $sClassName, array $aClassOptions)
     {
-        if($this->xCurrentConfig !== null)
+        if ($this->xCurrentConfig !== null)
         {
             $aClassOptions['config'] = $this->xCurrentConfig;
         }
@@ -267,10 +267,10 @@ 
     public function setNamespaceClassOptions(string $sClassName)
     {
         // Find the corresponding namespace
-        foreach($this->aNamespaceOptions as $sNamespace => $aDirectoryOptions)
+        foreach ($this->aNamespaceOptions as $sNamespace => $aDirectoryOptions)
         {
             // Check if the namespace matches the class.
-            if(strncmp($sClassName, $sNamespace . '\\', strlen($sNamespace) + 1) === 0)
+            if (strncmp($sClassName, $sNamespace . '\\', strlen($sNamespace) + 1) === 0)
             {
                 // Save the class options
                 $aClassOptions = ['namespace' => $sNamespace];
@@ -292,8 +292,7 @@ 
     {
         // Don't export the item() and html() public methods for Component objects.
         return is_subclass_of($sClassName, Component::class) ?
-            [...$this->aProtectedMethods, 'item', 'html'] :
-            (is_subclass_of($sClassName, AbstractCallable::class) ?
+            [...$this->aProtectedMethods, 'item', 'html'] : (is_subclass_of($sClassName, AbstractCallable::class) ?
                 $this->aProtectedMethods : []);
     }
 
@@ -307,11 +306,11 @@ 
     public function addDirectory(string $sDirectory, array $aOptions)
     {
         // Set the autoload option default value
-        if(!isset($aOptions['autoload']))
+        if (!isset($aOptions['autoload']))
         {
             $aOptions['autoload'] = true;
         }
-        if($this->xCurrentConfig !== null)
+        if ($this->xCurrentConfig !== null)
         {
             $aOptions['config'] = $this->xCurrentConfig;
         }
@@ -341,30 +340,30 @@ 
     public function addNamespace(string $sNamespace, array $aOptions)
     {
         // Separator default value
-        if(!isset($aOptions['separator']))
+        if (!isset($aOptions['separator']))
         {
             $aOptions['separator'] = '.';
         }
         $aOptions['separator'] = trim($aOptions['separator']);
-        if(!in_array($aOptions['separator'], ['.', '_']))
+        if (!in_array($aOptions['separator'], ['.', '_']))
         {
             $aOptions['separator'] = '.';
         }
-        if($aOptions['separator'] === '_')
+        if ($aOptions['separator'] === '_')
         {
             $this->cls->useUnderscore();
         }
         // Set the autoload option default value
-        if(!isset($aOptions['autoload']))
+        if (!isset($aOptions['autoload']))
         {
             $aOptions['autoload'] = true;
         }
-        if($this->xCurrentConfig !== null)
+        if ($this->xCurrentConfig !== null)
         {
             $aOptions['config'] = $this->xCurrentConfig;
         }
         // Register the dir with PSR4 autoloading
-        if(($aOptions['autoload']) && $this->xAutoloader != null)
+        if (($aOptions['autoload']) && $this->xAutoloader != null)
         {
             $this->xAutoloader->setPsr4($sNamespace . '\\', $aOptions['directory']);
         }
@@ -380,7 +379,7 @@ 
     public function parseDirectories()
     {
         // This is to be done only once.
-        if($this->bDirectoriesParsed)
+        if ($this->bDirectoriesParsed)
         {
             return;
         }
@@ -388,14 +387,14 @@ 
 
         // Browse directories without namespaces and read all the files.
         $aClassMap = [];
-        foreach($this->aDirectoryOptions as $sDirectory => $aDirectoryOptions)
+        foreach ($this->aDirectoryOptions as $sDirectory => $aDirectoryOptions)
         {
             $itFile = new RecursiveIteratorIterator(new RecursiveDirectoryIterator($sDirectory));
             // Iterate on dir content
-            foreach($itFile as $xFile)
+            foreach ($itFile as $xFile)
             {
                 // Skip everything except PHP files
-                if(!$xFile->isFile() || $xFile->getExtension() !== 'php')
+                if (!$xFile->isFile() || $xFile->getExtension() !== 'php')
                 {
                     continue;
                 }
@@ -403,7 +402,7 @@ 
                 $sClassName = $xFile->getBasename('.php');
                 $aClassOptions = ['timestamp' => $xFile->getMTime()];
                 // No more custom classmap autoloading. The file will be included when needed.
-                if(($aDirectoryOptions['autoload']))
+                if (($aDirectoryOptions['autoload']))
                 {
                     $aClassMap[$sClassName] = $xFile->getPathname();
                 }
@@ -411,7 +410,7 @@ 
             }
         }
         // Set classmap autoloading
-        if(($aClassMap) && $this->xAutoloader !== null)
+        if (($aClassMap) && $this->xAutoloader !== null)
         {
             $this->xAutoloader->addClassMap($aClassMap);
         }
@@ -425,7 +424,7 @@ 
     public function parseNamespaces()
     {
         // This is to be done only once.
-        if($this->bNamespacesParsed)
+        if ($this->bNamespacesParsed)
         {
             return;
         }
@@ -433,17 +432,17 @@ 
 
         // Browse directories with namespaces and read all the files.
         $sDS = DIRECTORY_SEPARATOR;
-        foreach($this->aNamespaceOptions as $sNamespace => $aDirectoryOptions)
+        foreach ($this->aNamespaceOptions as $sNamespace => $aDirectoryOptions)
         {
             $this->_addNamespace($sNamespace, ['separator' => $aDirectoryOptions['separator']]);
 
             // Iterate on dir content
             $sDirectory = $aDirectoryOptions['directory'];
             $itFile = new RecursiveIteratorIterator(new RecursiveDirectoryIterator($sDirectory));
-            foreach($itFile as $xFile)
+            foreach ($itFile as $xFile)
             {
                 // skip everything except PHP files
-                if(!$xFile->isFile() || $xFile->getExtension() !== 'php')
+                if (!$xFile->isFile() || $xFile->getExtension() !== 'php')
                 {
                     continue;
                 }
@@ -452,7 +451,7 @@ 
                 $sClassPath = $sNamespace;
                 $sRelativePath = substr($xFile->getPath(), strlen($sDirectory));
                 $sRelativePath = trim(str_replace($sDS, '\\', $sRelativePath), '\\');
-                if($sRelativePath !== '')
+                if ($sRelativePath !== '')
                 {
                     $sClassPath .= '\\' . $sRelativePath;
                 }

src/Plugin/Request/CallableClass/CallableObject.php

Spacing +6 added lines, -6 removed lines

@@ -117,7 +117,7 @@ 
     {
         /** @var Config|null */
         $xConfig = $aOptions['config'] ?? null;
-        if($xConfig === null)
+        if ($xConfig === null)
         {
             return [false, [], []];
         }
@@ -279,11 +279,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];
@@ -305,7 +305,7 @@ 
             // Warning: dynamic properties will be deprecated in PHP8.2.
             $this->$sName = $xInjectedObject;
         };
-        foreach($aDiOptions as $sName => $sClass)
+        foreach ($aDiOptions as $sName => $sClass)
         {
             // The setter has access to protected attributes
             $_cSetter = $cSetter->bindTo($xRegisteredObject, $xRegisteredObject);
@@ -346,7 +346,7 @@ 
     public function getRegisteredObject(?Target $xTarget = null)
     {
         $xRegisteredObject = $this->cls->get($this->getClassName());
-        if(!$xRegisteredObject || !$xTarget)
+        if (!$xRegisteredObject || !$xTarget)
         {
             return $xRegisteredObject;
         }
@@ -356,7 +356,7 @@ 
         // We now need to set the method level DI options.
         $this->setDiMethodAttributes($xRegisteredObject, $xTarget->getMethodName());
         // Set the Jaxon request target in the helper
-        if($xRegisteredObject instanceof AbstractCallable)
+        if ($xRegisteredObject instanceof AbstractCallable)
         {
             // Set the protected attributes of the object
             $sAttr = 'xHelper';

src/Plugin/Attribute/AttributeReader.php

Spacing +19 added lines, -19 removed lines

@@ -66,7 +66,7 @@ 
     private function readImportedTypes()
     {
         $sClass = $this->xReflectionClass->getName();
-        if(isset($this->aImportedTypes[$sClass]))
+        if (isset($this->aImportedTypes[$sClass]))
         {
             return;
         }
@@ -82,7 +82,7 @@ 
     private function readPropertyTypes()
     {
         $sClass = $this->xReflectionClass->getName();
-        if(isset($this->aPropertyTypes[$sClass]))
+        if (isset($this->aPropertyTypes[$sClass]))
         {
             return;
         }
@@ -90,11 +90,11 @@ 
         $this->aPropertyTypes[$sClass] = [];
         $nFilter = ReflectionProperty::IS_PUBLIC | ReflectionProperty::IS_PROTECTED;
         $aProperties = $this->xReflectionClass->getProperties($nFilter);
-        foreach($aProperties as $xReflectionProperty)
+        foreach ($aProperties as $xReflectionProperty)
         {
             $xType = $xReflectionProperty->getType();
             // Check that the property has a valid type defined
-            if(is_a($xType, ReflectionNamedType::class) && $xType->getName() !== '')
+            if (is_a($xType, ReflectionNamedType::class) && $xType->getName() !== '')
             {
                 $this->aPropertyTypes[$sClass][$xReflectionProperty->getName()] = $xType->getName();
             }
@@ -115,11 +115,11 @@ 
         $xInstance->setTarget($xAttribute->getTarget());
         $xInstance->setNamespace($this->xReflectionClass->getNamespaceName());
         $sName = $xInstance->getName();
-        if(is_a($xInstance, DiAttribute::class))
+        if (is_a($xInstance, DiAttribute::class))
         {
             $sClass = $this->xReflectionClass->getName();
             $xInstance->setTypes($this->aImportedTypes[$sClass], $this->aPropertyTypes[$sClass]);
-            if($sProperty !== '')
+            if ($sProperty !== '')
             {
                 $xInstance->setProperty($sProperty);
             }
@@ -145,10 +145,10 @@ 
         });
 
         $aValues = [];
-        foreach($aAttributes as $xAttribute)
+        foreach ($aAttributes as $xAttribute)
         {
             [$sName, $xValue] = $this->getAttrValue($xAttribute, $aValues);
-            if($sName !== 'protected' || ($xValue)) // Ignore attribute Exclude with value true
+            if ($sName !== 'protected' || ($xValue)) // Ignore attribute Exclude with value true
             {
                 $aValues[$sName] = $xValue;
             }
@@ -173,11 +173,11 @@ 
         });
 
         $nCount = count($aAttributes);
-        if($nCount === 0)
+        if ($nCount === 0)
         {
             return ['', null];
         }
-        if($nCount > 1)
+        if ($nCount > 1)
         {
             throw new SetupException('Only one DI attribute is allowed on a property');
         }
@@ -189,7 +189,7 @@ 
      * @inheritDoc
      * @throws SetupException
      */
-    public function getAttributes(ReflectionClass|string $xReflectionClass,
+    public function getAttributes(ReflectionClass | string $xReflectionClass,
         array $aMethods = [], array $aProperties = []): array
     {
         $this->xReflectionClass = is_string($xReflectionClass) ?
@@ -202,10 +202,10 @@ 
             // Processing properties attributes
             $aPropAttrs = [];
             // Properties attributes
-            foreach($aProperties as $sProperty)
+            foreach ($aProperties as $sProperty)
             {
                 [$sName, $xValue] = $this->getPropertyAttrValues($sProperty);
-                if($xValue !== null)
+                if ($xValue !== null)
                 {
                     $aPropAttrs[$sName] = array_merge($aPropAttrs[$sName] ?? [], $xValue);
                 }
@@ -213,13 +213,13 @@ 
 
             // Processing class attributes
             $aClassAttrs = $this->getAttrValues($this->xReflectionClass->getAttributes());
-            if(isset($aClassAttrs['protected']))
+            if (isset($aClassAttrs['protected']))
             {
                 return [true, [], []]; // The entire class is not to be exported.
             }
 
             // Merge attributes and class attributes
-            foreach($aPropAttrs as $sName => $xValue)
+            foreach ($aPropAttrs as $sName => $xValue)
             {
                 $aClassAttrs[$sName] = array_merge($aClassAttrs[$sName] ?? [], $xValue);
             }
@@ -227,16 +227,16 @@ 
             // Processing methods attributes
             $aAttrValues = count($aClassAttrs) > 0 ? ['*' => $aClassAttrs] : [];
             $aProtected = [];
-            foreach($aMethods as $sMethod)
+            foreach ($aMethods as $sMethod)
             {
                 $aAttributes = $this->xReflectionClass->getMethod($sMethod)->getAttributes();
                 $aMethodAttrs = $this->getAttrValues($aAttributes);
 
-                if(isset($aMethodAttrs['protected']))
+                if (isset($aMethodAttrs['protected']))
                 {
                     $aProtected[] = $sMethod; // The method is not to be exported.
                 }
-                elseif(count($aMethodAttrs) > 0)
+                elseif (count($aMethodAttrs) > 0)
                 {
                     $aAttrValues[$sMethod] = $aMethodAttrs;
                 }
@@ -244,7 +244,7 @@ 
 
             return [false, $aAttrValues, $aProtected];
         }
-        catch(Exception|Error $e)
+        catch (Exception | Error $e)
         {
             throw new SetupException($e->getMessage());
         }

Braces +5 added lines, -5 removed lines

@@ -148,10 +148,12 @@ 
         foreach($aAttributes as $xAttribute)
         {
             [$sName, $xValue] = $this->getAttrValue($xAttribute, $aValues);
-            if($sName !== 'protected' || ($xValue)) // Ignore attribute Exclude with value true
+            if($sName !== 'protected' || ($xValue)) {
+                // Ignore attribute Exclude with value true
             {
                 $aValues[$sName] = $xValue;
             }
+            }
         }
         return $aValues;
     }
@@ -235,16 +237,14 @@ 
                 if(isset($aMethodAttrs['protected']))
                 {
                     $aProtected[] = $sMethod; // The method is not to be exported.
-                }
-                elseif(count($aMethodAttrs) > 0)
+                } elseif(count($aMethodAttrs) > 0)
                 {
                     $aAttrValues[$sMethod] = $aMethodAttrs;
                 }
             }
 
             return [false, $aAttrValues, $aProtected];
-        }
-        catch(Exception|Error $e)
+        } catch(Exception|Error $e)
         {
             throw new SetupException($e->getMessage());
         }

src/Plugin/Attribute/AttributeParser.php

Switch Indentation +8 added lines, -8 removed lines

@@ -67,14 +67,14 @@
 
             switch($xToken[0])
             {
-            case T_USE:
-                $aUseTokens[] = $xToken;
-                break;
-            case T_CLASS:
-                // Stop on the "class" token.
-                return [$aUseTokens, $aHeaderTokens];
-            default:
-                $aHeaderTokens[] = $xToken;
+                case T_USE:
+                    $aUseTokens[] = $xToken;
+                    break;
+                case T_CLASS:
+                    // Stop on the "class" token.
+                    return [$aUseTokens, $aHeaderTokens];
+                default:
+                    $aHeaderTokens[] = $xToken;
             }
         }
         // No "class" token in the file. Do nothing.

Spacing +7 added lines, -7 removed lines

@@ -58,14 +58,14 @@ 
 
         $aHeaderTokens = [];
         $aUseTokens = [];
-        foreach($aTokens as $xToken)
+        foreach ($aTokens as $xToken)
         {
-            if(!is_array($xToken))
+            if (!is_array($xToken))
             {
                 continue;
             }
 
-            switch($xToken[0])
+            switch ($xToken[0])
             {
             case T_USE:
                 $aUseTokens[] = $xToken;
@@ -103,7 +103,7 @@ 
 
         // Key the tokens values by type
         $aUseStatement = [];
-        foreach($aUseTokens as $aToken)
+        foreach ($aUseTokens as $aToken)
         {
             $aUseStatement[$aToken[0]] = $aToken[1];
         }
@@ -119,7 +119,7 @@ 
      */
     private function getStatementKey(array $aUseStatement): string
     {
-        if(isset($aUseStatement[T_STRING]))
+        if (isset($aUseStatement[T_STRING]))
         {
             // The statement is "use <type> as <name>;". <name> is the key.
             return $aUseStatement[T_STRING];
@@ -140,13 +140,13 @@ 
     {
         $sFileName = $xReflectionClass->getFileName();
         [$aUseTokens, $aHeaderTokens] = $this->getTokens($sFileName);
-        if(!$aUseTokens)
+        if (!$aUseTokens)
         {
             return [];
         }
 
         $aImportedTypes = [];
-        foreach($aUseTokens as $aUseToken)
+        foreach ($aUseTokens as $aUseToken)
         {
             $aUseStatement = $this->getUseStatement($aUseToken, $aHeaderTokens);
             $aImportedTypes[$this->getStatementKey($aUseStatement)] = $aUseStatement[T_NAME_QUALIFIED];

src/Plugin/Code/AssetManager.php

Spacing +9 added lines, -9 removed lines

@@ -71,7 +71,7 @@ 
     public function shallIncludeAssets(AbstractPlugin $xPlugin): bool
     {
         $sPluginOptionName = 'assets.include.' . $xPlugin->getName();
-        if($this->xConfigManager->hasOption($sPluginOptionName))
+        if ($this->xConfigManager->hasOption($sPluginOptionName))
         {
             return $this->xConfigManager->getOption($sPluginOptionName);
         }
@@ -95,7 +95,7 @@ 
             $this->xConfigManager->getOption('js.lib.jq', "$sJsLibUri/libs/chibi/chibi$sJsExtension"),
             "$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";
@@ -113,7 +113,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());
         }
@@ -146,7 +146,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'))
         {
@@ -164,7 +164,7 @@ 
      */
     public function createJsFiles(CodeGenerator $xCodeGenerator): string
     {
-        if(!$this->shallCreateJsFiles())
+        if (!$this->shallCreateJsFiles())
         {
             return '';
         }
@@ -173,7 +173,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 '';
         }
@@ -181,15 +181,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/Code/CodeGenerator.php

Spacing +9 added lines, -9 removed lines

@@ -115,7 +115,7 @@ 
      */
     public function addCodeGenerator(string $sClassName, int $nPriority)
     {
-        while(isset($this->aCodeGenerators[$nPriority]))
+        while (isset($this->aCodeGenerators[$nPriority]))
         {
             $nPriority++;
         }
@@ -158,7 +158,7 @@ 
     private function generatePluginCodes(string $sClassName)
     {
         $xGenerator = $this->di->g($sClassName);
-        if(!is_subclass_of($xGenerator, AbstractPlugin::class) || $this->xAssetManager->shallIncludeAssets($xGenerator))
+        if (!is_subclass_of($xGenerator, AbstractPlugin::class) || $this->xAssetManager->shallIncludeAssets($xGenerator))
         {
             // HTML tags for CSS
             $this->sCss = trim($this->sCss) . "\n" . trim($xGenerator->getCss(), " \n");
@@ -167,7 +167,7 @@ 
         }
         // Javascript code
         $this->sJsScript = trim($this->sJsScript) . "\n\n" . trim($xGenerator->getScript(), " \n");
-        if($xGenerator->readyEnabled())
+        if ($xGenerator->readyEnabled())
         {
             $sScriptAttr = $xGenerator->readyInlined() ? 'sJsInlineScript' : 'sJsReadyScript';
             $this->$sScriptAttr = trim($this->$sScriptAttr) . "\n\n" . trim($xGenerator->getReadyScript(), " \n");
@@ -188,7 +188,7 @@ 
             'sScript' => trim($this->sJsReadyScript, " \n") . "\n\tjaxon.processCustomAttrs();\n",
         ]);
         $this->sJsInlineScript = trim($this->sJsInlineScript, " \n");
-        if(($this->sJsInlineScript))
+        if (($this->sJsInlineScript))
         {
             $this->sJsInlineScript = $this->render('ready.js', ['sScript' => $this->sJsInlineScript . "\n"]);
         }
@@ -205,7 +205,7 @@ 
      */
     private function generateCodes()
     {
-        if($this->bGenerated)
+        if ($this->bGenerated)
         {
             return;
         }
@@ -215,7 +215,7 @@ 
 
         $this->xAssetManager = $this->di->getAssetManager();
         $this->sJsOptions = $this->xAssetManager->getJsOptions();
-        foreach($this->aCodeGenerators as $sClassName)
+        foreach ($this->aCodeGenerators as $sClassName)
         {
             $this->generatePluginCodes($sClassName);
         }
@@ -277,16 +277,16 @@ 
     {
         $this->generateCodes();
         $sScript = '';
-        if(($bIncludeCss))
+        if (($bIncludeCss))
         {
             $sScript .= $this->getCss() . "\n";
         }
-        if(($bIncludeJs))
+        if (($bIncludeJs))
         {
             $sScript .= $this->getJs() . "\n";
         }
 
-        if(!($sUrl = $this->xAssetManager->createJsFiles($this)))
+        if (!($sUrl = $this->xAssetManager->createJsFiles($this)))
         {
             return trim($sScript) . "\n\n" . $this->render('wrapper.js',
                 ['sScript' => trim($this->sJsScript) . "\n\n" . trim($this->sJsInlineScript)]);