jaxon-php / jaxon-core

src/Di/Container.php

Spacing +7 added lines, -7 removed lines

@@ -141,7 +141,7 @@ 
      */
     public function has(string $sClass): bool
     {
-        if($this->xContainer != null && $this->xContainer->has($sClass))
+        if ($this->xContainer != null && $this->xContainer->has($sClass))
         {
             return true;
         }
@@ -172,13 +172,13 @@ 
     {
         try
         {
-            if($this->xContainer != null && $this->xContainer->has($sClass))
+            if ($this->xContainer != null && $this->xContainer->has($sClass))
             {
                 return $this->xContainer->get($sClass);
             }
             return $this->offsetGet($sClass);
         }
-        catch(Exception|Throwable $e)
+        catch (Exception | Throwable $e)
         {
             $xTranslator = $this->g(Translator::class);
             $sMessage = $xTranslator->trans('errors.class.container', ['name' => $sClass]);
@@ -238,22 +238,22 @@ 
      */
     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();
         }
         $parameters = $constructor->getParameters();
         $parameterInstances = [];
-        foreach($parameters as $parameter)
+        foreach ($parameters as $parameter)
         {
             // Get the parameter instance from the DI
             $parameterInstances[] = $this->get($parameter->getClass()->getName());

Braces +1 added lines, -2 removed lines

@@ -177,8 +177,7 @@
                 return $this->xContainer->get($sClass);
             }
             return $this->offsetGet($sClass);
-        }
-        catch(Exception|Throwable $e)
+        } catch(Exception|Throwable $e)
         {
             $xTranslator = $this->g(Translator::class);
             $sMessage = $xTranslator->trans('errors.class.container', ['name' => $sClass]);

src/Di/Traits/RegisterTrait.php

Spacing +11 added lines, -11 removed lines

@@ -36,15 +36,15 @@ 
     private function getCallableObjectOptions(array $aConfigOptions, array $aAnnotationOptions): array
     {
         $aOptions = [];
-        foreach($aConfigOptions as $sNames => $aFunctionOptions)
+        foreach ($aConfigOptions as $sNames => $aFunctionOptions)
         {
             $aFunctionNames = explode(',', $sNames); // Names are in comma-separated list.
-            foreach($aFunctionNames as $sFunctionName)
+            foreach ($aFunctionNames as $sFunctionName)
             {
                 $aOptions[$sFunctionName] = array_merge($aOptions[$sFunctionName] ?? [], $aFunctionOptions);
             }
         }
-        foreach($aAnnotationOptions as $sFunctionName => $aFunctionOptions)
+        foreach ($aAnnotationOptions as $sFunctionName => $aFunctionOptions)
         {
             $aOptions[$sFunctionName] = array_merge($aOptions[$sFunctionName] ?? [], $aFunctionOptions);
         }
@@ -65,7 +65,7 @@ 
         $xAnnotationReader = $this->g(AnnotationReaderInterface::class);
         [$bExcluded, $aAnnotationOptions, $aAnnotationProtected] =
             $xAnnotationReader->getAttributes($sClassName, $xCallableObject->getPublicMethods($aProtectedMethods));
-        if($bExcluded)
+        if ($bExcluded)
         {
             $xCallableObject->configure('excluded', true);
             return;
@@ -77,11 +77,11 @@ 
         // Functions options
         $aCallableOptions = [];
         $aOptions = $this->getCallableObjectOptions($aOptions['functions'], $aAnnotationOptions);
-        foreach($aOptions as $sFunctionName => $aFunctionOptions)
+        foreach ($aOptions as $sFunctionName => $aFunctionOptions)
         {
-            foreach($aFunctionOptions as $sOptionName => $xOptionValue)
+            foreach ($aFunctionOptions as $sOptionName => $xOptionValue)
             {
-                if(substr($sOptionName, 0, 2) !== '__')
+                if (substr($sOptionName, 0, 2) !== '__')
                 {
                     // Options for javascript code.
                     $aCallableOptions[$sFunctionName][$sOptionName] = $xOptionValue;
@@ -110,7 +110,7 @@ 
         $sReflectionClass = $sClassName . '_ReflectionClass';
 
         // Make sure the registered class exists
-        if(isset($aOptions['include']))
+        if (isset($aOptions['include']))
         {
             require_once($aOptions['include']);
         }
@@ -119,7 +119,7 @@ 
         {
             $this->val($sReflectionClass, new ReflectionClass($sClassName));
         }
-        catch(ReflectionException $e)
+        catch (ReflectionException $e)
         {
             $xTranslator = $this->g(Translator::class);
             $sMessage = $xTranslator->trans('errors.class.invalid', ['name' => $sClassName]);
@@ -145,7 +145,7 @@ 
         $this->set($sClassName, function($c) use($sClassName, $sReflectionClass) {
             $xRegisteredObject = $this->make($c->g($sReflectionClass));
             // Initialize the object
-            if($xRegisteredObject instanceof CallableClass)
+            if ($xRegisteredObject instanceof CallableClass)
             {
                 // Set the protected attributes of the object
                 $cSetter = function($c, $sClassName) {
@@ -158,7 +158,7 @@ 
 
             // Run the callback for class initialisation
             $aCallbacks = $c->g(CallbackManager::class)->getInitCallbacks();
-            foreach($aCallbacks as $xCallback)
+            foreach ($aCallbacks as $xCallback)
             {
                 call_user_func($xCallback, $xRegisteredObject);
             }

Braces +1 added lines, -2 removed lines

@@ -118,8 +118,7 @@
         try
         {
             $this->val($sReflectionClass, new ReflectionClass($sClassName));
-        }
-        catch(ReflectionException $e)
+        } catch(ReflectionException $e)
         {
             $xTranslator = $this->g(Translator::class);
             $sMessage = $xTranslator->trans('errors.class.invalid', ['name' => $sClassName]);

src/Di/Traits/AnnotationTrait.php

Spacing +3 added lines, -3 removed lines

@@ -30,7 +30,7 @@ 
             };
         });
 
-        if(class_exists(AnnotationReader::class))
+        if (class_exists(AnnotationReader::class))
         {
             $sEventListenerKey = AnnotationReader::class . '\\ConfigListener';
             // The annotation package is installed, register the real annotation reader,
@@ -40,7 +40,7 @@ 
                 {
                     public function onChanges(Config $xConfig)
                     {
-                        if($xConfig->getOption('core.annotations.on'))
+                        if ($xConfig->getOption('core.annotations.on'))
                         {
                             AnnotationReader::register(jaxon()->di());
                         }
@@ -48,7 +48,7 @@ 
 
                     public function onChange(Config $xConfig, string $sName)
                     {
-                        if($sName === 'core.annotations.on' && $xConfig->getOption('core.annotations.on'))
+                        if ($sName === 'core.annotations.on' && $xConfig->getOption('core.annotations.on'))
                         {
                             AnnotationReader::register(jaxon()->di());
                         }

src/Plugin/Request/CallableClass/CallableClassPlugin.php

Spacing +12 added lines, -12 removed lines

@@ -133,15 +133,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'));
         }
@@ -186,16 +186,16 @@ 
         $sCode = '';
         $aJsClasses = [];
         $aNamespaces = $this->xRepository->getNamespaces();
-        foreach($aNamespaces as $sNamespace)
+        foreach ($aNamespaces 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;
@@ -216,7 +216,7 @@ 
      */
     private function getCallableScript(string $sClassName, CallableObject $xCallableObject): string
     {
-        if($xCallableObject->excluded())
+        if ($xCallableObject->excluded())
         {
             return '';
         }
@@ -244,7 +244,7 @@ 
         });
 
         $sCode = $this->getNamespacesScript();
-        foreach($aCallableObjects as $sClassName => $xCallableObject)
+        foreach ($aCallableObjects as $sClassName => $xCallableObject)
         {
             $sCode .= $this->getCallableScript($sClassName, $xCallableObject);
         }
@@ -257,7 +257,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']);
         }
@@ -271,7 +271,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;
@@ -289,7 +289,7 @@ 
         $sRequestedClass = $this->xTarget->getClassName();
         $sRequestedMethod = $this->xTarget->getMethodName();
 
-        if(!$this->xValidator->validateClass($sRequestedClass) ||
+        if (!$this->xValidator->validateClass($sRequestedClass) ||
             !$this->xValidator->validateMethod($sRequestedMethod))
         {
             // Unable to find the requested object or method
@@ -303,7 +303,7 @@ 
             $xCallableObject = $this->xRegistry->getCallableObject($sRequestedClass);
             return $xCallableObject->call($sRequestedMethod, $this->xParameterReader->args());
         }
-        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

@@ -140,8 +140,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'));
         }
@@ -302,8 +301,7 @@ 
         {
             $xCallableObject = $this->xRegistry->getCallableObject($sRequestedClass);
             return $xCallableObject->call($sRequestedMethod, $this->xParameterReader->args());
-        }
-        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/CallableObject.php

Switch Indentation +30 added lines, -30 removed lines

@@ -207,36 +207,36 @@
         switch($sName)
         {
         // Set the separator
-        case 'separator':
-            if($xValue === '_' || $xValue === '.')
-            {
-                $this->sSeparator = $xValue;
-            }
-            break;
-        // Set the protected methods
-        case 'protected':
-            if(is_array($xValue))
-            {
-                $this->aProtectedMethods = array_merge($this->aProtectedMethods, $xValue);
-            }
-            break;
-        // 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->aAttributes = array_merge($this->aAttributes, $xValue);
-            break;
-        case 'excluded':
-            $this->bExcluded = (bool)$xValue;
-            break;
-        default:
-            break;
+            case 'separator':
+                if($xValue === '_' || $xValue === '.')
+                {
+                    $this->sSeparator = $xValue;
+                }
+                break;
+            // Set the protected methods
+            case 'protected':
+                if(is_array($xValue))
+                {
+                    $this->aProtectedMethods = array_merge($this->aProtectedMethods, $xValue);
+                }
+                break;
+            // 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->aAttributes = array_merge($this->aAttributes, $xValue);
+                break;
+            case 'excluded':
+                $this->bExcluded = (bool)$xValue;
+                break;
+            default:
+                break;
         }
     }
 

Spacing +10 added lines, -10 removed lines

@@ -181,13 +181,13 @@ 
      */
     private function setHookMethods(array &$aHookMethods, $xValue)
     {
-        foreach($xValue as $sCalledMethod => $xMethodToCall)
+        foreach ($xValue as $sCalledMethod => $xMethodToCall)
         {
-            if(is_array($xMethodToCall))
+            if (is_array($xMethodToCall))
             {
                 $aHookMethods[$sCalledMethod] = $xMethodToCall;
             }
-            elseif(is_string($xMethodToCall))
+            elseif (is_string($xMethodToCall))
             {
                 $aHookMethods[$sCalledMethod] = [$xMethodToCall];
             }
@@ -204,18 +204,18 @@ 
      */
     public function configure(string $sName, $xValue)
     {
-        switch($sName)
+        switch ($sName)
         {
         // Set the separator
         case 'separator':
-            if($xValue === '_' || $xValue === '.')
+            if ($xValue === '_' || $xValue === '.')
             {
                 $this->sSeparator = $xValue;
             }
             break;
         // Set the protected methods
         case 'protected':
-            if(is_array($xValue))
+            if (is_array($xValue))
             {
                 $this->aProtectedMethods = array_merge($this->aProtectedMethods, $xValue);
             }
@@ -233,7 +233,7 @@ 
             $this->aAttributes = array_merge($this->aAttributes, $xValue);
             break;
         case 'excluded':
-            $this->bExcluded = (bool)$xValue;
+            $this->bExcluded = (bool) $xValue;
             break;
         default:
             break;
@@ -339,11 +339,11 @@ 
     private function callHookMethods(array $aHookMethods, string $sMethod)
     {
         $aMethods = $aHookMethods[$sMethod] ?? $aHookMethods['*'] ?? [];
-        foreach($aMethods as $xKey => $xValue)
+        foreach ($aMethods as $xKey => $xValue)
         {
             $sMethodName = $xValue;
             $aMethodArgs = [];
-            if(is_string($xKey))
+            if (is_string($xKey))
             {
                 $sMethodName = $xKey;
                 $aMethodArgs = is_array($xValue) ? $xValue : [$xValue];
@@ -368,7 +368,7 @@ 
 
         // Set attributes from the DI container
         $aAttributes = $this->aAttributes[$sMethod] ?? $this->aAttributes['*'] ?? [];
-        foreach($aAttributes as $sName => $sClass)
+        foreach ($aAttributes as $sName => $sClass)
         {
             // Warning: dynamic properties will be deprecated in PHP8.2.
             $this->xRegisteredObject->$sName = $this->di->get($sClass);

Braces +1 added lines, -2 removed lines

@@ -186,8 +186,7 @@
             if(is_array($xMethodToCall))
             {
                 $aHookMethods[$sCalledMethod] = $xMethodToCall;
-            }
-            elseif(is_string($xMethodToCall))
+            } elseif(is_string($xMethodToCall))
             {
                 $aHookMethods[$sCalledMethod] = [$xMethodToCall];
             }