jaxon-php / jaxon-mono

jaxon-annotations/tests/TestAnnotation/TraitAnnotationTest.php

Spacing +1 added lines, -1 removed lines

@@ -45,7 +45,7 @@
         $aFiles = scandir($this->sCacheDir);
         foreach ($aFiles as $sFile)
         {
-            if($sFile !== '.' && $sFile !== '..')
+            if ($sFile !== '.' && $sFile !== '..')
             {
                 @unlink($this->sCacheDir . DIRECTORY_SEPARATOR . $sFile);
             }

jaxon-annotations/tests/TestAnnotation/AnnotationTest.php

Spacing +1 added lines, -1 removed lines

@@ -45,7 +45,7 @@
         $aFiles = scandir($this->sCacheDir);
         foreach ($aFiles as $sFile)
         {
-            if($sFile !== '.' && $sFile !== '..')
+            if ($sFile !== '.' && $sFile !== '..')
             {
                 @unlink($this->sCacheDir . DIRECTORY_SEPARATOR . $sFile);
             }

jaxon-annotations/src/register.php

Spacing +1 added lines, -1 removed lines

@@ -30,7 +30,7 @@
 function register(): void
 {
     // Do nothing if running in cli.
-    if(php_sapi_name() !== 'cli')
+    if (php_sapi_name() !== 'cli')
     {
         _register();
     };

jaxon-flot/src/register.php

Spacing +1 added lines, -1 removed lines

@@ -30,7 +30,7 @@
 function register(): void
 {
     // Do nothing if running in cli.
-    if(php_sapi_name() !== 'cli')
+    if (php_sapi_name() !== 'cli')
     {
         _register();
     };

jaxon-core/src/App/Metadata/Metadata.php

Spacing +5 added lines, -5 removed lines

@@ -139,16 +139,16 @@ 
     {
         $aProperties = [];
         $aClassProperties = [];
-        foreach($this->aAttributes as $sType => $aValues)
+        foreach ($this->aAttributes as $sType => $aValues)
         {
-            if($sType === 'exclude')
+            if ($sType === 'exclude')
             {
                 continue;
             }
 
-            foreach($aValues as $sMethod => $xData)
+            foreach ($aValues as $sMethod => $xData)
             {
-                if($sMethod === '*')
+                if ($sMethod === '*')
                 {
                     $aClassProperties[$xData->getName()] = $xData->getValue();
                     continue;
@@ -157,7 +157,7 @@ 
             }
         }
 
-        if(count($aClassProperties) > 0)
+        if (count($aClassProperties) > 0)
         {
             $aProperties['*'] = $aClassProperties;
         }

jaxon-core/src/Plugin/Request/CallableClass/CallableObject.php

Spacing +4 added lines, -5 removed lines

@@ -75,8 +75,7 @@ 
      */
     public function excluded(?string $sMethodName = null): bool
     {
-        return $sMethodName === null ? $this->xOptions->excluded() :
-            $this->xOptions->isProtectedMethod($sMethodName);
+        return $sMethodName === null ? $this->xOptions->excluded() : $this->xOptions->isProtectedMethod($sMethodName);
     }
 
     /**
@@ -176,11 +175,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];
@@ -218,7 +217,7 @@ 
             // Warning: dynamic properties will be deprecated in PHP8.2.
             $this->$sAttr = $xDiValue;
         };
-        foreach($aDiOptions as $sAttr => $sClass)
+        foreach ($aDiOptions as $sAttr => $sClass)
         {
             $this->setDiAttribute($xComponent, $sAttr, $this->di->get($sClass), $cSetter);
         }

jaxon-core/src/Script/CallFactory.php

Spacing +1 added lines, -2 removed lines

@@ -50,8 +50,7 @@
     public function rq(string $sClassName = ''): ?JxnCall
     {
         $sClassName = trim($sClassName);
-        return $sClassName === '' ? $this->cdi->getFunctionRequestFactory() :
-            $this->cdi->getComponentRequestFactory($sClassName);
+        return $sClassName === '' ? $this->cdi->getFunctionRequestFactory() : $this->cdi->getComponentRequestFactory($sClassName);
     }
 
     /**

Switch Indentation +30 added lines, -30 removed lines

@@ -28,18 +28,18 @@ 
 
 class CallFactory
 {
-    /**
+/**
      * The constructor.
      *
      * @param ComponentContainer $cdi
      * @param DialogCommand $xDialogCommand
      */
-    public function __construct(private ComponentContainer $cdi, DialogCommand $xDialogCommand)
-    {
-        JsExpr::setDialogCommand($xDialogCommand);
-    }
+public function __construct(private ComponentContainer $cdi, DialogCommand $xDialogCommand)
+{
+JsExpr::setDialogCommand($xDialogCommand);
+}
 
-    /**
+/**
      * Get a factory for a registered class.
      *
      * @param string $sClassName
@@ -47,14 +47,14 @@ 
      * @return JxnCall|null
      * @throws SetupException
      */
-    public function rq(string $sClassName = ''): ?JxnCall
-    {
-        $sClassName = trim($sClassName);
-        return $sClassName === '' ? $this->cdi->getFunctionRequestFactory() :
-            $this->cdi->getComponentRequestFactory($sClassName);
-    }
+public function rq(string $sClassName = ''): ?JxnCall
+{
+$sClassName = trim($sClassName);
+return $sClassName === '' ? $this->cdi->getFunctionRequestFactory() :
+$this->cdi->getComponentRequestFactory($sClassName);
+}
 
-    /**
+/**
      * Get a factory for a Javascript object.
      *
      * @param string $sObject
@@ -62,17 +62,17 @@ 
      *
      * @return JsObjectCall|null
      */
-    public function jo(string $sObject = '', ?Closure $xExprCb = null): ?JsObjectCall
-    {
-        /*
+public function jo(string $sObject = '', ?Closure $xExprCb = null): ?JsObjectCall
+{
+/*
          * The provided closure will be called each time a js expression is created with this factory,
          * with the expression as the only parameter.
          * It is currently used to attach the expression to a Jaxon response.
          */
-        return new JsObjectCall($xExprCb, trim($sObject, " \t"));
-    }
+return new JsObjectCall($xExprCb, trim($sObject, " \t"));
+}
 
-    /**
+/**
      * Get a factory for a JQuery selector.
      *
      * @param string $sPath    The jQuery selector path
@@ -81,17 +81,17 @@ 
      *
      * @return JqSelectorCall
      */
-    public function jq(string $sPath = '', $xContext = null, ?Closure $xExprCb = null): JqSelectorCall
-    {
-        /*
+public function jq(string $sPath = '', $xContext = null, ?Closure $xExprCb = null): JqSelectorCall
+{
+/*
          * The provided closure will be called each time a js expression is created with this factory,
          * with the expression as the only parameter.
          * It is currently used to attach the expression to a Jaxon response.
          */
-        return new JqSelectorCall($xExprCb, trim($sPath, " \t"), $xContext);
-    }
+return new JqSelectorCall($xExprCb, trim($sPath, " \t"), $xContext);
+}
 
-    /**
+/**
      * Get a factory for a Javascript element selector.
      *
      * @param string $sElementId    The DOM element id
@@ -99,13 +99,13 @@ 
      *
      * @return JsSelectorCall
      */
-    public function je(string $sElementId = '', ?Closure $xExprCb = null): JsSelectorCall
-    {
-        /*
+public function je(string $sElementId = '', ?Closure $xExprCb = null): JsSelectorCall
+{
+/*
          * The provided closure will be called each time a js expression is created with this factory,
          * with the expression as the only parameter.
          * It is currently used to attach the expression to a Jaxon response.
          */
-        return new JsSelectorCall($xExprCb, trim($sElementId, " \t"));
-    }
+return new JsSelectorCall($xExprCb, trim($sElementId, " \t"));
+}
 }

jaxon-core/src/Di/ComponentContainer.php

Indentation +1 added lines, -1 removed lines

@@ -138,7 +138,7 @@
      */
     public function val(string $sKey, $xValue)
     {
-       $this->xContainer->offsetSet($sKey, $xValue);
+        $this->xContainer->offsetSet($sKey, $xValue);
     }
 
     /**

Spacing +11 added lines, -11 removed lines

@@ -169,13 +169,13 @@ 
         try
         {
             // Make sure the registered class exists
-            if(isset($aOptions['include']))
+            if (isset($aOptions['include']))
             {
                 require_once $aOptions['include'];
             }
             $xReflectionClass = new ReflectionClass($sClassName);
             // Check if the class is registrable
-            if(!$xReflectionClass->isInstantiable())
+            if (!$xReflectionClass->isInstantiable())
             {
                 return;
             }
@@ -185,12 +185,12 @@ 
             $sClassKey = $this->getReflectionClassKey($sClassName);
             $this->val($sClassKey, $xReflectionClass);
             // Register the user class, but only if the user didn't already.
-            if(!$this->has($sClassName))
+            if (!$this->has($sClassName))
             {
                 $this->set($sClassName, fn() => $this->make($this->get($sClassKey)));
             }
         }
-        catch(ReflectionException $e)
+        catch (ReflectionException $e)
         {
             throw new SetupException($this->cn()->g(Translator::class)
                 ->trans('errors.class.invalid', ['name' => $sClassName]));
@@ -212,7 +212,7 @@ 
 
         $sComponentObject = $this->getCallableObjectKey($sClassName);
         // Prevent duplication. It's important not to use the class name here.
-        if($this->has($sComponentObject))
+        if ($this->has($sComponentObject))
         {
             return $sClassName;
         }
@@ -238,14 +238,14 @@ 
 
         // Initialize the user class instance
         $this->xContainer->extend($sClassName, function($xClassInstance) use($sClassName) {
-            if($xClassInstance instanceof AbstractComponent)
+            if ($xClassInstance instanceof AbstractComponent)
             {
                 $xHelper = $this->get($this->getCallableHelperKey($sClassName));
                 $xHelper->xTarget = $this->xTarget;
 
                 // Call the protected "initComponent()" method of the Component class.
                 $cSetter = function($di, $xHelper) {
-                    $this->initComponent($di, $xHelper);  // "$this" here refers to the Component class.
+                    $this->initComponent($di, $xHelper); // "$this" here refers to the Component class.
                 };
                 $cSetter = $cSetter->bindTo($xClassInstance, $xClassInstance);
                 call_user_func($cSetter, $this->di, $xHelper);
@@ -260,7 +260,7 @@ 
             /** @var CallableObject */
             $xCallableObject = $this->get($this->getCallableObjectKey($sClassName));
             $xCallableObject->setDiClassAttributes($xClassInstance);
-            if($this->xTarget !== null)
+            if ($this->xTarget !== null)
             {
                 $sMethodName = $this->xTarget->getMethodName();
                 $xCallableObject->setDiMethodAttributes($xClassInstance, $sMethodName);
@@ -323,17 +323,17 @@ 
     public function getComponentRequestFactory(string $sClassName): ?JxnCall
     {
         $sClassName = trim($sClassName, " \t");
-        if($sClassName === '')
+        if ($sClassName === '')
         {
             return null;
         }
 
         $sFactoryKey = $this->getRequestFactoryKey($sClassName);
-        if(!$this->has($sFactoryKey))
+        if (!$this->has($sFactoryKey))
         {
             $this->xContainer->offsetSet($sFactoryKey, function() use($sClassName) {
                 $sComponentId = str_replace('\\', '.', $sClassName);
-                if(!($xCallable = $this->makeCallableObject($sComponentId)))
+                if (!($xCallable = $this->makeCallableObject($sComponentId)))
                 {
                     return null;
                 }

Braces +1 added lines, -2 removed lines

@@ -189,8 +189,7 @@
             {
                 $this->set($sClassName, fn() => $this->make($this->get($sClassKey)));
             }
-        }
-        catch(ReflectionException $e)
+        } catch(ReflectionException $e)
         {
             throw new SetupException($this->cn()->g(Translator::class)
                 ->trans('errors.class.invalid', ['name' => $sClassName]));

jaxon-core/src/App/Metadata/MetadataCache.php

Spacing +3 added lines, -3 removed lines

@@ -51,12 +51,12 @@
         $sMetadataVar = '$xMetadata';
         $sDataVar = '$xData';
         $aCalls = ["$sMetadataVar = new " . Metadata::class . '();'];
-        foreach($xMetadata->getAttributes() as $sType => $aValues)
+        foreach ($xMetadata->getAttributes() as $sType => $aValues)
         {
-            foreach($aValues as $sMethod => $xData)
+            foreach ($aValues as $sMethod => $xData)
             {
                 $aCalls[] = "$sDataVar = {$sMetadataVar}->{$sType}('{$sMethod}');";
-                foreach($xData->encode($sDataVar) as $sCall)
+                foreach ($xData->encode($sDataVar) as $sCall)
                 {
                     $aCalls[] = $sCall;
                 }