jaxon-php / jaxon-mono

jaxon-core/src/App/View/TemplateView.php

Switch Indentation +25 added lines, -25 removed lines

@@ -18,22 +18,22 @@ 
 
 class TemplateView implements ViewInterface
 {
-    /**
+/**
      * The Jaxon template engine
      *
      * @var TemplateEngine
      */
-    protected $xTemplateEngine;
+protected $xTemplateEngine;
 
-    /**
+/**
      * The class constructor
      */
-    public function __construct(TemplateEngine $xTemplateEngine)
-    {
-        $this->xTemplateEngine = $xTemplateEngine;
-    }
+public function __construct(TemplateEngine $xTemplateEngine)
+{
+$this->xTemplateEngine = $xTemplateEngine;
+}
 
-    /**
+/**
      * Add a namespace to this view renderer
      *
      * @param string $sNamespace    The namespace name
@@ -42,28 +42,28 @@ 
      *
      * @return void
      */
-    public function addNamespace(string $sNamespace, string $sDirectory, string $sExtension = ''): void
-    {
-        $this->xTemplateEngine->addNamespace($sNamespace, $sDirectory, $sExtension);
-    }
+public function addNamespace(string $sNamespace, string $sDirectory, string $sExtension = ''): void
+{
+$this->xTemplateEngine->addNamespace($sNamespace, $sDirectory, $sExtension);
+}
 
-    /**
+/**
      * Render a view
      *
      * @param Store $store    A store populated with the view data
      *
      * @return string        The string representation of the view
      */
-    public function render(Store $store): string
-    {
-        $sViewName = $store->getViewName();
-        $sNamespace = $store->getNamespace();
-        // In this view renderer, the namespace must always be prepended to the view name.
-        if(substr($sViewName, 0, strlen($sNamespace) + 2) != $sNamespace . '::')
-        {
-            $sViewName = $sNamespace . '::' . $sViewName;
-        }
-        // Render the template
-        return trim($this->xTemplateEngine->render($sViewName, $store->getViewData()), " \t\n");
-    }
+public function render(Store $store): string
+{
+$sViewName = $store->getViewName();
+$sNamespace = $store->getNamespace();
+// In this view renderer, the namespace must always be prepended to the view name.
+if(substr($sViewName, 0, strlen($sNamespace) + 2) != $sNamespace . '::')
+{
+$sViewName = $sNamespace . '::' . $sViewName;
+}
+// Render the template
+return trim($this->xTemplateEngine->render($sViewName, $store->getViewData()), " \t\n");
+}
 }

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-core/src/App/Metadata/Data/UploadData.php

Switch Indentation +33 added lines, -33 removed lines

@@ -20,61 +20,61 @@
 
 class UploadData extends AbstractData
 {
-    /**
+/**
      * The id of the upload field
      *
      * @var string
      */
-    protected $sField = '';
+protected $sField = '';
 
-    /**
+/**
      * @return string
      */
-    public function getName(): string
-    {
-        return 'upload';
-    }
+public function getName(): string
+{
+return 'upload';
+}
 
-    /**
+/**
      * @return mixed
      */
-    public function getValue(): mixed
-    {
-        // The field id is surrounded with simple quotes.
-        return "'{$this->sField}'";
-    }
+public function getValue(): mixed
+{
+// The field id is surrounded with simple quotes.
+return "'{$this->sField}'";
+}
 
-    /**
+/**
      * @param string $sField
      *
      * @return void
      */
-    protected function validateField(string $sField): void
-    {
-        if(preg_match('/^[a-zA-Z][a-zA-Z0-9_\-\.]*$/', $sField) > 0)
-        {
-            return;
-        }
-        throw new SetupException("$sField is not a valid \"field\" value for upload");
-    }
+protected function validateField(string $sField): void
+{
+if(preg_match('/^[a-zA-Z][a-zA-Z0-9_\-\.]*$/', $sField) > 0)
+{
+return;
+}
+throw new SetupException("$sField is not a valid \"field\" value for upload");
+}
 
-    /**
+/**
      * @param string $sField
      *
      * @return void
      */
-    public function setValue(string $sField): void
-    {
-        $this->validateField($sField);
+public function setValue(string $sField): void
+{
+$this->validateField($sField);
 
-        $this->sField = $sField;
-    }
+$this->sField = $sField;
+}
 
-    /**
+/**
      * @inheritDoc
      */
-    public function encode(string $sVarName): array
-    {
-        return ["{$sVarName}->setValue('{$this->sField}');"];
-    }
+public function encode(string $sVarName): array
+{
+return ["{$sVarName}->setValue('{$this->sField}');"];
+}
 }

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

Switch Indentation +47 added lines, -47 removed lines

@@ -21,81 +21,81 @@
 
 class ContainerData extends AbstractData
 {
-    /**
+/**
      * The properties to get from the container
      *
      * @var string
      */
-    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/Manager/PackageManager.php

Switch Indentation +179 added lines, -179 removed lines

@@ -34,7 +34,7 @@ 
 
 class PackageManager
 {
-    /**
+/**
      * The constructor
      *
      * @param Container $di
@@ -46,48 +46,48 @@ 
      * @param CallbackManager $xCallbackManager
      * @param ComponentRegistry $xRegistry
      */
-    public function __construct(private Container $di, private Translator $xTranslator,
-        private PluginManager $xPluginManager, private ConfigManager $xConfigManager,
-        private CodeGenerator $xCodeGenerator, private ViewRenderer $xViewRenderer,
-        private CallbackManager $xCallbackManager, private ComponentRegistry $xRegistry)
-    {}
+public function __construct(private Container $di, private Translator $xTranslator,
+private PluginManager $xPluginManager, private ConfigManager $xConfigManager,
+private CodeGenerator $xCodeGenerator, private ViewRenderer $xViewRenderer,
+private CallbackManager $xCallbackManager, private ComponentRegistry $xRegistry)
+{}
 
-    /**
+/**
      * Save items in the DI container
      *
      * @param Config $xConfig
      *
      * @return void
      */
-    private function updateContainer(Config $xConfig): void
-    {
-        $aOptions = $xConfig->getOption('container.set', []);
-        foreach($aOptions as $xKey => $xValue)
-        {
-            // The key is the class name. It must be a string.
-            $this->di->set((string)$xKey, $xValue);
-        }
-        $aOptions = $xConfig->getOption('container.val', []);
-        foreach($aOptions as $xKey => $xValue)
-        {
-            // The key is the class name. It must be a string.
-            $this->di->val((string)$xKey, $xValue);
-        }
-        $aOptions = $xConfig->getOption('container.auto', []);
-        foreach($aOptions as $xValue)
-        {
-            // The key is the class name. It must be a string.
-            $this->di->auto((string)$xValue);
-        }
-        $aOptions = $xConfig->getOption('container.alias', []);
-        foreach($aOptions as $xKey => $xValue)
-        {
-            // The key is the class name. It must be a string.
-            $this->di->alias((string)$xKey, (string)$xValue);
-        }
-    }
+private function updateContainer(Config $xConfig): void
+{
+$aOptions = $xConfig->getOption('container.set', []);
+foreach($aOptions as $xKey => $xValue)
+{
+// The key is the class name. It must be a string.
+$this->di->set((string)$xKey, $xValue);
+}
+$aOptions = $xConfig->getOption('container.val', []);
+foreach($aOptions as $xKey => $xValue)
+{
+// The key is the class name. It must be a string.
+$this->di->val((string)$xKey, $xValue);
+}
+$aOptions = $xConfig->getOption('container.auto', []);
+foreach($aOptions as $xValue)
+{
+// The key is the class name. It must be a string.
+$this->di->auto((string)$xValue);
+}
+$aOptions = $xConfig->getOption('container.alias', []);
+foreach($aOptions as $xKey => $xValue)
+{
+// The key is the class name. It must be a string.
+$this->di->alias((string)$xKey, (string)$xValue);
+}
+}
 
-    /**
+/**
      * Register callables from a section of the config
      *
      * @param array $aOptions    The content of the config section
@@ -96,41 +96,41 @@ 
      * @return void
      * @throws SetupException
      */
-    private function registerCallables(array $aOptions, string $sCallableType): void
-    {
-        foreach($aOptions as $xKey => $xValue)
-        {
-            if(is_integer($xKey) && is_string($xValue))
-            {
-                // Register a function without options
-                $this->xPluginManager->registerCallable($sCallableType, $xValue);
-                continue;
-            }
+private function registerCallables(array $aOptions, string $sCallableType): void
+{
+foreach($aOptions as $xKey => $xValue)
+{
+if(is_integer($xKey) && is_string($xValue))
+{
+    // Register a function without options
+    $this->xPluginManager->registerCallable($sCallableType, $xValue);
+    continue;
+}
 
-            if(is_string($xKey) && (is_array($xValue) || is_string($xValue)))
-            {
-                // Register a function with options
-                $this->xPluginManager->registerCallable($sCallableType, $xKey, $xValue);
-            }
-        }
-    }
+if(is_string($xKey) && (is_array($xValue) || is_string($xValue)))
+{
+    // Register a function with options
+    $this->xPluginManager->registerCallable($sCallableType, $xKey, $xValue);
+}
+}
+}
 
-    /**
+/**
      * Register exceptions handlers
      *
      * @param Config $xConfig
      *
      * @return void
      */
-    private function registerExceptionHandlers(Config $xConfig): void
-    {
-        foreach($xConfig->getOption('exceptions', []) as $sExClass => $xExHandler)
-        {
-            $this->xCallbackManager->error($xExHandler, is_string($sExClass) ? $sExClass : '');
-        }
-    }
+private function registerExceptionHandlers(Config $xConfig): void
+{
+foreach($xConfig->getOption('exceptions', []) as $sExClass => $xExHandler)
+{
+$this->xCallbackManager->error($xExHandler, is_string($sExClass) ? $sExClass : '');
+}
+}
 
-    /**
+/**
      * Get a callable list from config
      *
      * @param Config $xConfig
@@ -140,36 +140,36 @@ 
      *
      * @return void
      */
-    private function registerCallablesFromConfig(Config $xConfig,
-        string $sOptionName, string $sOptionKey, string $sCallableType): void
-    {
-        // The callable (directory path, class or function name) can be used as the
-        // key of the array item, a string as the value of an entry without a key,
-        // or set with the key $sOptionKey in an array entry without a key.
-        $aCallables = [];
-        foreach($xConfig->getOption($sOptionName, []) as $xKey => $xValue)
-        {
-            if(is_string($xKey))
-            {
-                $aCallables[$xKey] = $xValue;
-                continue;
-            }
-            if(is_string($xValue))
-            {
-                $aCallables[] = $xValue;
-                continue;
-            }
+private function registerCallablesFromConfig(Config $xConfig,
+string $sOptionName, string $sOptionKey, string $sCallableType): void
+{
+// The callable (directory path, class or function name) can be used as the
+// key of the array item, a string as the value of an entry without a key,
+// or set with the key $sOptionKey in an array entry without a key.
+$aCallables = [];
+foreach($xConfig->getOption($sOptionName, []) as $xKey => $xValue)
+{
+if(is_string($xKey))
+{
+    $aCallables[$xKey] = $xValue;
+    continue;
+}
+if(is_string($xValue))
+{
+    $aCallables[] = $xValue;
+    continue;
+}
 
-            if(is_array($xValue) && isset($xValue[$sOptionKey]))
-            {
-                $aCallables[$xValue[$sOptionKey]] = $xValue;
-            }
-            // Invalid values are ignored.
-        }
-        $this->registerCallables($aCallables, $sCallableType);
-    }
+if(is_array($xValue) && isset($xValue[$sOptionKey]))
+{
+    $aCallables[$xValue[$sOptionKey]] = $xValue;
+}
+// Invalid values are ignored.
+}
+$this->registerCallables($aCallables, $sCallableType);
+}
 
-    /**
+/**
      * Read and set Jaxon options from a JSON config file
      *
      * @param Config $xConfig The config options
@@ -177,33 +177,33 @@ 
      * @return void
      * @throws SetupException
      */
-    private function registerItemsFromConfig(Config $xConfig): void
-    {
-        // Set the config for the registered callables.
-        $this->xRegistry->setPackageConfig($xConfig);
+private function registerItemsFromConfig(Config $xConfig): void
+{
+// Set the config for the registered callables.
+$this->xRegistry->setPackageConfig($xConfig);
 
-        // Register functions, classes and directories
-        $this->registerCallablesFromConfig($xConfig,
-            'functions', 'name', Jaxon::CALLABLE_FUNCTION);
-        $this->registerCallablesFromConfig($xConfig,
-            'classes', 'name', Jaxon::CALLABLE_CLASS);
-        $this->registerCallablesFromConfig($xConfig,
-            'directories', 'path', Jaxon::CALLABLE_DIR);
+// Register functions, classes and directories
+$this->registerCallablesFromConfig($xConfig,
+'functions', 'name', Jaxon::CALLABLE_FUNCTION);
+$this->registerCallablesFromConfig($xConfig,
+'classes', 'name', Jaxon::CALLABLE_CLASS);
+$this->registerCallablesFromConfig($xConfig,
+'directories', 'path', Jaxon::CALLABLE_DIR);
 
-        // Unset the current config.
-        $this->xRegistry->unsetPackageConfig();
+// Unset the current config.
+$this->xRegistry->unsetPackageConfig();
 
-        // Register the view namespaces
-        // Note: the $xUserConfig can provide a "template" option, which is used to customize
-        // the user defined view namespaces. That's why it is needed here.
-        $this->xViewRenderer->addNamespaces($xConfig);
-        // Save items in the DI container
-        $this->updateContainer($xConfig);
-        // Register the exception handlers
-        $this->registerExceptionHandlers($xConfig);
-    }
+// Register the view namespaces
+// Note: the $xUserConfig can provide a "template" option, which is used to customize
+// the user defined view namespaces. That's why it is needed here.
+$this->xViewRenderer->addNamespaces($xConfig);
+// Save items in the DI container
+$this->updateContainer($xConfig);
+// Register the exception handlers
+$this->registerExceptionHandlers($xConfig);
+}
 
-    /**
+/**
      * Get the options provided by the package library
      *
      * @param class-string $sClassName    The package class
@@ -211,27 +211,27 @@ 
      * @return Config
      * @throws SetupException
      */
-    private function getPackageLibConfig(string $sClassName): Config
-    {
-        // $this->aPackages contains packages config file paths.
-        $aLibOptions = $sClassName::config();
-        if(is_string($aLibOptions))
-        {
-            // A string is supposed to be the path to a config file.
-            $aLibOptions = $this->xConfigManager->read($aLibOptions);
-        }
-        elseif(!is_array($aLibOptions))
-        {
-            // Otherwise, anything else than an array is not accepted.
-            $sMessage = $this->xTranslator->trans('errors.register.invalid', ['name' => $sClassName]);
-            throw new SetupException($sMessage);
-        }
-        // Add the package name to the config
-        $aLibOptions['package'] = $sClassName;
-        return $this->xConfigManager->newConfig($aLibOptions);
-    }
+private function getPackageLibConfig(string $sClassName): Config
+{
+// $this->aPackages contains packages config file paths.
+$aLibOptions = $sClassName::config();
+if(is_string($aLibOptions))
+{
+// A string is supposed to be the path to a config file.
+$aLibOptions = $this->xConfigManager->read($aLibOptions);
+}
+elseif(!is_array($aLibOptions))
+{
+// Otherwise, anything else than an array is not accepted.
+$sMessage = $this->xTranslator->trans('errors.register.invalid', ['name' => $sClassName]);
+throw new SetupException($sMessage);
+}
+// Add the package name to the config
+$aLibOptions['package'] = $sClassName;
+return $this->xConfigManager->newConfig($aLibOptions);
+}
 
-    /**
+/**
      * Register a package
      *
      * @param class-string $sClassName    The package class
@@ -240,27 +240,27 @@ 
      * @return void
      * @throws SetupException
      */
-    public function registerPackage(string $sClassName, array $aUserOptions = []): void
-    {
-        $sClassName = trim($sClassName, '\\ ');
-        if(!is_subclass_of($sClassName, AbstractPackage::class))
-        {
-            $sMessage = $this->xTranslator->trans('errors.register.invalid', ['name' => $sClassName]);
-            throw new SetupException($sMessage);
-        }
+public function registerPackage(string $sClassName, array $aUserOptions = []): void
+{
+$sClassName = trim($sClassName, '\\ ');
+if(!is_subclass_of($sClassName, AbstractPackage::class))
+{
+$sMessage = $this->xTranslator->trans('errors.register.invalid', ['name' => $sClassName]);
+throw new SetupException($sMessage);
+}
 
-        // Register the declarations in the package config.
-        $xAppConfig = $this->getPackageLibConfig($sClassName);
-        $this->registerItemsFromConfig($xAppConfig);
+// Register the declarations in the package config.
+$xAppConfig = $this->getPackageLibConfig($sClassName);
+$this->registerItemsFromConfig($xAppConfig);
 
-        // Register the package and its options in the DI
-        $this->di->registerPackage($sClassName, $aUserOptions);
+// Register the package and its options in the DI
+$this->di->registerPackage($sClassName, $aUserOptions);
 
-        // Register the package as a code generator.
-        $this->xCodeGenerator->addCodeGenerator($sClassName, 500);
-    }
+// Register the package as a code generator.
+$this->xCodeGenerator->addCodeGenerator($sClassName, 500);
+}
 
-    /**
+/**
      * Get a package instance
      *
      * @template T of AbstractPackage
@@ -268,42 +268,42 @@ 
      *
      * @return T|null
      */
-    public function getPackage(string $sClassName): ?AbstractPackage
-    {
-        $sClassName = trim($sClassName, '\\ ');
-        return $this->di->h($sClassName) ? $this->di->g($sClassName) : null;
-    }
+public function getPackage(string $sClassName): ?AbstractPackage
+{
+$sClassName = trim($sClassName, '\\ ');
+return $this->di->h($sClassName) ? $this->di->g($sClassName) : null;
+}
 
-    /**
+/**
      * Read and set Jaxon options from the config
      *
      * @return void
      * @throws SetupException
      */
-    public function registerFromConfig(): void
-    {
-        $xAppConfig = $this->xConfigManager->getAppConfig();
-        $this->registerItemsFromConfig($xAppConfig);
+public function registerFromConfig(): void
+{
+$xAppConfig = $this->xConfigManager->getAppConfig();
+$this->registerItemsFromConfig($xAppConfig);
 
-        // Register packages
-        $aPackageConfig = $xAppConfig->getOption('packages', []);
-        foreach($aPackageConfig as $xKey => $xValue)
-        {
-            if(is_integer($xKey) && is_string($xValue))
-            {
-                // Register a package without options
-                $sClassName = $xValue;
-                $this->registerPackage($sClassName);
-                continue;
-            }
+// Register packages
+$aPackageConfig = $xAppConfig->getOption('packages', []);
+foreach($aPackageConfig as $xKey => $xValue)
+{
+if(is_integer($xKey) && is_string($xValue))
+{
+    // Register a package without options
+    $sClassName = $xValue;
+    $this->registerPackage($sClassName);
+    continue;
+}
 
-            if(is_string($xKey) && is_array($xValue))
-            {
-                // Register a package with options
-                $sClassName = $xKey;
-                $aPkgOptions = $xValue;
-                $this->registerPackage($sClassName, $aPkgOptions);
-            }
-        }
-    }
+if(is_string($xKey) && is_array($xValue))
+{
+    // Register a package with options
+    $sClassName = $xKey;
+    $aPkgOptions = $xValue;
+    $this->registerPackage($sClassName, $aPkgOptions);
+}
+}
+}
 }

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

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

jaxon-annotations/src/Annotation/DatabagAnnotation.php

Switch Indentation +22 added lines, -22 removed lines

@@ -28,40 +28,40 @@
  */
 class DatabagAnnotation extends AbstractAnnotation
 {
-    /**
+/**
      * The data bag name
      *
      * @var string
      */
-    protected $sName = '';
+protected $sName = '';
 
-    /**
+/**
      * @inheritDoc
      */
-    public static function parseAnnotation($value)
-    {
-        $aParams = preg_split('/[\s]+/', $value, 2);
-        return count($aParams) === 1 ? ['name' => $aParams[0]] : ['name' => $aParams[0], 'extra' => $aParams[1]];
-    }
+public static function parseAnnotation($value)
+{
+$aParams = preg_split('/[\s]+/', $value, 2);
+return count($aParams) === 1 ? ['name' => $aParams[0]] : ['name' => $aParams[0], 'extra' => $aParams[1]];
+}
 
-    /**
+/**
      * @inheritDoc
      * @throws AnnotationException
      */
-    public function initAnnotation(array $properties)
-    {
-        if(count($properties) !== 1 || !isset($properties['name']) || !is_string($properties['name']))
-        {
-            throw new AnnotationException('The @databag annotation requires a property "name" of type string');
-        }
-        $this->sName = $properties['name'];
-    }
+public function initAnnotation(array $properties)
+{
+if(count($properties) !== 1 || !isset($properties['name']) || !is_string($properties['name']))
+{
+throw new AnnotationException('The @databag annotation requires a property "name" of type string');
+}
+$this->sName = $properties['name'];
+}
 
-    /**
+/**
      * @inheritDoc
      */
-    public function saveValue(Metadata $xMetadata, string $sMethod = '*'): void
-    {
-        $xMetadata->databag($sMethod)->addValue($this->sName);
-    }
+public function saveValue(Metadata $xMetadata, string $sMethod = '*'): void
+{
+$xMetadata->databag($sMethod)->addValue($this->sName);
+}
 }