jaxon-php / jaxon-core

src/Plugin/Request/CallableClass/CallableRepository.php

Spacing +19 added lines, -19 removed lines

@@ -110,7 +110,7 @@ 
 
         // The methods of the CallableClass class must not be exported
         $xCallableClass = new ReflectionClass(CallableClass::class);
-        foreach($xCallableClass->getMethods(ReflectionMethod::IS_PUBLIC) as $xMethod)
+        foreach ($xCallableClass->getMethods(ReflectionMethod::IS_PUBLIC) as $xMethod)
         {
             $this->aProtectedMethods[] = $xMethod->getName();
         }
@@ -181,15 +181,15 @@ 
      */
     public 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.
         }
@@ -200,25 +200,25 @@ 
             $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']);
             }
@@ -264,10 +264,10 @@ 
     private function getNamespaceClassOptions(string $sClassName)
     {
         // Find the corresponding namespace
-        foreach($this->aNamespaceOptions as $sNamespace => $aOptions)
+        foreach ($this->aNamespaceOptions as $sNamespace => $aOptions)
         {
             // 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
                 $this->aClasses[$sClassName] = $this->makeClassOptions($sClassName,
@@ -288,17 +288,17 @@ 
     public function getClassOptions(string $sClassName): array
     {
         // Find options for a class registered with namespace.
-        if(!isset($this->aClasses[$sClassName]))
+        if (!isset($this->aClasses[$sClassName]))
         {
             $this->getNamespaceClassOptions($sClassName);
-            if(!isset($this->aClasses[$sClassName]))
+            if (!isset($this->aClasses[$sClassName]))
             {
                 // Find options for a class registered without namespace.
                 // We then need to parse all classes to be able to find one.
                 $this->di->getCallableRegistry()->parseDirectories();
             }
         }
-        if(isset($this->aClasses[$sClassName]))
+        if (isset($this->aClasses[$sClassName]))
         {
             return $this->aClasses[$sClassName];
         }
@@ -327,7 +327,7 @@ 
     public function getCallableObjects(): array
     {
         $aCallableObjects = [];
-        foreach($this->aClasses as $sClassName => $aOptions)
+        foreach ($this->aClasses as $sClassName => $aOptions)
         {
             $this->di->registerCallableClass($sClassName, $aOptions);
             $aCallableObjects[$sClassName] = $this->di->getCallableObject($sClassName);

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