jaxon-php / jaxon-mono

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);
     }
 
     /**

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

Switch Indentation +204 added lines, -204 removed lines

@@ -39,73 +39,73 @@ 
 
 class ComponentContainer
 {
-    use Traits\DiAutoTrait;
-    use Traits\ComponentTrait;
+use Traits\DiAutoTrait;
+use Traits\ComponentTrait;
 
-    /**
+/**
      * The Dependency Injection Container for registered classes
      *
      * @var PimpleContainer
      */
-    private $xContainer;
+private $xContainer;
 
-    /**
+/**
      * This will be set only when getting the object targetted by the ajax request.
      *
      * @var Target|null
      */
-    private $xTarget = null;
+private $xTarget = null;
 
-    /**
+/**
      * The class constructor
      *
      * @param Container $di
      */
-    public function __construct(private Container $di)
-    {
-        $this->xContainer = new PimpleContainer();
-        $this->val(ComponentContainer::class, $this);
-
-        // Register the call factory for registered functions
-        $this->set($this->getRequestFactoryKey(JxnCall::class), fn() =>
-            new JxnCall($this->di->g(ConfigManager::class)
-                ->getOption('core.prefix.function', '')));
-
-        // Register the pagination component, but do not export to js.
-        $this->saveComponent(Pagination::class, [
-            'excluded' => true,
-            'separator' => '.',
-            // The namespace has the same name as the Component class.
-            'namespace' => Component::class,
-        ]);
-
-        $this->setComponentPublicMethods('node', NodeComponent::class, ['item', 'html']);
-        $this->setComponentPublicMethods('func', FuncComponent::class, ['paginator']);
-    }
+public function __construct(private Container $di)
+{
+$this->xContainer = new PimpleContainer();
+$this->val(ComponentContainer::class, $this);
+
+// Register the call factory for registered functions
+$this->set($this->getRequestFactoryKey(JxnCall::class), fn() =>
+new JxnCall($this->di->g(ConfigManager::class)
+    ->getOption('core.prefix.function', '')));
+
+// Register the pagination component, but do not export to js.
+$this->saveComponent(Pagination::class, [
+'excluded' => true,
+'separator' => '.',
+// The namespace has the same name as the Component class.
+'namespace' => Component::class,
+]);
+
+$this->setComponentPublicMethods('node', NodeComponent::class, ['item', 'html']);
+$this->setComponentPublicMethods('func', FuncComponent::class, ['paginator']);
+}
 
-    /**
+/**
      * The container for parameters
      *
      * @return Container
      */
-    protected function cn(): Container
-    {
-        return $this->di;
-    }
+protected function cn(): Container
+{
+return $this->di;
+}
 
-    /**
+/**
      * Check if a class is defined in the container
      *
      * @param class-string $sClass    The full class name
      *
      * @return bool
      */
-    public function has(string $sClass): bool
-    {
-        return $this->xContainer->offsetExists($sClass);
-    }
+public function has(string $sClass): bool
+{
+return $this->xContainer->offsetExists($sClass);
+}
 
-    /**
+/**
      * Save a closure in the container
      *
      * @param class-string $sClass    The full class name
@@ -113,12 +113,12 @@ 
      *
      * @return void
      */
-    public function set(string $sClass, Closure $xClosure)
-    {
-        $this->xContainer->offsetSet($sClass, fn() => $xClosure($this));
-    }
+public function set(string $sClass, Closure $xClosure)
+{
+$this->xContainer->offsetSet($sClass, fn() => $xClosure($this));
+}
 
-    /**
+/**
      * Save a value in the container
      *
      * @param string|class-string $sKey    The key
@@ -126,12 +126,12 @@ 
      *
      * @return void
      */
-    public function val(string $sKey, $xValue)
-    {
-       $this->xContainer->offsetSet($sKey, $xValue);
-    }
+public function val(string $sKey, $xValue)
+{
+$this->xContainer->offsetSet($sKey, $xValue);
+}
 
-    /**
+/**
      * Get a class instance
      *
      * @template T
@@ -139,12 +139,12 @@ 
      *
      * @return T
      */
-    public function get(string $sClass)
-    {
-        return $this->xContainer->offsetGet($sClass);
-    }
+public function get(string $sClass)
+{
+return $this->xContainer->offsetGet($sClass);
+}
 
-    /**
+/**
      * Get a component when one of its method needs to be called
      *
      * @template T
@@ -153,17 +153,17 @@ 
      *
      * @return T|null
      */
-    public function getTargetComponent(string $sClassName, Target $xTarget): mixed
-    {
-        // Set the target only when getting the object targetted by the ajax request.
-        $this->xTarget = $xTarget;
-        $xComponent = $this->get($sClassName);
-        $this->xTarget = null;
+public function getTargetComponent(string $sClassName, Target $xTarget): mixed
+{
+// Set the target only when getting the object targetted by the ajax request.
+$this->xTarget = $xTarget;
+$xComponent = $this->get($sClassName);
+$this->xTarget = null;
 
-        return $xComponent;
-    }
+return $xComponent;
+}
 
-    /**
+/**
      * Register a component and its options
      *
      * @param class-string $sClassName    The class name
@@ -171,40 +171,40 @@ 
      *
      * @return void
      */
-    public function saveComponent(string $sClassName, array $aOptions): void
-    {
-        try
-        {
-            // Make sure the registered class exists
-            if(isset($aOptions['include']))
-            {
-                require_once $aOptions['include'];
-            }
-            $xReflectionClass = new ReflectionClass($sClassName);
-            // Check if the class is registrable
-            if(!$xReflectionClass->isInstantiable())
-            {
-                return;
-            }
-
-            $this->_saveClassOptions($sClassName, $aOptions);
-
-            $sClassKey = $this->getReflectionClassKey($sClassName);
-            $this->val($sClassKey, $xReflectionClass);
-            // Register the user class, but only if the user didn't already.
-            if(!$this->has($sClassName))
-            {
-                $this->set($sClassName, fn() => $this->make($this->get($sClassKey)));
-            }
-        }
-        catch(ReflectionException $e)
-        {
-            throw new SetupException($this->cn()->g(Translator::class)
-                ->trans('errors.class.invalid', ['name' => $sClassName]));
-        }
-    }
+public function saveComponent(string $sClassName, array $aOptions): void
+{
+try
+{
+// Make sure the registered class exists
+if(isset($aOptions['include']))
+{
+    require_once $aOptions['include'];
+}
+$xReflectionClass = new ReflectionClass($sClassName);
+// Check if the class is registrable
+if(!$xReflectionClass->isInstantiable())
+{
+    return;
+}
+
+$this->_saveClassOptions($sClassName, $aOptions);
 
-    /**
+$sClassKey = $this->getReflectionClassKey($sClassName);
+$this->val($sClassKey, $xReflectionClass);
+// Register the user class, but only if the user didn't already.
+if(!$this->has($sClassName))
+{
+    $this->set($sClassName, fn() => $this->make($this->get($sClassKey)));
+}
+}
+catch(ReflectionException $e)
+{
+throw new SetupException($this->cn()->g(Translator::class)
+    ->trans('errors.class.invalid', ['name' => $sClassName]));
+}
+}
+
+/**
      * Register a component
      *
      * @param string $sComponentId The component name
@@ -212,74 +212,74 @@ 
      * @return string
      * @throws SetupException
      */
-    private function _registerComponent(string $sComponentId): string
-    {
-        // Replace all separators ('.' or '_') with antislashes, and trim the class name.
-        $sClassName = trim(str_replace(['.', '_'], '\\', $sComponentId), '\\');
-
-        $sComponentObject = $this->getCallableObjectKey($sClassName);
-        // Prevent duplication. It's important not to use the class name here.
-        if($this->has($sComponentObject))
-        {
-            return $sClassName;
-        }
-
-        // Register the helper class
-        $this->set($this->getCallableHelperKey($sClassName), function() use($sClassName) {
-            $xFactory = $this->di->getCallFactory();
-            return new ComponentHelper($this, $xFactory->rq($sClassName),
-                $xFactory, $this->di->getViewRenderer(),
-                $this->di->getLogger(), $this->di->getSessionManager(),
-                $this->di->getStash(), $this->di->getUploadHandler());
-        });
-
-        $this->discoverComponent($sClassName);
-
-        // Register the callable object
-        $this->set($sComponentObject, function() use($sComponentId, $sClassName) {
-            $aOptions = $this->_getClassOptions($sComponentId);
-            $xReflectionClass = $this->get($this->getReflectionClassKey($sClassName));
-            $xOptions = $this->getComponentOptions($xReflectionClass, $aOptions);
-            return new CallableObject($this, $this->di, $xReflectionClass, $xOptions);
-        });
-
-        // Initialize the user class instance
-        $this->xContainer->extend($sClassName, function($xClassInstance) use($sClassName) {
-            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.
-                };
-                $cSetter = $cSetter->bindTo($xClassInstance, $xClassInstance);
-                call_user_func($cSetter, $this->di, $xHelper);
-            }
-
-            // Run the callbacks for class initialisation
-            $this->di->g(CallbackManager::class)->onInit($xClassInstance);
-
-            // Set attributes from the DI container.
-            // The class level DI options are set on any component.
-            // The method level DI options are set only on the targetted component.
-            /** @var CallableObject */
-            $xCallableObject = $this->get($this->getCallableObjectKey($sClassName));
-            $xCallableObject->setDiClassAttributes($xClassInstance);
-            if($this->xTarget !== null)
-            {
-                $sMethodName = $this->xTarget->getMethodName();
-                $xCallableObject->setDiMethodAttributes($xClassInstance, $sMethodName);
-            }
-
-            return $xClassInstance;
-        });
-
-        return $sClassName;
-    }
+private function _registerComponent(string $sComponentId): string
+{
+// Replace all separators ('.' or '_') with antislashes, and trim the class name.
+$sClassName = trim(str_replace(['.', '_'], '\\', $sComponentId), '\\');
+
+$sComponentObject = $this->getCallableObjectKey($sClassName);
+// Prevent duplication. It's important not to use the class name here.
+if($this->has($sComponentObject))
+{
+return $sClassName;
+}
+
+// Register the helper class
+$this->set($this->getCallableHelperKey($sClassName), function() use($sClassName) {
+$xFactory = $this->di->getCallFactory();
+return new ComponentHelper($this, $xFactory->rq($sClassName),
+    $xFactory, $this->di->getViewRenderer(),
+    $this->di->getLogger(), $this->di->getSessionManager(),
+    $this->di->getStash(), $this->di->getUploadHandler());
+});
+
+$this->discoverComponent($sClassName);
+
+// Register the callable object
+$this->set($sComponentObject, function() use($sComponentId, $sClassName) {
+$aOptions = $this->_getClassOptions($sComponentId);
+$xReflectionClass = $this->get($this->getReflectionClassKey($sClassName));
+$xOptions = $this->getComponentOptions($xReflectionClass, $aOptions);
+return new CallableObject($this, $this->di, $xReflectionClass, $xOptions);
+});
+
+// Initialize the user class instance
+$this->xContainer->extend($sClassName, function($xClassInstance) use($sClassName) {
+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.
+    };
+    $cSetter = $cSetter->bindTo($xClassInstance, $xClassInstance);
+    call_user_func($cSetter, $this->di, $xHelper);
+}
+
+// Run the callbacks for class initialisation
+$this->di->g(CallbackManager::class)->onInit($xClassInstance);
+
+// Set attributes from the DI container.
+// The class level DI options are set on any component.
+// The method level DI options are set only on the targetted component.
+/** @var CallableObject */
+$xCallableObject = $this->get($this->getCallableObjectKey($sClassName));
+$xCallableObject->setDiClassAttributes($xClassInstance);
+if($this->xTarget !== null)
+{
+    $sMethodName = $this->xTarget->getMethodName();
+    $xCallableObject->setDiMethodAttributes($xClassInstance, $sMethodName);
+}
+
+return $xClassInstance;
+});
 
-    /**
+return $sClassName;
+}
+
+/**
      * Get the callable object for a given class
      * The callable object is registered if it is not already in the DI.
      *
@@ -288,13 +288,13 @@ 
      * @return CallableObject|null
      * @throws SetupException
      */
-    public function makeCallableObject(string $sComponentId): ?CallableObject
-    {
-        $sClassName = $this->_registerComponent($sComponentId);
-        return $this->get($this->getCallableObjectKey($sClassName));
-    }
+public function makeCallableObject(string $sComponentId): ?CallableObject
+{
+$sClassName = $this->_registerComponent($sComponentId);
+return $this->get($this->getCallableObjectKey($sClassName));
+}
 
-    /**
+/**
      * Get an instance of a component by name
      *
      * @template T
@@ -303,53 +303,53 @@ 
      * @return T|null
      * @throws SetupException
      */
-    public function makeComponent(string $sClassName): mixed
-    {
-        $sComponentId = str_replace('\\', '.', $sClassName);
-        $sClassName = $this->_registerComponent($sComponentId);
-        return $this->get($sClassName);
-    }
+public function makeComponent(string $sClassName): mixed
+{
+$sComponentId = str_replace('\\', '.', $sClassName);
+$sClassName = $this->_registerComponent($sComponentId);
+return $this->get($sClassName);
+}
 
-    /**
+/**
      * Get a factory for a call to a registered function.
      *
      * @return JxnCall
      */
-    public function getFunctionRequestFactory(): JxnCall
-    {
-        return $this->get($this->getRequestFactoryKey(JxnCall::class));
-    }
+public function getFunctionRequestFactory(): JxnCall
+{
+return $this->get($this->getRequestFactoryKey(JxnCall::class));
+}
 
-    /**
+/**
      * Get a factory for a call to a registered component.
      *
      * @param class-string $sClassName
      *
      * @return JxnCall|null
      */
-    public function getComponentRequestFactory(string $sClassName): ?JxnCall
+public function getComponentRequestFactory(string $sClassName): ?JxnCall
+{
+$sClassName = trim($sClassName, " \t");
+if($sClassName === '')
+{
+return null;
+}
+
+$sFactoryKey = $this->getRequestFactoryKey($sClassName);
+if(!$this->has($sFactoryKey))
+{
+$this->xContainer->offsetSet($sFactoryKey, function() use($sClassName) {
+    $sComponentId = str_replace('\\', '.', $sClassName);
+    if(!($xCallable = $this->makeCallableObject($sComponentId)))
     {
-        $sClassName = trim($sClassName, " \t");
-        if($sClassName === '')
-        {
-            return null;
-        }
-
-        $sFactoryKey = $this->getRequestFactoryKey($sClassName);
-        if(!$this->has($sFactoryKey))
-        {
-            $this->xContainer->offsetSet($sFactoryKey, function() use($sClassName) {
-                $sComponentId = str_replace('\\', '.', $sClassName);
-                if(!($xCallable = $this->makeCallableObject($sComponentId)))
-                {
-                    return null;
-                }
-
-                $xConfigManager = $this->di->g(ConfigManager::class);
-                $sPrefix = $xConfigManager->getOption('core.prefix.class', '');
-                return new JxnClassCall($sPrefix . $xCallable->getJsName());
-            });
-        }
-        return $this->get($sFactoryKey);
+        return null;
     }
+
+    $xConfigManager = $this->di->g(ConfigManager::class);
+    $sPrefix = $xConfigManager->getOption('core.prefix.class', '');
+    return new JxnClassCall($sPrefix . $xCallable->getJsName());
+});
+}
+return $this->get($sFactoryKey);
+}
 }

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

Switch Indentation +46 added lines, -46 removed lines

@@ -28,60 +28,60 @@ 
 
 class MetadataCache
 {
-    /**
+/**
      * @param string $sCacheDir
      */
-    public function __construct(private string $sCacheDir)
-    {}
+public function __construct(private string $sCacheDir)
+{}
 
-    /**
+/**
      * @param string $sClass
      *
      * @return string
      */
-    private function filepath(string $sClass): string
-    {
-        $sFilename = trim(str_replace(['\\', '.'], DIRECTORY_SEPARATOR,
-            strtolower($sClass)), DIRECTORY_SEPARATOR);
-        return rtrim($this->sCacheDir, "/\\") . DIRECTORY_SEPARATOR .
-            "metadata" . DIRECTORY_SEPARATOR . "{$sFilename}.php";
-    }
+private function filepath(string $sClass): string
+{
+$sFilename = trim(str_replace(['\\', '.'], DIRECTORY_SEPARATOR,
+strtolower($sClass)), DIRECTORY_SEPARATOR);
+return rtrim($this->sCacheDir, "/\\") . DIRECTORY_SEPARATOR .
+"metadata" . DIRECTORY_SEPARATOR . "{$sFilename}.php";
+}
 
-    /**
+/**
      * Generate the PHP code to create a metadata object.
      *
      * @return array
      */
-    private function encode(Metadata $xMetadata): array
+private function encode(Metadata $xMetadata): array
+{
+$sMetadataVar = '$xMetadata';
+$sDataVar = '$xData';
+$aCalls = ["$sMetadataVar = new " . Metadata::class . '();'];
+foreach($xMetadata->getAttributes() as $sType => $aValues)
+{
+foreach($aValues as $sMethod => $xData)
+{
+    $aCalls[] = "$sDataVar = {$sMetadataVar}->{$sType}('{$sMethod}');";
+    foreach($xData->encode($sDataVar) as $sCall)
     {
-        $sMetadataVar = '$xMetadata';
-        $sDataVar = '$xData';
-        $aCalls = ["$sMetadataVar = new " . Metadata::class . '();'];
-        foreach($xMetadata->getAttributes() as $sType => $aValues)
-        {
-            foreach($aValues as $sMethod => $xData)
-            {
-                $aCalls[] = "$sDataVar = {$sMetadataVar}->{$sType}('{$sMethod}');";
-                foreach($xData->encode($sDataVar) as $sCall)
-                {
-                    $aCalls[] = $sCall;
-                }
-            }
-        }
-        $aCalls[] = "return $sMetadataVar;";
-        return $aCalls;
+        $aCalls[] = $sCall;
     }
+}
+}
+$aCalls[] = "return $sMetadataVar;";
+return $aCalls;
+}
 
-    /**
+/**
      * @param string $sClass
      * @param Metadata $xMetadata
      *
      * @return void
      */
-    public function save(string $sClass, Metadata $xMetadata): void
-    {
-        $sDataCode = implode("\n    ", $this->encode($xMetadata));
-        $sPhpCode = <<<CODE
+public function save(string $sClass, Metadata $xMetadata): void
+{
+$sDataCode = implode("\n    ", $this->encode($xMetadata));
+$sPhpCode = <<<CODE
 <?php
 
 return function() {
@@ -89,21 +89,21 @@ 
 };
 
 CODE;
-        // Recursively create the directories.
-        $sPath = $this->filepath($sClass);
-        @mkdir(dirname($sPath), 0755, true);
-        file_put_contents($sPath, $sPhpCode);
-    }
+// Recursively create the directories.
+$sPath = $this->filepath($sClass);
+@mkdir(dirname($sPath), 0755, true);
+file_put_contents($sPath, $sPhpCode);
+}
 
-    /**
+/**
      * @param string $sClass
      *
      * @return Metadata|null
      */
-    public function read(string $sClass): ?Metadata
-    {
-        $sPath = $this->filepath($sClass);
-        $fCreator = file_exists($sPath) ? require $sPath : null;
-        return $fCreator instanceof Closure ? $fCreator() : null;
-    }
+public function read(string $sClass): ?Metadata
+{
+$sPath = $this->filepath($sClass);
+$fCreator = file_exists($sPath) ? require $sPath : null;
+return $fCreator instanceof Closure ? $fCreator() : null;
+}
 }

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

Spacing +3 added lines, -3 removed lines

@@ -51,7 +51,7 @@ 
      */
     protected function validateAttr(string $sAttr): void
     {
-        if(preg_match('/^[a-zA-Z][a-zA-Z0-9_]*$/', $sAttr) > 0)
+        if (preg_match('/^[a-zA-Z][a-zA-Z0-9_]*$/', $sAttr) > 0)
         {
             return;
         }
@@ -65,7 +65,7 @@ 
      */
     protected function validateClass(string $sClass): void
     {
-        if(preg_match('/^(\\\)?([a-zA-Z][a-zA-Z0-9_]*)(\\\[a-zA-Z][a-zA-Z0-9_]*)*$/', $sClass) > 0)
+        if (preg_match('/^(\\\)?([a-zA-Z][a-zA-Z0-9_]*)(\\\[a-zA-Z][a-zA-Z0-9_]*)*$/', $sClass) > 0)
         {
             return;
         }
@@ -92,7 +92,7 @@ 
     public function encode(string $sVarName): array
     {
         $aCalls = [];
-        foreach($this->aProperties as $sAttr => $sClass)
+        foreach ($this->aProperties as $sAttr => $sClass)
         {
             $aCalls[] = "{$sVarName}->addValue('$sAttr', '" . addslashes($sClass) . "');";
         }

Switch Indentation +47 added lines, -47 removed lines

@@ -21,81 +21,81 @@
 
 class ContainerData extends AbstractData
 {
-    /**
+/**
      * The properties to get from the container
      *
      * @var array
      */
-    protected $aProperties = [];
+protected $aProperties = [];
 
-    /**
+/**
      * @return string
      */
-    public function getName(): string
-    {
-        return '__di';
-    }
+public function getName(): string
+{
+return '__di';
+}
 
-    /**
+/**
      * @return mixed
      */
-    public function getValue(): mixed
-    {
-        return $this->aProperties;
-    }
+public function getValue(): mixed
+{
+return $this->aProperties;
+}
 
-    /**
+/**
      * @param string $sAttr
      *
      * @return void
      */
-    protected function validateAttr(string $sAttr): void
-    {
-        if(preg_match('/^[a-zA-Z][a-zA-Z0-9_]*$/', $sAttr) > 0)
-        {
-            return;
-        }
-        throw new SetupException("$sAttr is not a valid \"attr\" value for di");
-    }
+protected function validateAttr(string $sAttr): void
+{
+if(preg_match('/^[a-zA-Z][a-zA-Z0-9_]*$/', $sAttr) > 0)
+{
+return;
+}
+throw new SetupException("$sAttr is not a valid \"attr\" value for di");
+}
 
-    /**
+/**
      * @param string $sClass
      *
      * @return void
      */
-    protected function validateClass(string $sClass): void
-    {
-        if(preg_match('/^(\\\)?([a-zA-Z][a-zA-Z0-9_]*)(\\\[a-zA-Z][a-zA-Z0-9_]*)*$/', $sClass) > 0)
-        {
-            return;
-        }
-        throw new SetupException("$sClass is not a valid \"class\" value for di");
-    }
+protected function validateClass(string $sClass): void
+{
+if(preg_match('/^(\\\)?([a-zA-Z][a-zA-Z0-9_]*)(\\\[a-zA-Z][a-zA-Z0-9_]*)*$/', $sClass) > 0)
+{
+return;
+}
+throw new SetupException("$sClass is not a valid \"class\" value for di");
+}
 
-    /**
+/**
      * @param string $sAttr
      * @param string $sClass
      *
      * @return void
      */
-    public function addValue(string $sAttr, string $sClass): void
-    {
-        $this->validateAttr($sAttr);
-        $this->validateClass($sClass);
+public function addValue(string $sAttr, string $sClass): void
+{
+$this->validateAttr($sAttr);
+$this->validateClass($sClass);
 
-        $this->aProperties[$sAttr] = $sClass;
-    }
+$this->aProperties[$sAttr] = $sClass;
+}
 
-    /**
+/**
      * @inheritDoc
      */
-    public function encode(string $sVarName): array
-    {
-        $aCalls = [];
-        foreach($this->aProperties as $sAttr => $sClass)
-        {
-            $aCalls[] = "{$sVarName}->addValue('$sAttr', '" . addslashes($sClass) . "');";
-        }
-        return $aCalls;
-    }
+public function encode(string $sVarName): array
+{
+$aCalls = [];
+foreach($this->aProperties as $sAttr => $sClass)
+{
+$aCalls[] = "{$sVarName}->addValue('$sAttr', '" . addslashes($sClass) . "');";
+}
+return $aCalls;
+}
 }

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

Braces +2 added lines, -4 removed lines

@@ -85,8 +85,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'));
         }
@@ -261,8 +260,7 @@ 
 
             $sError = 'errors.objects.call';
             $xCallableObject->call($this->xTarget);
-        }
-        catch(ReflectionException|SetupException $e)
+        } catch(ReflectionException|SetupException $e)
         {
             // Unable to execute the requested class or method
             $this->throwException($e->getMessage(), $sError, $aErrorParams);

Spacing +13 added lines, -14 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,15 +133,15 @@ 
      */
     private function addCallable(CallableObject $xCallableObject): void
     {
-        if($xCallableObject->excluded())
+        if ($xCallableObject->excluded())
         {
             return;
         }
 
         $aCallableObject = &$this->aCallableObjects;
-        foreach(explode('.', $xCallableObject->getJsName()) as $sName)
+        foreach (explode('.', $xCallableObject->getJsName()) as $sName)
         {
-            if(!isset($aCallableObject['children'][$sName]))
+            if (!isset($aCallableObject['children'][$sName]))
             {
                 $aCallableObject['children'][$sName] = [];
             }
@@ -176,11 +176,10 @@ 
 
         $fMethodCallback = fn($aMethod) => $this->renderMethod($sIndent,
             ['sJsClass' => $sJsClass, 'aMethod' => $aMethod]);
-        $aMethods = !isset($aCallable['methods']) ? [] :
-            array_map($fMethodCallback, $aCallable['methods']);
+        $aMethods = !isset($aCallable['methods']) ? [] : array_map($fMethodCallback, $aCallable['methods']);
 
         $aChildren = [];
-        foreach($aCallable['children'] ?? [] as $sName => $aChild)
+        foreach ($aCallable['children'] ?? [] as $sName => $aChild)
         {
             $aChildren[] = $this->renderChild("$sName:", "$sJsClass.$sName",
                 $aChild, $nRepeat) . ',';
@@ -221,13 +220,13 @@ 
         $this->xRegistry->registerAllComponents();
 
         $this->aCallableObjects = ['children' => []];
-        foreach($this->cdi->getCallableObjects() as $xCallableObject)
+        foreach ($this->cdi->getCallableObjects() as $xCallableObject)
         {
             $this->addCallable($xCallableObject);
         }
 
         $aScripts = [];
-        foreach($this->aCallableObjects['children'] as $sJsClass => $aCallable)
+        foreach ($this->aCallableObjects['children'] as $sJsClass => $aCallable)
         {
             $aScripts[] = $this->renderChild("{$this->sPrefix}$sJsClass =",
                 $sJsClass, $aCallable) . ';';
@@ -283,7 +282,7 @@ 
         // Will be used to print a translated error message.
         $aErrorParams = ['class' => $sClassName, 'method' => $sMethodName];
 
-        if(!$this->xValidator->validateJsObject($sClassName) ||
+        if (!$this->xValidator->validateJsObject($sClassName) ||
             !$this->xValidator->validateMethod($sMethodName))
         {
             // Unable to find the requested object or method
@@ -297,7 +296,7 @@ 
             /** @var CallableObject */
             $xCallableObject = $this->getCallable($sClassName);
 
-            if($xCallableObject->excluded($sMethodName))
+            if ($xCallableObject->excluded($sMethodName))
             {
                 // Unable to find the requested class or method
                 $this->throwException('', 'errors.objects.excluded', $aErrorParams);
@@ -306,7 +305,7 @@ 
             $sError = 'errors.objects.call';
             $xCallableObject->call($this->xTarget);
         }
-        catch(ReflectionException|SetupException $e)
+        catch (ReflectionException|SetupException $e)
         {
             // Unable to execute the requested class or method
             $this->throwException($e->getMessage(), $sError, $aErrorParams);

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

Switch Indentation +24 added lines, -24 removed lines

@@ -20,50 +20,50 @@
 
 class InputData
 {
-    /**
+/**
      * @var ReflectionClass
      */
-    private $xReflectionClass;
+private $xReflectionClass;
 
-    /**
+/**
      * @param ReflectionClass|string $xClass
      * @param array $aMethods
      * @param array $aProperties
      */
-    public function __construct(ReflectionClass|string $xClass,
-        private array $aMethods = [], private array $aProperties = [])
-    {
-        $this->xReflectionClass = is_string($xClass) ?
-            new ReflectionClass($xClass) : $xClass;
-    }
+public function __construct(ReflectionClass|string $xClass,
+private array $aMethods = [], private array $aProperties = [])
+{
+$this->xReflectionClass = is_string($xClass) ?
+new ReflectionClass($xClass) : $xClass;
+}
 
-    /**
+/**
      * Get the reflection class
      *
      * @return ReflectionClass
      */
-    public function getReflectionClass(): ReflectionClass
-    {
-        return $this->xReflectionClass;
-    }
+public function getReflectionClass(): ReflectionClass
+{
+return $this->xReflectionClass;
+}
 
-    /**
+/**
      * The methods to check for metadata
      *
      * @return array
      */
-    public function getMethods(): array
-    {
-        return $this->aMethods;
-    }
+public function getMethods(): array
+{
+return $this->aMethods;
+}
 
-    /**
+/**
      * The properties to check for metadata
      *
      * @return array
      */
-    public function getProperties(): array
-    {
-        return $this->aProperties;
-    }
+public function getProperties(): array
+{
+return $this->aProperties;
+}
 }

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

Switch Indentation +22 added lines, -22 removed lines

@@ -16,42 +16,42 @@
 
 class ExcludeData extends AbstractData
 {
-    /**
+/**
      * @var bool
      */
-    private bool $bValue = true;
+private bool $bValue = true;
 
-    /**
+/**
      * @return string
      */
-    public function getName(): string
-    {
-        return 'protected';
-    }
+public function getName(): string
+{
+return 'protected';
+}
 
-    /**
+/**
      * @return mixed
      */
-    public function getValue(): mixed
-    {
-        return $this->bValue;
-    }
+public function getValue(): mixed
+{
+return $this->bValue;
+}
 
-    /**
+/**
      * @param bool $bValue
      *
      * @return void
      */
-    public function setValue(bool $bValue): void
-    {
-        $this->bValue = $bValue;
-    }
+public function setValue(bool $bValue): void
+{
+$this->bValue = $bValue;
+}
 
-    /**
+/**
      * @inheritDoc
      */
-    public function encode(string $sVarName): array
-    {
-        return ["{$sVarName}->setValue(" . ($this->bValue ? 'true' : 'false') . ");"];
-    }
+public function encode(string $sVarName): array
+{
+return ["{$sVarName}->setValue(" . ($this->bValue ? 'true' : 'false') . ");"];
+}
 }

jaxon-upload/src/Manager/FileStorage.php

Spacing +5 added lines, -6 removed lines

@@ -81,8 +81,7 @@ 
     {
         // Local file system adapter
         $this->registerAdapter('local', function(string $sRootDir, $xOptions) {
-            return empty($xOptions) ? new LocalFilesystemAdapter($sRootDir) :
-                new LocalFilesystemAdapter($sRootDir, $xOptions);
+            return empty($xOptions) ? new LocalFilesystemAdapter($sRootDir) : new LocalFilesystemAdapter($sRootDir, $xOptions);
         });
 
         // AWS S3 file system adapter
@@ -140,7 +139,7 @@ 
     public function filesystem(string $sField = ''): Filesystem
     {
         $sField = trim($sField);
-        if(isset($this->aFilesystems[$sField]))
+        if (isset($this->aFilesystems[$sField]))
         {
             return $this->aFilesystems[$sField];
         }
@@ -150,18 +149,18 @@ 
         $sRootDir = $this->xConfigManager->getOption('upload.default.dir', '');
         $aOptions = $this->xConfigManager->getOption('upload.default.options');
         $sConfigKey = "upload.files.$sField";
-        if($sField !== '' && $this->xConfigManager->hasOption($sConfigKey))
+        if ($sField !== '' && $this->xConfigManager->hasOption($sConfigKey))
         {
             $sStorage = $this->xConfigManager->getOption("$sConfigKey.storage", $sStorage);
             $sRootDir = $this->xConfigManager->getOption("$sConfigKey.dir", $sRootDir);
             $aOptions = $this->xConfigManager->getOption("$sConfigKey.options", $aOptions);
         }
 
-        if(!is_string($sRootDir))
+        if (!is_string($sRootDir))
         {
             throw new RequestException($this->xTranslator->trans('errors.upload.dir'));
         }
-        if(!isset($this->aAdapters[$sStorage]))
+        if (!isset($this->aAdapters[$sStorage]))
         {
             throw new RequestException($this->xTranslator->trans('errors.upload.adapter'));
         }

jaxon-core/src/Jaxon.php

Switch Indentation +8 added lines, -8 removed lines

@@ -16,23 +16,23 @@
 
 class Jaxon
 {
-    /**
+/**
      * @const string
      */
-    public const VERSION = 'Jaxon 5.x';
+public const VERSION = 'Jaxon 5.x';
 
-    /**
+/**
      * @const string
      */
-    public const CALLABLE_CLASS = 'CallableClass';
+public const CALLABLE_CLASS = 'CallableClass';
 
-    /**
+/**
      * @const string
      */
-    public const CALLABLE_DIR = 'CallableDir';
+public const CALLABLE_DIR = 'CallableDir';
 
-    /**
+/**
      * @const string
      */
-    public const CALLABLE_FUNCTION = 'CallableFunction';
+public const CALLABLE_FUNCTION = 'CallableFunction';
 }