jaxon-php / jaxon-mono

jaxon-core/src/Di/Traits/ComponentTrait.php

Switch Indentation +59 added lines, -59 removed lines

@@ -236,82 +236,82 @@
                 $this->aComponentPublicMethods['node'],
             $xReflectionClass->isSubclassOf(FuncComponent::class) =>
                 $this->aComponentPublicMethods['func'],
-            default => [],
-        };
-        return [$aMethods, $aBaseMethods];
-    }
+default => [],
+};
+return [$aMethods, $aBaseMethods];
+}
 
-    /**
+/**
      * @param ReflectionClass $xReflectionClass
      * @param array $aMethods
      * @param array $aOptions
      *
      * @return Metadata|null
      */
-    private function getComponentMetadata(ReflectionClass $xReflectionClass,
-        array $aMethods, array $aOptions): Metadata|null
-    {
-        /** @var Config|null */
-        $xPackageConfig = $aOptions['config'] ?? null;
-        if($xPackageConfig === null || (bool)($aOptions['excluded'] ?? false))
-        {
-            return null;
-        }
-        $sMetadataFormat = $xPackageConfig->getOption('metadata.format');
-        if(!in_array($sMetadataFormat, ['attributes', 'annotations']))
-        {
-            return null;
-        }
+private function getComponentMetadata(ReflectionClass $xReflectionClass,
+array $aMethods, array $aOptions): Metadata|null
+{
+/** @var Config|null */
+$xPackageConfig = $aOptions['config'] ?? null;
+if($xPackageConfig === null || (bool)($aOptions['excluded'] ?? false))
+{
+return null;
+}
+$sMetadataFormat = $xPackageConfig->getOption('metadata.format');
+if(!in_array($sMetadataFormat, ['attributes', 'annotations']))
+{
+return null;
+}
 
-        // Try to get the class metadata from the cache.
-        $di = $this->cn();
-        $xMetadata = null;
-        $xMetadataCache = null;
-        $xConfig = $di->config();
-        if($xConfig->getAppOption('metadata.cache.enabled', false))
-        {
-            if(!$di->h('jaxon_metadata_cache_dir'))
-            {
-                $sCacheDir = $xConfig->getAppOption('metadata.cache.dir');
-                $di->val('jaxon_metadata_cache_dir', $sCacheDir);
-            }
-            $xMetadataCache = $di->getMetadataCache();
-            $xMetadata = $xMetadataCache->read($xReflectionClass->getName());
-            if($xMetadata !== null)
-            {
-                return $xMetadata;
-            }
-        }
+// Try to get the class metadata from the cache.
+$di = $this->cn();
+$xMetadata = null;
+$xMetadataCache = null;
+$xConfig = $di->config();
+if($xConfig->getAppOption('metadata.cache.enabled', false))
+{
+if(!$di->h('jaxon_metadata_cache_dir'))
+{
+    $sCacheDir = $xConfig->getAppOption('metadata.cache.dir');
+    $di->val('jaxon_metadata_cache_dir', $sCacheDir);
+}
+$xMetadataCache = $di->getMetadataCache();
+$xMetadata = $xMetadataCache->read($xReflectionClass->getName());
+if($xMetadata !== null)
+{
+    return $xMetadata;
+}
+}
 
-        $aProperties = array_map(fn($xProperty) => $xProperty->getName(),
-            $xReflectionClass->getProperties(ReflectionProperty::IS_PUBLIC |
-                ReflectionProperty::IS_PROTECTED));
+$aProperties = array_map(fn($xProperty) => $xProperty->getName(),
+$xReflectionClass->getProperties(ReflectionProperty::IS_PUBLIC |
+    ReflectionProperty::IS_PROTECTED));
 
-        $xMetadataReader = $di->getMetadataReader($sMetadataFormat);
-        $xInput = new InputData($xReflectionClass, $aMethods, $aProperties);
-        $xMetadata = $xMetadataReader->getAttributes($xInput);
+$xMetadataReader = $di->getMetadataReader($sMetadataFormat);
+$xInput = new InputData($xReflectionClass, $aMethods, $aProperties);
+$xMetadata = $xMetadataReader->getAttributes($xInput);
 
-        // Try to save the metadata in the cache
-        if($xMetadataCache !== null && $xMetadata !== null)
-        {
-            $xMetadataCache->save($xReflectionClass->getName(), $xMetadata);
-        }
+// Try to save the metadata in the cache
+if($xMetadataCache !== null && $xMetadata !== null)
+{
+$xMetadataCache->save($xReflectionClass->getName(), $xMetadata);
+}
 
-        return $xMetadata;
-    }
+return $xMetadata;
+}
 
-    /**
+/**
      * @param ReflectionClass $xReflectionClass
      * @param array $aOptions
      *
      * @return ComponentOptions
      */
-    private function getComponentOptions(ReflectionClass $xReflectionClass,
-        array $aOptions): ComponentOptions
-    {
-        $aMethods = $this->getPublicMethods($xReflectionClass);
-        $xMetadata = $this->getComponentMetadata($xReflectionClass, $aMethods[0], $aOptions);
+private function getComponentOptions(ReflectionClass $xReflectionClass,
+array $aOptions): ComponentOptions
+{
+$aMethods = $this->getPublicMethods($xReflectionClass);
+$xMetadata = $this->getComponentMetadata($xReflectionClass, $aMethods[0], $aOptions);
 
-        return new ComponentOptions($aMethods, $aOptions, $xMetadata);
-    }
+return new ComponentOptions($aMethods, $aOptions, $xMetadata);
+}
 }

jaxon-core/src/Di/ComponentContainer.php

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
      */
-    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);
-        $this->setComponentPublicMethods('func', FuncComponent::class);
-    }
+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);
+$this->setComponentPublicMethods('func', FuncComponent::class);
+}
 
-    /**
+/**
      * 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/Metadata.php

Switch Indentation +116 added lines, -116 removed lines

@@ -21,186 +21,186 @@
 
 class Metadata
 {
-    /**
+/**
      * @var array<string, array<string, Data\AbstractData>>
      */
-    private array $aAttributes = [
-        'exclude' => [],
-        'export' => [],
-        'container' => [],
-        'databag' => [],
-        'callback' => [],
-        'before' => [],
-        'after' => [],
-        'upload' => [],
-    ];
-
-    /**
+private array $aAttributes = [
+'exclude' => [],
+'export' => [],
+'container' => [],
+'databag' => [],
+'callback' => [],
+'before' => [],
+'after' => [],
+'upload' => [],
+];
+
+/**
      * @return array<string, array<string, Data\AbstractData>>
      */
-    public function getAttributes(): array
-    {
-        return $this->aAttributes;
-    }
+public function getAttributes(): array
+{
+return $this->aAttributes;
+}
 
-    /**
+/**
      * @param string $sMethod
      *
      * @return Data\ExcludeData
      */
-    public function exclude(string $sMethod = '*'): Data\ExcludeData
-    {
-        return $this->aAttributes['exclude'][$sMethod] ??
-            $this->aAttributes['exclude'][$sMethod] = new Data\ExcludeData();
-    }
+public function exclude(string $sMethod = '*'): Data\ExcludeData
+{
+return $this->aAttributes['exclude'][$sMethod] ??
+$this->aAttributes['exclude'][$sMethod] = new Data\ExcludeData();
+}
 
-    /**
+/**
      * @param string $sMethod
      *
      * @return Data\ExportData
      */
-    public function export(string $sMethod = '*'): Data\ExportData
-    {
-        $sMethod = '*'; // On classes only
-        return $this->aAttributes['export'][$sMethod] ??
-            $this->aAttributes['export'][$sMethod] = new Data\ExportData();
-    }
+public function export(string $sMethod = '*'): Data\ExportData
+{
+$sMethod = '*'; // On classes only
+return $this->aAttributes['export'][$sMethod] ??
+$this->aAttributes['export'][$sMethod] = new Data\ExportData();
+}
 
-    /**
+/**
      * @param string $sMethod
      *
      * @return Data\ContainerData
      */
-    public function container(string $sMethod = '*'): Data\ContainerData
-    {
-        return $this->aAttributes['container'][$sMethod] ??
-            $this->aAttributes['container'][$sMethod] = new Data\ContainerData();
-    }
+public function container(string $sMethod = '*'): Data\ContainerData
+{
+return $this->aAttributes['container'][$sMethod] ??
+$this->aAttributes['container'][$sMethod] = new Data\ContainerData();
+}
 
-    /**
+/**
      * @param string $sMethod
      *
      * @return Data\DatabagData
      */
-    public function databag(string $sMethod = '*'): Data\DatabagData
-    {
-        return $this->aAttributes['databag'][$sMethod] ??
-            $this->aAttributes['databag'][$sMethod] = new Data\DatabagData();
-    }
+public function databag(string $sMethod = '*'): Data\DatabagData
+{
+return $this->aAttributes['databag'][$sMethod] ??
+$this->aAttributes['databag'][$sMethod] = new Data\DatabagData();
+}
 
-    /**
+/**
      * @param string $sMethod
      *
      * @return Data\CallbackData
      */
-    public function callback(string $sMethod = '*'): Data\CallbackData
-    {
-        return $this->aAttributes['callback'][$sMethod] ??
-            $this->aAttributes['callback'][$sMethod] = new Data\CallbackData();
-    }
+public function callback(string $sMethod = '*'): Data\CallbackData
+{
+return $this->aAttributes['callback'][$sMethod] ??
+$this->aAttributes['callback'][$sMethod] = new Data\CallbackData();
+}
 
-    /**
+/**
      * @param string $sMethod
      *
      * @return Data\BeforeData
      */
-    public function before(string $sMethod = '*'): Data\BeforeData
-    {
-        return $this->aAttributes['before'][$sMethod] ??
-            $this->aAttributes['before'][$sMethod] = new Data\BeforeData();
-    }
+public function before(string $sMethod = '*'): Data\BeforeData
+{
+return $this->aAttributes['before'][$sMethod] ??
+$this->aAttributes['before'][$sMethod] = new Data\BeforeData();
+}
 
-    /**
+/**
      * @param string $sMethod
      *
      * @return Data\AfterData
      */
-    public function after(string $sMethod = '*'): Data\AfterData
-    {
-        return $this->aAttributes['after'][$sMethod] ??
-            $this->aAttributes['after'][$sMethod] = new Data\AfterData();
-    }
+public function after(string $sMethod = '*'): Data\AfterData
+{
+return $this->aAttributes['after'][$sMethod] ??
+$this->aAttributes['after'][$sMethod] = new Data\AfterData();
+}
 
-    /**
+/**
      * @param string $sMethod
      *
      * @return Data\UploadData
      */
-    public function upload(string $sMethod = '*'): Data\UploadData
-    {
-        return $this->aAttributes['upload'][$sMethod] ??
-            $this->aAttributes['upload'][$sMethod] = new Data\UploadData();
-    }
+public function upload(string $sMethod = '*'): Data\UploadData
+{
+return $this->aAttributes['upload'][$sMethod] ??
+$this->aAttributes['upload'][$sMethod] = new Data\UploadData();
+}
 
-    /**
+/**
      * True if the class is excluded
      *
      * @return bool
      */
-    public function isExcluded(): bool
-    {
-        $xData = $this->aAttributes['exclude']['*'] ?? null;
-        return $xData !== null && $xData->getValue() === true;
-    }
+public function isExcluded(): bool
+{
+$xData = $this->aAttributes['exclude']['*'] ?? null;
+return $xData !== null && $xData->getValue() === true;
+}
 
-    /**
+/**
      * Get the properties of the class methods
      *
      * @return array
      */
-    public function getProperties(): array
+public function getProperties(): array
+{
+$aProperties = [];
+$aClassProperties = [];
+foreach($this->aAttributes as $sType => $aValues)
+{
+if($sType === 'exclude')
+{
+    continue;
+}
+
+foreach($aValues as $sMethod => $xData)
+{
+    if($sMethod === '*')
     {
-        $aProperties = [];
-        $aClassProperties = [];
-        foreach($this->aAttributes as $sType => $aValues)
-        {
-            if($sType === 'exclude')
-            {
-                continue;
-            }
-
-            foreach($aValues as $sMethod => $xData)
-            {
-                if($sMethod === '*')
-                {
-                    $aClassProperties[$xData->getName()] = $xData->getValue();
-                    continue;
-                }
-                $aProperties[$sMethod][$xData->getName()] = $xData->getValue();
-            }
-        }
-
-        if(count($aClassProperties) > 0)
-        {
-            $aProperties['*'] = $aClassProperties;
-        }
-
-        return $aProperties;
+        $aClassProperties[$xData->getName()] = $xData->getValue();
+        continue;
     }
+    $aProperties[$sMethod][$xData->getName()] = $xData->getValue();
+}
+}
+
+if(count($aClassProperties) > 0)
+{
+$aProperties['*'] = $aClassProperties;
+}
 
-    /**
+return $aProperties;
+}
+
+/**
      * Get the methods in the export attributes
      *
      * @return array
      */
-    public function getExportMethods(): array
-    {
-        /** @var Data\ExportData */
-        $xExportData = $this->aAttributes['export']['*'] ?? null;
-        return $xExportData?->getMethods() ?? [];
-    }
+public function getExportMethods(): array
+{
+/** @var Data\ExportData */
+$xExportData = $this->aAttributes['export']['*'] ?? null;
+return $xExportData?->getMethods() ?? [];
+}
 
-    /**
+/**
      * Get the protected methods
      *
      * @return array
      */
-    public function getProtectedMethods(): array
-    {
-        /** @var array<Data\ExcludeData> */
-        $aAttributes = $this->aAttributes['exclude'];
-        $aMethods = array_keys($aAttributes);
-        return array_values(array_filter($aMethods, fn(string $sName) =>
-            $sName !== '*' && $aAttributes[$sName]->getValue() === true));
-    }
+public function getProtectedMethods(): array
+{
+/** @var array<Data\ExcludeData> */
+$aAttributes = $this->aAttributes['exclude'];
+$aMethods = array_keys($aAttributes);
+return array_values(array_filter($aMethods, fn(string $sName) =>
+$sName !== '*' && $aAttributes[$sName]->getValue() === true));
+}
 }

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

Switch Indentation +35 added lines, -35 removed lines

@@ -21,59 +21,59 @@
 
 abstract class HookData extends AbstractData
 {
-    /**
+/**
      * @var array
      */
-    protected $aCalls = [];
+protected $aCalls = [];
 
-    /**
+/**
      * @return string
      */
-    abstract protected function getType(): string;
+abstract protected function getType(): string;
 
-    /**
+/**
      * @return string
      */
-    public function getName(): string
-    {
-        return '__' . $this->getType();
-    }
+public function getName(): string
+{
+return '__' . $this->getType();
+}
 
-    /**
+/**
      * @return mixed
      */
-    public function getValue(): mixed
-    {
-        return $this->aCalls;
-    }
+public function getValue(): mixed
+{
+return $this->aCalls;
+}
 
-    /**
+/**
      * @param string $sMethod
      * @param array $aParams
      *
      * @return void
      */
-    public function addCall(string $sMethod, array $aParams): void
-    {
-        if(!$this->validateMethod($sMethod))
-        {
-            $sType = $this->getType();
-            throw new SetupException("'$sMethod' is not a valid \"call\" value for $sType.");
-        }
-        $this->aCalls[$sMethod] = $aParams;
-    }
+public function addCall(string $sMethod, array $aParams): void
+{
+if(!$this->validateMethod($sMethod))
+{
+$sType = $this->getType();
+throw new SetupException("'$sMethod' is not a valid \"call\" value for $sType.");
+}
+$this->aCalls[$sMethod] = $aParams;
+}
 
-    /**
+/**
      * @inheritDoc
      */
-    public function encode(string $sVarName): array
-    {
-        $aCalls = [];
-        foreach($this->aCalls as $sMethod => $aParams)
-        {
-            $sParams = addslashes(json_encode($aParams));
-            $aCalls[] = "{$sVarName}->addCall('$sMethod', json_decode(\"$sParams\", true));";
-        }
-        return $aCalls;
-    }
+public function encode(string $sVarName): array
+{
+$aCalls = [];
+foreach($this->aCalls as $sMethod => $aParams)
+{
+$sParams = addslashes(json_encode($aParams));
+$aCalls[] = "{$sVarName}->addCall('$sMethod', json_decode(\"$sParams\", true));";
+}
+return $aCalls;
+}
 }

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

Switch Indentation +7 added lines, -7 removed lines

@@ -18,22 +18,22 @@
 
 abstract class AbstractData
 {
-    /**
+/**
      * Generate the PHP code to populate a Metadata object
      *
      * @param string $sVarName
      *
      * @return array
      */
-    abstract public function encode(string $sVarName): array;
+abstract public function encode(string $sVarName): array;
 
-    /**
+/**
      * @param string $sMethod
      *
      * @return bool
      */
-    protected function validateMethod(string $sMethod): bool
-    {
-        return preg_match('/^[a-zA-Z][a-zA-Z0-9_]*$/', $sMethod) > 0;
-    }
+protected function validateMethod(string $sMethod): bool
+{
+return preg_match('/^[a-zA-Z][a-zA-Z0-9_]*$/', $sMethod) > 0;
+}
 }

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

Switch Indentation +31 added lines, -31 removed lines

@@ -22,53 +22,53 @@
 
 class ExportData extends AbstractData
 {
-    /**
+/**
      * @var array
      */
-    private array $aMethods = [];
+private array $aMethods = [];
 
-    /**
+/**
      * @return string
      */
-    public function getName(): string
-    {
-        return 'export';
-    }
+public function getName(): string
+{
+return 'export';
+}
 
-    /**
+/**
      * @return mixed
      */
-    public function getMethods(): mixed
-    {
-        return $this->aMethods;
-    }
+public function getMethods(): mixed
+{
+return $this->aMethods;
+}
 
-    /**
+/**
      * @param array $aMethods
      *
      * @return void
      */
-    public function setMethods(array $aMethods): void
+public function setMethods(array $aMethods): void
+{
+foreach(['base', 'only', 'except'] as $sKey)
+{
+foreach($aMethods[$sKey] as $sMethod)
+{
+    if(!is_string($sMethod) || !$this->validateMethod($sMethod))
     {
-        foreach(['base', 'only', 'except'] as $sKey)
-        {
-            foreach($aMethods[$sKey] as $sMethod)
-            {
-                if(!is_string($sMethod) || !$this->validateMethod($sMethod))
-                {
-                    throw new SetupException("'$sMethod' is not a valid method name.");
-                }
-            }
-        }
-        $this->aMethods = $aMethods;
+        throw new SetupException("'$sMethod' is not a valid method name.");
     }
+}
+}
+$this->aMethods = $aMethods;
+}
 
-    /**
+/**
      * @inheritDoc
      */
-    public function encode(string $sVarName): array
-    {
-        $sMethods = addslashes(json_encode($this->aMethods));
-        return ["{$sVarName}->setMethods(json_decode(\"$sMethods\", true));"];
-    }
+public function encode(string $sVarName): array
+{
+$sMethods = addslashes(json_encode($this->aMethods));
+return ["{$sVarName}->setMethods(json_decode(\"$sMethods\", true));"];
+}
 }

jaxon-annotations/src/Annotation/ExportAnnotation.php

Switch Indentation +25 added lines, -25 removed lines

@@ -26,41 +26,41 @@
  */
 class ExportAnnotation extends AbstractAnnotation
 {
-    /**
+/**
      * @var array
      */
-    private $aMethods = [];
+private $aMethods = [];
 
-    /**
+/**
      * @inheritDoc
      */
-    public static function parseAnnotation($value)
-    {
-        $aParams = json_decode($value, true);
-        return is_array($aParams) ? $aParams : [];
-    }
+public static function parseAnnotation($value)
+{
+$aParams = json_decode($value, true);
+return is_array($aParams) ? $aParams : [];
+}
 
-    /**
+/**
      * @inheritDoc
      * @throws AnnotationException
      */
-    public function initAnnotation(array $properties)
-    {
-        foreach(['base', 'only', 'except'] as $key)
-        {
-            if(isset($properties[$key]) && is_array($properties[$key]) &&
-                count($properties[$key]) > 0)
-            {
-                $this->aMethods[$key] = $properties[$key];
-            }
-        }
-    }
+public function initAnnotation(array $properties)
+{
+foreach(['base', 'only', 'except'] as $key)
+{
+if(isset($properties[$key]) && is_array($properties[$key]) &&
+    count($properties[$key]) > 0)
+{
+    $this->aMethods[$key] = $properties[$key];
+}
+}
+}
 
-    /**
+/**
      * @inheritDoc
      */
-    public function saveValue(Metadata $xMetadata, string $sMethod = '*'): void
-    {
-        $xMetadata->export($sMethod)->setMethods($this->aMethods);
-    }
+public function saveValue(Metadata $xMetadata, string $sMethod = '*'): void
+{
+$xMetadata->export($sMethod)->setMethods($this->aMethods);
+}
 }

jaxon-annotations/tests/TestAnnotation/ExtendAnnotationTest.php

Switch Indentation +301 added lines, -301 removed lines

@@ -14,346 +14,346 @@
 
 class ExtendAnnotationTest extends TestCase
 {
-    use AnnotationTrait;
+use AnnotationTrait;
 
-    /**
+/**
      * @var string
      */
-    protected $sCacheDir;
+protected $sCacheDir;
 
-    /**
+/**
      * @throws SetupException
      */
-    public function setUp(): void
-    {
-        $this->sCacheDir = __DIR__ . '/../tmp';
-        @mkdir($this->sCacheDir);
+public function setUp(): void
+{
+$this->sCacheDir = __DIR__ . '/../tmp';
+@mkdir($this->sCacheDir);
 
-        jaxon()->di()->getPluginManager()->registerPlugins();
-        _register();
+jaxon()->di()->getPluginManager()->registerPlugins();
+_register();
 
-        jaxon()->di()->val('jaxon_annotations_cache_dir', $this->sCacheDir);
-    }
+jaxon()->di()->val('jaxon_annotations_cache_dir', $this->sCacheDir);
+}
 
-    /**
+/**
      * @throws SetupException
      */
-    public function tearDown(): void
-    {
-        jaxon()->reset();
-        parent::tearDown();
-
-        // Delete the temp dir and all its content
-        $aFiles = scandir($this->sCacheDir);
-        foreach ($aFiles as $sFile)
-        {
-            if($sFile !== '.' && $sFile !== '..')
-            {
-                @unlink($this->sCacheDir . DIRECTORY_SEPARATOR . $sFile);
-            }
-        }
-        @rmdir($this->sCacheDir);
-    }
-
-    /**
+public function tearDown(): void
+{
+jaxon()->reset();
+parent::tearDown();
+
+// Delete the temp dir and all its content
+$aFiles = scandir($this->sCacheDir);
+foreach ($aFiles as $sFile)
+{
+if($sFile !== '.' && $sFile !== '..')
+{
+    @unlink($this->sCacheDir . DIRECTORY_SEPARATOR . $sFile);
+}
+}
+@rmdir($this->sCacheDir);
+}
+
+/**
      * @throws SetupException
      */
-    public function testUploadAndExcludeAnnotation()
-    {
-        $xMetadata = $this->getAttributes(ExtendAnnotated::class, ['saveFiles', 'doNot']);
-        $bExcluded = $xMetadata->isExcluded();
-        $aProperties = $xMetadata->getProperties();
-        $aProtected = $xMetadata->getProtectedMethods();
+public function testUploadAndExcludeAnnotation()
+{
+$xMetadata = $this->getAttributes(ExtendAnnotated::class, ['saveFiles', 'doNot']);
+$bExcluded = $xMetadata->isExcluded();
+$aProperties = $xMetadata->getProperties();
+$aProtected = $xMetadata->getProtectedMethods();
 
-        $this->assertFalse($bExcluded);
+$this->assertFalse($bExcluded);
 
-        $this->assertCount(1, $aProperties);
-        $this->assertArrayHasKey('saveFiles', $aProperties);
-        $this->assertCount(1, $aProperties['saveFiles']);
-        $this->assertEquals("'user-files'", $aProperties['saveFiles']['upload']);
+$this->assertCount(1, $aProperties);
+$this->assertArrayHasKey('saveFiles', $aProperties);
+$this->assertCount(1, $aProperties['saveFiles']);
+$this->assertEquals("'user-files'", $aProperties['saveFiles']['upload']);
 
-        $this->assertCount(1, $aProtected);
-        $this->assertEquals('doNot', $aProtected[0]);
-    }
+$this->assertCount(1, $aProtected);
+$this->assertEquals('doNot', $aProtected[0]);
+}
 
-    /**
+/**
      * @throws SetupException
      */
-    public function testDatabagAnnotation()
-    {
-        $xMetadata = $this->getAttributes(ExtendAnnotated::class, ['withBags']);
-        $bExcluded = $xMetadata->isExcluded();
-        $aProperties = $xMetadata->getProperties();
-
-        $this->assertFalse($bExcluded);
-
-        $this->assertCount(1, $aProperties);
-        $this->assertArrayHasKey('withBags', $aProperties);
-        $this->assertCount(1, $aProperties['withBags']);
-        $this->assertCount(2, $aProperties['withBags']['bags']);
-        $this->assertEquals('user.name', $aProperties['withBags']['bags'][0]);
-        $this->assertEquals('page.number', $aProperties['withBags']['bags'][1]);
-    }
-
-    /**
+public function testDatabagAnnotation()
+{
+$xMetadata = $this->getAttributes(ExtendAnnotated::class, ['withBags']);
+$bExcluded = $xMetadata->isExcluded();
+$aProperties = $xMetadata->getProperties();
+
+$this->assertFalse($bExcluded);
+
+$this->assertCount(1, $aProperties);
+$this->assertArrayHasKey('withBags', $aProperties);
+$this->assertCount(1, $aProperties['withBags']);
+$this->assertCount(2, $aProperties['withBags']['bags']);
+$this->assertEquals('user.name', $aProperties['withBags']['bags'][0]);
+$this->assertEquals('page.number', $aProperties['withBags']['bags'][1]);
+}
+
+/**
      * @throws SetupException
      */
-    public function testServerCallbacksAnnotation()
-    {
-        $xMetadata = $this->getAttributes(ExtendAnnotated::class,
-            ['cbSingle', 'cbMultiple', 'cbParams']);
-        $bExcluded = $xMetadata->isExcluded();
-        $aProperties = $xMetadata->getProperties();
-
-        $this->assertFalse($bExcluded);
-
-        $this->assertCount(3, $aProperties);
-        $this->assertArrayHasKey('cbSingle', $aProperties);
-        $this->assertArrayHasKey('cbMultiple', $aProperties);
-        $this->assertArrayHasKey('cbParams', $aProperties);
-
-        $this->assertCount(1, $aProperties['cbSingle']['__before']);
-        $this->assertCount(2, $aProperties['cbMultiple']['__before']);
-        $this->assertCount(2, $aProperties['cbParams']['__before']);
-        $this->assertArrayHasKey('funcBefore', $aProperties['cbSingle']['__before']);
-        $this->assertArrayHasKey('funcBefore1', $aProperties['cbMultiple']['__before']);
-        $this->assertArrayHasKey('funcBefore2', $aProperties['cbMultiple']['__before']);
-        $this->assertArrayHasKey('funcBefore1', $aProperties['cbParams']['__before']);
-        $this->assertArrayHasKey('funcBefore2', $aProperties['cbParams']['__before']);
-        $this->assertIsArray($aProperties['cbSingle']['__before']['funcBefore']);
-        $this->assertIsArray($aProperties['cbMultiple']['__before']['funcBefore1']);
-        $this->assertIsArray($aProperties['cbMultiple']['__before']['funcBefore2']);
-        $this->assertIsArray($aProperties['cbParams']['__before']['funcBefore1']);
-        $this->assertIsArray($aProperties['cbParams']['__before']['funcBefore2']);
-
-        $this->assertCount(1, $aProperties['cbSingle']['__after']);
-        $this->assertCount(3, $aProperties['cbMultiple']['__after']);
-        $this->assertCount(1, $aProperties['cbParams']['__after']);
-        $this->assertArrayHasKey('funcAfter', $aProperties['cbSingle']['__after']);
-        $this->assertArrayHasKey('funcAfter1', $aProperties['cbMultiple']['__after']);
-        $this->assertArrayHasKey('funcAfter2', $aProperties['cbMultiple']['__after']);
-        $this->assertArrayHasKey('funcAfter3', $aProperties['cbMultiple']['__after']);
-        $this->assertArrayHasKey('funcAfter1', $aProperties['cbParams']['__after']);
-        $this->assertIsArray($aProperties['cbSingle']['__after']['funcAfter']);
-        $this->assertIsArray($aProperties['cbMultiple']['__after']['funcAfter1']);
-        $this->assertIsArray($aProperties['cbMultiple']['__after']['funcAfter2']);
-        $this->assertIsArray($aProperties['cbMultiple']['__after']['funcAfter3']);
-        $this->assertIsArray($aProperties['cbParams']['__after']['funcAfter1']);
-    }
-
-    /**
+public function testServerCallbacksAnnotation()
+{
+$xMetadata = $this->getAttributes(ExtendAnnotated::class,
+['cbSingle', 'cbMultiple', 'cbParams']);
+$bExcluded = $xMetadata->isExcluded();
+$aProperties = $xMetadata->getProperties();
+
+$this->assertFalse($bExcluded);
+
+$this->assertCount(3, $aProperties);
+$this->assertArrayHasKey('cbSingle', $aProperties);
+$this->assertArrayHasKey('cbMultiple', $aProperties);
+$this->assertArrayHasKey('cbParams', $aProperties);
+
+$this->assertCount(1, $aProperties['cbSingle']['__before']);
+$this->assertCount(2, $aProperties['cbMultiple']['__before']);
+$this->assertCount(2, $aProperties['cbParams']['__before']);
+$this->assertArrayHasKey('funcBefore', $aProperties['cbSingle']['__before']);
+$this->assertArrayHasKey('funcBefore1', $aProperties['cbMultiple']['__before']);
+$this->assertArrayHasKey('funcBefore2', $aProperties['cbMultiple']['__before']);
+$this->assertArrayHasKey('funcBefore1', $aProperties['cbParams']['__before']);
+$this->assertArrayHasKey('funcBefore2', $aProperties['cbParams']['__before']);
+$this->assertIsArray($aProperties['cbSingle']['__before']['funcBefore']);
+$this->assertIsArray($aProperties['cbMultiple']['__before']['funcBefore1']);
+$this->assertIsArray($aProperties['cbMultiple']['__before']['funcBefore2']);
+$this->assertIsArray($aProperties['cbParams']['__before']['funcBefore1']);
+$this->assertIsArray($aProperties['cbParams']['__before']['funcBefore2']);
+
+$this->assertCount(1, $aProperties['cbSingle']['__after']);
+$this->assertCount(3, $aProperties['cbMultiple']['__after']);
+$this->assertCount(1, $aProperties['cbParams']['__after']);
+$this->assertArrayHasKey('funcAfter', $aProperties['cbSingle']['__after']);
+$this->assertArrayHasKey('funcAfter1', $aProperties['cbMultiple']['__after']);
+$this->assertArrayHasKey('funcAfter2', $aProperties['cbMultiple']['__after']);
+$this->assertArrayHasKey('funcAfter3', $aProperties['cbMultiple']['__after']);
+$this->assertArrayHasKey('funcAfter1', $aProperties['cbParams']['__after']);
+$this->assertIsArray($aProperties['cbSingle']['__after']['funcAfter']);
+$this->assertIsArray($aProperties['cbMultiple']['__after']['funcAfter1']);
+$this->assertIsArray($aProperties['cbMultiple']['__after']['funcAfter2']);
+$this->assertIsArray($aProperties['cbMultiple']['__after']['funcAfter3']);
+$this->assertIsArray($aProperties['cbParams']['__after']['funcAfter1']);
+}
+
+/**
      * @throws SetupException
      */
-    public function testContainerAnnotation()
-    {
-        $xMetadata = $this->getAttributes(ExtendAnnotated::class, ['di1', 'di2']);
-        $bExcluded = $xMetadata->isExcluded();
-        $aProperties = $xMetadata->getProperties();
-
-        $this->assertFalse($bExcluded);
-
-        $this->assertCount(2, $aProperties);
-        $this->assertArrayHasKey('di1', $aProperties);
-        $this->assertArrayHasKey('di2', $aProperties);
-        $this->assertCount(2, $aProperties['di1']['__di']);
-        $this->assertCount(2, $aProperties['di2']['__di']);
-        $this->assertEquals('Jaxon\Annotations\Tests\Service\ColorService', $aProperties['di1']['__di']['colorService']);
-        $this->assertEquals('Jaxon\Annotations\Tests\App\Ajax\FontService', $aProperties['di1']['__di']['fontService']);
-        $this->assertEquals('Jaxon\Annotations\Tests\Service\ColorService', $aProperties['di2']['__di']['colorService']);
-        $this->assertEquals('Jaxon\Annotations\Tests\Service\TextService', $aProperties['di2']['__di']['textService']);
-    }
-
-    /**
+public function testContainerAnnotation()
+{
+$xMetadata = $this->getAttributes(ExtendAnnotated::class, ['di1', 'di2']);
+$bExcluded = $xMetadata->isExcluded();
+$aProperties = $xMetadata->getProperties();
+
+$this->assertFalse($bExcluded);
+
+$this->assertCount(2, $aProperties);
+$this->assertArrayHasKey('di1', $aProperties);
+$this->assertArrayHasKey('di2', $aProperties);
+$this->assertCount(2, $aProperties['di1']['__di']);
+$this->assertCount(2, $aProperties['di2']['__di']);
+$this->assertEquals('Jaxon\Annotations\Tests\Service\ColorService', $aProperties['di1']['__di']['colorService']);
+$this->assertEquals('Jaxon\Annotations\Tests\App\Ajax\FontService', $aProperties['di1']['__di']['fontService']);
+$this->assertEquals('Jaxon\Annotations\Tests\Service\ColorService', $aProperties['di2']['__di']['colorService']);
+$this->assertEquals('Jaxon\Annotations\Tests\Service\TextService', $aProperties['di2']['__di']['textService']);
+}
+
+/**
      * @throws SetupException
      */
-    public function testClassAnnotation()
-    {
-        $xMetadata = $this->getAttributes(ExtendClassAnnotated::class, []);
-        $bExcluded = $xMetadata->isExcluded();
-        $aProperties = $xMetadata->getProperties();
-
-        $this->assertFalse($bExcluded);
-
-        $this->assertCount(1, $aProperties);
-        $this->assertArrayHasKey('*', $aProperties);
-        $this->assertCount(5, $aProperties['*']);
-        $this->assertArrayHasKey('bags', $aProperties['*']);
-        $this->assertArrayHasKey('callback', $aProperties['*']);
-        $this->assertArrayHasKey('__before', $aProperties['*']);
-        $this->assertArrayHasKey('__after', $aProperties['*']);
-    }
-
-    /**
+public function testClassAnnotation()
+{
+$xMetadata = $this->getAttributes(ExtendClassAnnotated::class, []);
+$bExcluded = $xMetadata->isExcluded();
+$aProperties = $xMetadata->getProperties();
+
+$this->assertFalse($bExcluded);
+
+$this->assertCount(1, $aProperties);
+$this->assertArrayHasKey('*', $aProperties);
+$this->assertCount(5, $aProperties['*']);
+$this->assertArrayHasKey('bags', $aProperties['*']);
+$this->assertArrayHasKey('callback', $aProperties['*']);
+$this->assertArrayHasKey('__before', $aProperties['*']);
+$this->assertArrayHasKey('__after', $aProperties['*']);
+}
+
+/**
      * @throws SetupException
      */
-    public function testClassBagsAnnotation()
-    {
-        $xMetadata = $this->getAttributes(ExtendClassAnnotated::class, []);
-        $aProperties = $xMetadata->getProperties();
+public function testClassBagsAnnotation()
+{
+$xMetadata = $this->getAttributes(ExtendClassAnnotated::class, []);
+$aProperties = $xMetadata->getProperties();
 
-        $this->assertCount(2, $aProperties['*']['bags']);
-        $this->assertEquals('user.name', $aProperties['*']['bags'][0]);
-        $this->assertEquals('page.number', $aProperties['*']['bags'][1]);
-    }
+$this->assertCount(2, $aProperties['*']['bags']);
+$this->assertEquals('user.name', $aProperties['*']['bags'][0]);
+$this->assertEquals('page.number', $aProperties['*']['bags'][1]);
+}
 
-    /**
+/**
      * @throws SetupException
      */
-    public function testClassCallbackAnnotation()
-    {
-        $xMetadata = $this->getAttributes(ExtendClassAnnotated::class, []);
-        $aProperties = $xMetadata->getProperties();
+public function testClassCallbackAnnotation()
+{
+$xMetadata = $this->getAttributes(ExtendClassAnnotated::class, []);
+$aProperties = $xMetadata->getProperties();
 
-        $this->assertIsArray($aProperties['*']['callback']);
-        $this->assertEquals('jaxon.callback.global', $aProperties['*']['callback'][0]);
-    }
+$this->assertIsArray($aProperties['*']['callback']);
+$this->assertEquals('jaxon.callback.global', $aProperties['*']['callback'][0]);
+}
 
-    /**
+/**
      * @throws SetupException
      */
-    public function testClassBeforeAnnotation()
-    {
-        $xMetadata = $this->getAttributes(ExtendClassAnnotated::class, []);
-        $aProperties = $xMetadata->getProperties();
-
-        $this->assertCount(2, $aProperties['*']['__before']);
-        $this->assertArrayHasKey('funcBefore1', $aProperties['*']['__before']);
-        $this->assertArrayHasKey('funcBefore2', $aProperties['*']['__before']);
-        $this->assertIsArray($aProperties['*']['__before']['funcBefore1']);
-        $this->assertIsArray($aProperties['*']['__before']['funcBefore2']);
-    }
-
-    /**
+public function testClassBeforeAnnotation()
+{
+$xMetadata = $this->getAttributes(ExtendClassAnnotated::class, []);
+$aProperties = $xMetadata->getProperties();
+
+$this->assertCount(2, $aProperties['*']['__before']);
+$this->assertArrayHasKey('funcBefore1', $aProperties['*']['__before']);
+$this->assertArrayHasKey('funcBefore2', $aProperties['*']['__before']);
+$this->assertIsArray($aProperties['*']['__before']['funcBefore1']);
+$this->assertIsArray($aProperties['*']['__before']['funcBefore2']);
+}
+
+/**
      * @throws SetupException
      */
-    public function testClassAfterAnnotation()
-    {
-        $xMetadata = $this->getAttributes(ExtendClassAnnotated::class, []);
-        $aProperties = $xMetadata->getProperties();
-
-        $this->assertCount(3, $aProperties['*']['__after']);
-        $this->assertArrayHasKey('funcAfter1', $aProperties['*']['__after']);
-        $this->assertArrayHasKey('funcAfter2', $aProperties['*']['__after']);
-        $this->assertArrayHasKey('funcAfter3', $aProperties['*']['__after']);
-        $this->assertIsArray($aProperties['*']['__after']['funcAfter1']);
-        $this->assertIsArray($aProperties['*']['__after']['funcAfter2']);
-        $this->assertIsArray($aProperties['*']['__after']['funcAfter3']);
-    }
-
-    /**
+public function testClassAfterAnnotation()
+{
+$xMetadata = $this->getAttributes(ExtendClassAnnotated::class, []);
+$aProperties = $xMetadata->getProperties();
+
+$this->assertCount(3, $aProperties['*']['__after']);
+$this->assertArrayHasKey('funcAfter1', $aProperties['*']['__after']);
+$this->assertArrayHasKey('funcAfter2', $aProperties['*']['__after']);
+$this->assertArrayHasKey('funcAfter3', $aProperties['*']['__after']);
+$this->assertIsArray($aProperties['*']['__after']['funcAfter1']);
+$this->assertIsArray($aProperties['*']['__after']['funcAfter2']);
+$this->assertIsArray($aProperties['*']['__after']['funcAfter3']);
+}
+
+/**
      * @throws SetupException
      */
-    public function testClassDiAnnotation()
-    {
-        $xMetadata = $this->getAttributes(ExtendClassAnnotated::class, []);
-        $aProperties = $xMetadata->getProperties();
-
-        $this->assertCount(3, $aProperties['*']['__di']);
-        $this->assertArrayHasKey('colorService', $aProperties['*']['__di']);
-        $this->assertArrayHasKey('textService', $aProperties['*']['__di']);
-        $this->assertArrayHasKey('fontService', $aProperties['*']['__di']);
-        $this->assertEquals('Jaxon\Annotations\Tests\Service\ColorService', $aProperties['*']['__di']['colorService']);
-        $this->assertEquals('Jaxon\Annotations\Tests\Service\TextService', $aProperties['*']['__di']['textService']);
-        $this->assertEquals('Jaxon\Annotations\Tests\App\Ajax\FontService', $aProperties['*']['__di']['fontService']);
-    }
-
-    /**
+public function testClassDiAnnotation()
+{
+$xMetadata = $this->getAttributes(ExtendClassAnnotated::class, []);
+$aProperties = $xMetadata->getProperties();
+
+$this->assertCount(3, $aProperties['*']['__di']);
+$this->assertArrayHasKey('colorService', $aProperties['*']['__di']);
+$this->assertArrayHasKey('textService', $aProperties['*']['__di']);
+$this->assertArrayHasKey('fontService', $aProperties['*']['__di']);
+$this->assertEquals('Jaxon\Annotations\Tests\Service\ColorService', $aProperties['*']['__di']['colorService']);
+$this->assertEquals('Jaxon\Annotations\Tests\Service\TextService', $aProperties['*']['__di']['textService']);
+$this->assertEquals('Jaxon\Annotations\Tests\App\Ajax\FontService', $aProperties['*']['__di']['fontService']);
+}
+
+/**
      * @throws SetupException
      */
-    public function testClassExcludeAnnotation()
-    {
-        $xMetadata = $this->getAttributes(ClassExcluded::class,
-            ['doNot', 'withBags', 'cbSingle']);
-        $bExcluded = $xMetadata->isExcluded();
-        $aProperties = $xMetadata->getProperties();
-        $aProtected = $xMetadata->getProtectedMethods();
-
-        $this->assertTrue($bExcluded);
-        $this->assertEmpty($aProperties);
-        $this->assertEmpty($aProtected);
-    }
-
-    public function testExcludeAnnotationError()
-    {
-        $this->expectException(SetupException::class);
-        $this->getAttributes(ExtendAnnotated::class, ['doNotError']);
-    }
-
-    public function testDatabagAnnotationError()
-    {
-        $this->expectException(SetupException::class);
-        $this->getAttributes(ExtendAnnotated::class, ['withBagsError']);
-    }
-
-    public function testUploadAnnotationWrongName()
-    {
-        $this->expectException(SetupException::class);
-        $this->getAttributes(ExtendAnnotated::class, ['saveFilesWrongName']);
-    }
-
-    public function testUploadAnnotationMultiple()
-    {
-        $this->expectException(SetupException::class);
-        $this->getAttributes(ExtendAnnotated::class, ['saveFilesMultiple']);
-    }
-
-    public function testCallbacksBeforeAnnotationNoCall()
-    {
-        $this->expectException(SetupException::class);
-        $this->getAttributes(ExtendAnnotated::class, ['cbBeforeNoCall']);
-    }
-
-    public function testCallbacksBeforeAnnotationUnknownAttr()
-    {
-        $this->expectException(SetupException::class);
-        $this->getAttributes(ExtendAnnotated::class, ['cbBeforeUnknownAttr']);
-    }
-
-    public function testCallbacksBeforeAnnotationWrongAttrType()
-    {
-        $this->expectException(SetupException::class);
-        $this->getAttributes(ExtendAnnotated::class, ['cbBeforeWrongAttrType']);
-    }
-
-    public function testCallbacksAfterAnnotationNoCall()
-    {
-        $this->expectException(SetupException::class);
-        $this->getAttributes(ExtendAnnotated::class, ['cbAfterNoCall']);
-    }
-
-    public function testCallbacksAfterAnnotationUnknownAttr()
-    {
-        $this->expectException(SetupException::class);
-        $this->getAttributes(ExtendAnnotated::class, ['cbAfterUnknownAttr']);
-    }
-
-    public function testCallbacksAfterAnnotationWrongAttrType()
-    {
-        $this->expectException(SetupException::class);
-        $this->getAttributes(ExtendAnnotated::class, ['cbAfterWrongAttrType']);
-    }
-
-    public function testContainerAnnotationUnknownAttr()
-    {
-        $this->expectException(SetupException::class);
-        $this->getAttributes(ExtendAnnotated::class, ['diUnknownAttr']);
-    }
-
-    public function testContainerAnnotationWrongAttrType()
-    {
-        $this->expectException(SetupException::class);
-        $this->getAttributes(ExtendAnnotated::class, ['diWrongAttrType']);
-    }
-
-    public function testContainerAnnotationWrongClassType()
-    {
-        $this->expectException(SetupException::class);
-        $this->getAttributes(ExtendAnnotated::class, ['diWrongClassType']);
-    }
-
-    public function testContainerAnnotationWrongVarCount()
-    {
-        $this->expectException(SetupException::class);
-        $this->getAttributes(ExtendAnnotated::class, ['diWrongVarCount']);
-    }
+public function testClassExcludeAnnotation()
+{
+$xMetadata = $this->getAttributes(ClassExcluded::class,
+['doNot', 'withBags', 'cbSingle']);
+$bExcluded = $xMetadata->isExcluded();
+$aProperties = $xMetadata->getProperties();
+$aProtected = $xMetadata->getProtectedMethods();
+
+$this->assertTrue($bExcluded);
+$this->assertEmpty($aProperties);
+$this->assertEmpty($aProtected);
+}
+
+public function testExcludeAnnotationError()
+{
+$this->expectException(SetupException::class);
+$this->getAttributes(ExtendAnnotated::class, ['doNotError']);
+}
+
+public function testDatabagAnnotationError()
+{
+$this->expectException(SetupException::class);
+$this->getAttributes(ExtendAnnotated::class, ['withBagsError']);
+}
+
+public function testUploadAnnotationWrongName()
+{
+$this->expectException(SetupException::class);
+$this->getAttributes(ExtendAnnotated::class, ['saveFilesWrongName']);
+}
+
+public function testUploadAnnotationMultiple()
+{
+$this->expectException(SetupException::class);
+$this->getAttributes(ExtendAnnotated::class, ['saveFilesMultiple']);
+}
+
+public function testCallbacksBeforeAnnotationNoCall()
+{
+$this->expectException(SetupException::class);
+$this->getAttributes(ExtendAnnotated::class, ['cbBeforeNoCall']);
+}
+
+public function testCallbacksBeforeAnnotationUnknownAttr()
+{
+$this->expectException(SetupException::class);
+$this->getAttributes(ExtendAnnotated::class, ['cbBeforeUnknownAttr']);
+}
+
+public function testCallbacksBeforeAnnotationWrongAttrType()
+{
+$this->expectException(SetupException::class);
+$this->getAttributes(ExtendAnnotated::class, ['cbBeforeWrongAttrType']);
+}
+
+public function testCallbacksAfterAnnotationNoCall()
+{
+$this->expectException(SetupException::class);
+$this->getAttributes(ExtendAnnotated::class, ['cbAfterNoCall']);
+}
+
+public function testCallbacksAfterAnnotationUnknownAttr()
+{
+$this->expectException(SetupException::class);
+$this->getAttributes(ExtendAnnotated::class, ['cbAfterUnknownAttr']);
+}
+
+public function testCallbacksAfterAnnotationWrongAttrType()
+{
+$this->expectException(SetupException::class);
+$this->getAttributes(ExtendAnnotated::class, ['cbAfterWrongAttrType']);
+}
+
+public function testContainerAnnotationUnknownAttr()
+{
+$this->expectException(SetupException::class);
+$this->getAttributes(ExtendAnnotated::class, ['diUnknownAttr']);
+}
+
+public function testContainerAnnotationWrongAttrType()
+{
+$this->expectException(SetupException::class);
+$this->getAttributes(ExtendAnnotated::class, ['diWrongAttrType']);
+}
+
+public function testContainerAnnotationWrongClassType()
+{
+$this->expectException(SetupException::class);
+$this->getAttributes(ExtendAnnotated::class, ['diWrongClassType']);
+}
+
+public function testContainerAnnotationWrongVarCount()
+{
+$this->expectException(SetupException::class);
+$this->getAttributes(ExtendAnnotated::class, ['diWrongVarCount']);
+}
 }

jaxon-annotations/tests/App/Ajax/ExtendAnnotated.php

Switch Indentation +92 added lines, -92 removed lines

@@ -7,176 +7,176 @@
 
 class ExtendAnnotated extends FuncComponent
 {
-    /**
+/**
      * @exclude
      */
-    public function doNot()
-    {
-    }
+public function doNot()
+{
+}
 
-    /**
+/**
      * @exclude(true)
      */
-    public function doNotBool()
-    {
-    }
+public function doNotBool()
+{
+}
 
-    /**
+/**
      * @exclude('Me')
      */
-    public function doNotError()
-    {
-    }
+public function doNotError()
+{
+}
 
-    /**
+/**
      * @databag('name' => 'user.name')
      * @databag('name' => 'page.number')
      */
-    public function withBags()
-    {
-    }
+public function withBags()
+{
+}
 
-    /**
+/**
      * @databag('mane' => 'user.name')
      * @databag('mane' => 'page.number')
      */
-    public function withBagsError()
-    {
-    }
+public function withBagsError()
+{
+}
 
-    /**
+/**
      * @upload('field' => 'user-files')
      */
-    public function saveFiles()
-    {
-    }
+public function saveFiles()
+{
+}
 
-    /**
+/**
      * @upload('name' => 'user-files')
      */
-    public function saveFilesWrongName()
-    {
-    }
+public function saveFilesWrongName()
+{
+}
 
-    /**
+/**
      * @upload('field' => 'user-file1')
      * @upload('field' => 'user-file2')
      */
-    public function saveFilesMultiple()
-    {
-    }
+public function saveFilesMultiple()
+{
+}
 
-    /**
+/**
      * @before('call' => 'funcBefore')
      * @after('call' => 'funcAfter')
      */
-    public function cbSingle()
-    {
-    }
+public function cbSingle()
+{
+}
 
-    /**
+/**
      * @before('call' => 'funcBefore1')
      * @before('call' => 'funcBefore2')
      * @after('call' => 'funcAfter1')
      * @after('call' => 'funcAfter2')
      * @after('call' => 'funcAfter3')
      */
-    public function cbMultiple()
-    {
-    }
+public function cbMultiple()
+{
+}
 
-    /**
+/**
      * @before('call' => 'funcBefore1', 'with' => ['param1'])
      * @before('call' => 'funcBefore2', 'with' => ['param1', 'param2'])
      * @after('call' => 'funcAfter1', 'with' => ['param1', 'param2'])
      */
-    public function cbParams()
-    {
-    }
+public function cbParams()
+{
+}
 
-    /**
+/**
      * @di('attr' => 'colorService', 'class' => 'ColorService')
      * @di('attr' => 'fontService', 'class' => 'FontService')
      */
-    public function di1()
-    {
-    }
+public function di1()
+{
+}
 
-    /**
+/**
      * @di('attr' => 'colorService', 'class' => 'ColorService')
      * @di('attr' => 'textService', 'class' => '\Jaxon\Annotations\Tests\Service\TextService')
      */
-    public function di2()
-    {
-    }
+public function di2()
+{
+}
 
-    /**
+/**
      * @before('name' => 'funcBefore', 'with' => ['param1'])
      */
-    public function cbBeforeNoCall()
-    {
-    }
+public function cbBeforeNoCall()
+{
+}
 
-    /**
+/**
      * @before('call' => 'funcBefore', 'params' => ['param1'])
      */
-    public function cbBeforeUnknownAttr()
-    {
-    }
+public function cbBeforeUnknownAttr()
+{
+}
 
-    /**
+/**
      * @before('call' => 'funcBefore', 'with' => 'param1')
      */
-    public function cbBeforeWrongAttrType()
-    {
-    }
+public function cbBeforeWrongAttrType()
+{
+}
 
-    /**
+/**
      * @after('name' => 'funcAfter', 'with' => ['param1'])
      */
-    public function cbAfterNoCall()
-    {
-    }
+public function cbAfterNoCall()
+{
+}
 
-    /**
+/**
      * @after('call' => 'funcAfter', 'params' => ['param1'])
      */
-    public function cbAfterUnknownAttr()
-    {
-    }
+public function cbAfterUnknownAttr()
+{
+}
 
-    /**
+/**
      * @after('call' => 'funcAfter', 'with' => true)
      */
-    public function cbAfterWrongAttrType()
-    {
-    }
+public function cbAfterWrongAttrType()
+{
+}
 
-    /**
+/**
      * @di('attr' => 'attr', 'params' => '')
      */
-    public function diUnknownAttr()
-    {
-    }
+public function diUnknownAttr()
+{
+}
 
-    /**
+/**
      * @di('attr' => [], 'class' => 'ClassName')
      */
-    public function diWrongAttrType()
-    {
-    }
+public function diWrongAttrType()
+{
+}
 
-    /**
+/**
      * @di('attr' => 'attr', 'class' => true)
      */
-    public function diWrongClassType()
-    {
-    }
+public function diWrongClassType()
+{
+}
 
-    /**
+/**
      * @di('attr' => 'attr', 'class' => 'ClassName', 'name' => 'di')
      */
-    public function diWrongVarCount()
-    {
-    }
+public function diWrongVarCount()
+{
+}
 }