jaxon-php / jaxon-mono

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

Switch Indentation +59 added lines, -59 removed lines

@@ -241,83 +241,83 @@
                 $this->aComponentPublicMethods['node'],
             $xReflectionClass->isSubclassOf(FuncComponent::class) =>
                 $this->aComponentPublicMethods['func'],
-            default => [[], []],
-        };
+default => [[], []],
+};
 
-        return [$aMethods, ...$aBaseMethods];
-    }
+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
      */
-    public function getComponentOptions(ReflectionClass $xReflectionClass,
-        array $aOptions): ComponentOptions
-    {
-        $aMethods = $this->getPublicMethods($xReflectionClass);
-        $xMetadata = $this->getComponentMetadata($xReflectionClass, $aMethods[0], $aOptions);
+public 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);
+}
 }

Spacing +14 added lines, -14 removed lines

@@ -151,15 +151,15 @@ 
         $xRegistry->updateHash(false); // Disable hash calculation.
 
         $sComponentId = str_replace('\\', '.', $sClassName);
-        if(!isset($this->aComponents[$sComponentId]))
+        if (!isset($this->aComponents[$sComponentId]))
         {
             $aOptions = $xRegistry->getNamespaceComponentOptions($sClassName);
-            if($aOptions !== null)
+            if ($aOptions !== null)
             {
                 $this->saveComponent($sClassName, $aOptions);
             }
         }
-        if(isset($this->aComponents[$sComponentId]))
+        if (isset($this->aComponents[$sComponentId]))
         {
             return; // The component is found.
         }
@@ -167,11 +167,11 @@ 
         // The component was not found in a registered namespace. We need to parse all
         // the directories to be able to find a component registered without a namespace.
         $sComponentId = str_replace('\\', '_', $sClassName);
-        if(!isset($this->aComponents[$sComponentId]))
+        if (!isset($this->aComponents[$sComponentId]))
         {
             $xRegistry->registerComponentsInDirectories();
         }
-        if(isset($this->aComponents[$sComponentId]))
+        if (isset($this->aComponents[$sComponentId]))
         {
             return; // The component is found.
         }
@@ -189,7 +189,7 @@ 
     public function getCallableObjects(): array
     {
         $aCallableObjects = [];
-        foreach($this->aComponents as $sComponentId => $_)
+        foreach ($this->aComponents as $sComponentId => $_)
         {
             $aCallableObjects[$sComponentId] = $this->makeCallableObject($sComponentId);
         }
@@ -206,7 +206,7 @@ 
     private function setComponentPublicMethods(string $sKey, string $sClass,
         array $aNeverExported): void
     {
-        if(isset($this->aComponentPublicMethods[$sKey]))
+        if (isset($this->aComponentPublicMethods[$sKey]))
         {
             return;
         }
@@ -259,12 +259,12 @@ 
     {
         /** @var Config|null */
         $xPackageConfig = $aOptions['config'] ?? null;
-        if($xPackageConfig === null || (bool)($aOptions['excluded'] ?? false))
+        if ($xPackageConfig === null || (bool)($aOptions['excluded'] ?? false))
         {
             return null;
         }
         $sMetadataFormat = $xPackageConfig->getOption('metadata.format');
-        if(!in_array($sMetadataFormat, ['attributes', 'annotations']))
+        if (!in_array($sMetadataFormat, ['attributes', 'annotations']))
         {
             return null;
         }
@@ -274,23 +274,23 @@ 
         $xMetadata = null;
         $xMetadataCache = null;
         $xConfig = $di->config();
-        if($xConfig->getAppOption('metadata.cache.enabled', false))
+        if ($xConfig->getAppOption('metadata.cache.enabled', false))
         {
-            if(!$di->h('jaxon_metadata_cache_dir'))
+            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)
+            if ($xMetadata !== null)
             {
                 return $xMetadata;
             }
         }
 
         $aProperties = array_map(fn($xProperty) => $xProperty->getName(),
-            $xReflectionClass->getProperties(ReflectionProperty::IS_PUBLIC |
+            $xReflectionClass->getProperties(ReflectionProperty::IS_PUBLIC|
                 ReflectionProperty::IS_PROTECTED));
 
         $xMetadataReader = $di->getMetadataReader($sMetadataFormat);
@@ -298,7 +298,7 @@ 
         $xMetadata = $xMetadataReader->getAttributes($xInput);
 
         // Try to save the metadata in the cache
-        if($xMetadataCache !== null && $xMetadata !== null)
+        if ($xMetadataCache !== null && $xMetadata !== null)
         {
             $xMetadataCache->save($xReflectionClass->getName(), $xMetadata);
         }

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<string, array<string>>
      */
-    private array $aMethods = [];
+private array $aMethods = [];
 
-    /**
+/**
      * @return string
      */
-    public function getName(): string
-    {
-        return 'export';
-    }
+public function getName(): string
+{
+return 'export';
+}
 
-    /**
+/**
      * @return mixed
      */
-    public function getValue(): mixed
-    {
-        return $this->aMethods;
-    }
+public function getValue(): 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));"];
+}
 }

Spacing +3 added lines, -3 removed lines

@@ -50,11 +50,11 @@
      */
     public function setMethods(array $aMethods): void
     {
-        foreach(['base', 'only', 'except'] as $sKey)
+        foreach (['base', 'only', 'except'] as $sKey)
         {
-            foreach($aMethods[$sKey] ?? [] as $sMethod)
+            foreach ($aMethods[$sKey] ?? [] as $sMethod)
             {
-                if(!is_string($sMethod) || !$this->validateMethod($sMethod))
+                if (!is_string($sMethod) || !$this->validateMethod($sMethod))
                 {
                     throw new SetupException("'$sMethod' is not a valid method name.");
                 }

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

Spacing +22 added lines, -25 removed lines

@@ -106,18 +106,18 @@ 
         $sSeparator = $aOptions['separator'] ?? '.';
         $this->sSeparator = $sSeparator === '_' ? '_' : '.';
         $this->addProtectedMethods($aOptions['protected'] ?? []);
-        foreach($aOptions['functions'] ?? [] as $sNames => $aFunctionOptions)
+        foreach ($aOptions['functions'] ?? [] as $sNames => $aFunctionOptions)
         {
             // Names are in a comma-separated list.
             $aFunctionNames = explode(',', $sNames);
-            foreach($aFunctionNames as $sFunctionName)
+            foreach ($aFunctionNames as $sFunctionName)
             {
                 $this->addFunctionOptions($sFunctionName, $aFunctionOptions);
             }
         }
 
         // Options from the attributes or annotations.
-        if($xMetadata !== null)
+        if ($xMetadata !== null)
         {
             $this->readMetadataOptions($xMetadata);
         }
@@ -133,8 +133,7 @@ 
     private function addProtectedMethods(array|string $xMethods): void
     {
         $this->aExportMethods['except'] = array_merge($this->aExportMethods['except'],
-            !is_array($xMethods) ? [trim((string)$xMethods)] :
-            array_map(fn($sMethod) => trim((string)$sMethod), $xMethods));
+            !is_array($xMethods) ? [trim((string)$xMethods)] : array_map(fn($sMethod) => trim((string)$sMethod), $xMethods));
     }
 
     /**
@@ -149,7 +148,7 @@ 
         $aExportMethods['except'] = array_unique(array_merge(
             $aExportMethods['except'] ?? [], $this->aExportMethods['except']));
         $this->aExportMethods = $aExportMethods;
-        foreach($xMetadata->getProperties() as $sFunctionName => $aFunctionOptions)
+        foreach ($xMetadata->getProperties() as $sFunctionName => $aFunctionOptions)
         {
             $this->addFunctionOptions($sFunctionName, $aFunctionOptions);
         }
@@ -162,7 +161,7 @@ 
      */
     private function filterPublicMethods(array $aMethods): array
     {
-        if($this->bExcluded || in_array('*', $this->aExportMethods['except']))
+        if ($this->bExcluded || in_array('*', $this->aExportMethods['except']))
         {
             return [];
         }
@@ -170,12 +169,12 @@ 
         $aBaseMethods = $aMethods[1];
         $aNoMethods = $aMethods[2];
         $aMethods = $aMethods[0];
-        if(isset($this->aExportMethods['only']))
+        if (isset($this->aExportMethods['only']))
         {
             $aMethods = array_intersect($aMethods, $this->aExportMethods['only']);
         }
         $aMethods = array_diff($aMethods, $this->aExportMethods['except']);
-        if(count($aBaseMethods) > 0 && isset($this->aExportMethods['base']))
+        if (count($aBaseMethods) > 0 && isset($this->aExportMethods['base']))
         {
             $aBaseMethods = array_diff($aBaseMethods, $this->aExportMethods['base']);
         }
@@ -261,19 +260,19 @@ 
      */
     private function setHookMethods(array &$aHookMethods, $xValue): void
     {
-        foreach($xValue as $sCalledMethod => $xMethodToCall)
+        foreach ($xValue as $sCalledMethod => $xMethodToCall)
         {
-            if(!isset($aHookMethods[$sCalledMethod]))
+            if (!isset($aHookMethods[$sCalledMethod]))
             {
                 $aHookMethods[$sCalledMethod] = [];
             }
-            if(is_array($xMethodToCall))
+            if (is_array($xMethodToCall))
             {
                 $aHookMethods[$sCalledMethod] =
                     array_merge($aHookMethods[$sCalledMethod], $xMethodToCall);
                 continue;
             }
-            if(is_string($xMethodToCall))
+            if (is_string($xMethodToCall))
             {
                 $aHookMethods[$sCalledMethod][] = $xMethodToCall;
             }
@@ -298,7 +297,7 @@ 
      */
     private function addOption(string $sName, $xValue): void
     {
-        switch($sName)
+        switch ($sName)
         {
         // Set the methods to call before processing the request
         case '__before':
@@ -326,11 +325,11 @@ 
      */
     private function _addJsArrayOption(string $sFunctionName, string $sOptionName, $xOptionValue): void
     {
-        if(is_string($xOptionValue))
+        if (is_string($xOptionValue))
         {
             $xOptionValue = [$xOptionValue];
         }
-        if(!is_array($xOptionValue))
+        if (!is_array($xOptionValue))
         {
             return; // Do not save.
         }
@@ -360,10 +359,10 @@ 
      */
     private function addJsOption(string $sFunctionName, string $sOptionName, $xOptionValue): void
     {
-        switch($sOptionName)
+        switch ($sOptionName)
         {
         case 'excluded':
-            if((bool)$xOptionValue)
+            if ((bool)$xOptionValue)
             {
                 $this->addProtectedMethods($sFunctionName);
             }
@@ -387,12 +386,11 @@ 
      */
     private function addFunctionOptions(string $sFunctionName, array $aFunctionOptions): void
     {
-        foreach($aFunctionOptions as $sOptionName => $xOptionValue)
+        foreach ($aFunctionOptions as $sOptionName => $xOptionValue)
         {
             substr($sOptionName, 0, 2) === '__' ?
                 // Options for PHP classes. They start with "__".
-                $this->addOption($sOptionName, [$sFunctionName => $xOptionValue]) :
-                // Options for javascript code.
+                $this->addOption($sOptionName, [$sFunctionName => $xOptionValue]) : // Options for javascript code.
                 $this->addJsOption($sFunctionName, $sOptionName, $xOptionValue);
         }
     }
@@ -408,16 +406,15 @@ 
         $aOptions = array_merge($this->aJsOptions['*'] ?? []); // Clone the array
         // Then add the method options.
         $aMethodOptions = $this->aJsOptions[$sMethodName] ?? [];
-        foreach($aMethodOptions as $sOptionName => $xOptionValue)
+        foreach ($aMethodOptions as $sOptionName => $xOptionValue)
         {
             // For databags and callbacks, merge the values in a single array.
             // For all the other options, keep the last value.
             $aOptions[$sOptionName] = !in_array($sOptionName, ['bags', 'callback']) ?
-                $xOptionValue :
-                array_unique(array_merge($aOptions[$sOptionName] ?? [], $xOptionValue));
+                $xOptionValue : array_unique(array_merge($aOptions[$sOptionName] ?? [], $xOptionValue));
         }
         // Since callbacks are js object names, they need a special formatting.
-        if(isset($aOptions['callback']))
+        if (isset($aOptions['callback']))
         {
             $aOptions['callback'] = str_replace('"', '', json_encode($aOptions['callback']));
         }

jaxon-attributes/src/Attribute/Inject.php

Spacing +8 added lines, -8 removed lines

@@ -21,8 +21,8 @@ 
 
 use function ltrim;
 
-#[Attribute(Attribute::TARGET_CLASS | Attribute::TARGET_PROPERTY |
-    Attribute::TARGET_METHOD | Attribute::IS_REPEATABLE)]
+#[Attribute(Attribute::TARGET_CLASS|Attribute::TARGET_PROPERTY|
+    Attribute::TARGET_METHOD|Attribute::IS_REPEATABLE)]
 class Inject extends AbstractAttribute
 {
     /**
@@ -78,17 +78,17 @@ 
      */
     public function validate(): void
     {
-        if($this->nTarget === Attribute::TARGET_CLASS)
+        if ($this->nTarget === Attribute::TARGET_CLASS)
         {
-            if(!$this->attr || !$this->type)
+            if (!$this->attr || !$this->type)
             {
                 throw new SetupException('When applied to a class, the Inject attribute requires two arguments.');
             }
             return;
         }
-        if($this->nTarget === Attribute::TARGET_METHOD)
+        if ($this->nTarget === Attribute::TARGET_METHOD)
         {
-            if(!$this->attr)
+            if (!$this->attr)
             {
                 throw new SetupException('When applied to a method, the Inject attribute requires the "attr" argument.');
             }
@@ -100,13 +100,13 @@ 
      */
     private function getFullClassName(): void
     {
-        if(!$this->type)
+        if (!$this->type)
         {
             // If no type is provided, take the attribute type.
             $this->type = $this->aTypes[$this->attr] ?? '';
             return;
         }
-        if($this->type[0] === '\\')
+        if ($this->type[0] === '\\')
         {
             $this->type = ltrim($this->type, '\\');
         }

jaxon-annotations/tests/TestAnnotation/ComponentTest.php

Switch Indentation +110 added lines, -110 removed lines

@@ -16,133 +16,133 @@
 
 class ComponentTest extends TestCase
 {
-    use AnnotationTrait;
+use AnnotationTrait;
 
-    /**
+/**
      * @var string
      */
-    private $sCacheDir;
+private $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 testNodeComponentExportMethods()
-    {
-        $xMetadata = $this->getAttributes(NodeComponent::class,
-            ['item', 'html', 'render', 'clear', 'visible'], []);
-        $bExcluded = $xMetadata->isExcluded();
-        $aExcluded = $xMetadata->getExceptMethods();
-        $aBaseMethods = $xMetadata->getExportBaseMethods();
-        $aOnlyMethods = $xMetadata->getExportOnlyMethods();
-
-        $this->assertFalse($bExcluded);
-        $this->assertCount(0, $aExcluded);
-        $this->assertCount(0, $aBaseMethods);
-        $this->assertCount(0, $aOnlyMethods);
-    }
-
-    /**
+public function testNodeComponentExportMethods()
+{
+$xMetadata = $this->getAttributes(NodeComponent::class,
+['item', 'html', 'render', 'clear', 'visible'], []);
+$bExcluded = $xMetadata->isExcluded();
+$aExcluded = $xMetadata->getExceptMethods();
+$aBaseMethods = $xMetadata->getExportBaseMethods();
+$aOnlyMethods = $xMetadata->getExportOnlyMethods();
+
+$this->assertFalse($bExcluded);
+$this->assertCount(0, $aExcluded);
+$this->assertCount(0, $aBaseMethods);
+$this->assertCount(0, $aOnlyMethods);
+}
+
+/**
      * @throws SetupException
      */
-    public function testPageComponentExportMethods()
-    {
-        $xMetadata = $this->getAttributes(PageComponent::class,
-            ['item', 'html', 'render', 'clear', 'visible'], []);
-        $bExcluded = $xMetadata->isExcluded();
-        $aExcluded = $xMetadata->getExceptMethods();
-        $aBaseMethods = $xMetadata->getExportBaseMethods();
-        $aOnlyMethods = $xMetadata->getExportOnlyMethods();
-
-        $this->assertFalse($bExcluded);
-        $this->assertCount(0, $aExcluded);
-        $this->assertCount(0, $aBaseMethods);
-        $this->assertCount(0, $aOnlyMethods);
-    }
-
-    /**
+public function testPageComponentExportMethods()
+{
+$xMetadata = $this->getAttributes(PageComponent::class,
+['item', 'html', 'render', 'clear', 'visible'], []);
+$bExcluded = $xMetadata->isExcluded();
+$aExcluded = $xMetadata->getExceptMethods();
+$aBaseMethods = $xMetadata->getExportBaseMethods();
+$aOnlyMethods = $xMetadata->getExportOnlyMethods();
+
+$this->assertFalse($bExcluded);
+$this->assertCount(0, $aExcluded);
+$this->assertCount(0, $aBaseMethods);
+$this->assertCount(0, $aOnlyMethods);
+}
+
+/**
      * @throws SetupException
      */
-    public function testFuncComponentExportMethods()
-    {
-        $xMetadata = $this->getAttributes(FuncComponent::class,
-            ['paginator'], []);
-        $bExcluded = $xMetadata->isExcluded();
-        $aExcluded = $xMetadata->getExceptMethods();
-        $aBaseMethods = $xMetadata->getExportBaseMethods();
-        $aOnlyMethods = $xMetadata->getExportOnlyMethods();
-
-        $this->assertFalse($bExcluded);
-        $this->assertCount(0, $aExcluded);
-        $this->assertCount(0, $aBaseMethods);
-        $this->assertCount(0, $aOnlyMethods);
-    }
-
-    /**
+public function testFuncComponentExportMethods()
+{
+$xMetadata = $this->getAttributes(FuncComponent::class,
+['paginator'], []);
+$bExcluded = $xMetadata->isExcluded();
+$aExcluded = $xMetadata->getExceptMethods();
+$aBaseMethods = $xMetadata->getExportBaseMethods();
+$aOnlyMethods = $xMetadata->getExportOnlyMethods();
+
+$this->assertFalse($bExcluded);
+$this->assertCount(0, $aExcluded);
+$this->assertCount(0, $aBaseMethods);
+$this->assertCount(0, $aOnlyMethods);
+}
+
+/**
      * @throws SetupException
      */
-    public function testNodeComponentExportBaseMethods()
-    {
-        // The attribute exports the 'html' and 'render' methods,
-        // but only the 'render' method shall be exported.
-        $xClass = new ReflectionClass(NodeBaseComponent::class);
-        $aMethods = ['item', 'html', 'render', 'clear', 'visible'];
-        $xMetadata = $this->getAttributes($xClass, $aMethods, []);
-        $aBaseMethods = $xMetadata->getExportBaseMethods();
-
-        // The 'html' and 'render' methods are returned.
-        $this->assertCount(2, $aBaseMethods);
-
-        $xOptions = $this->getOptions($xClass);
-        $aPublicMethods = $xOptions->getPublicMethods();
-
-        // Only the 'render' method is returned.
-        $this->assertCount(1, $aPublicMethods);
-        $this->assertEquals('render', $aPublicMethods[0]);
-    }
-
-    // public function testContainerAttributeErrorTwoDi()
-    // {
-    //     $this->expectException(SetupException::class);
-    //     $this->getAttributes(PropertyAttribute::class, [], ['errorTwoDi']);
-    // }
-
-    // public function testContainerAttributeErrorDiClass()
-    // {
-    //     $this->expectException(SetupException::class);
-    //     $this->getAttributes(PropertyAttribute::class, ['errorDiClass']);
-    // }
+public function testNodeComponentExportBaseMethods()
+{
+// The attribute exports the 'html' and 'render' methods,
+// but only the 'render' method shall be exported.
+$xClass = new ReflectionClass(NodeBaseComponent::class);
+$aMethods = ['item', 'html', 'render', 'clear', 'visible'];
+$xMetadata = $this->getAttributes($xClass, $aMethods, []);
+$aBaseMethods = $xMetadata->getExportBaseMethods();
+
+// The 'html' and 'render' methods are returned.
+$this->assertCount(2, $aBaseMethods);
+
+$xOptions = $this->getOptions($xClass);
+$aPublicMethods = $xOptions->getPublicMethods();
+
+// Only the 'render' method is returned.
+$this->assertCount(1, $aPublicMethods);
+$this->assertEquals('render', $aPublicMethods[0]);
+}
+
+// public function testContainerAttributeErrorTwoDi()
+// {
+//     $this->expectException(SetupException::class);
+//     $this->getAttributes(PropertyAttribute::class, [], ['errorTwoDi']);
+// }
+
+// public function testContainerAttributeErrorDiClass()
+// {
+//     $this->expectException(SetupException::class);
+//     $this->getAttributes(PropertyAttribute::class, ['errorDiClass']);
+// }
 }

Spacing +1 added lines, -1 removed lines

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

jaxon-annotations/tests/Attr/Ajax/Traits/Annotated.php

Switch Indentation +6 added lines, -6 removed lines

@@ -6,18 +6,18 @@
 
 trait Annotated
 {
-    /**
+/**
      * @var \Jaxon\Annotations\Tests\Service\ColorService
      */
-    protected $colorService;
+protected $colorService;
 
-    /**
+/**
      * @var TextService
      */
-    protected $textService;
+protected $textService;
 
-    /**
+/**
      * @var FontService
      */
-    protected $fontService;
+protected $fontService;
 }

jaxon-annotations/tests/Attr/Ajax/ClassAnnotated.php

Switch Indentation +6 added lines, -6 removed lines

@@ -21,18 +21,18 @@
  */
 class ClassAnnotated extends FuncComponent
 {
-    /**
+/**
      * @var \Jaxon\Annotations\Tests\Service\ColorService
      */
-    protected $colorService;
+protected $colorService;
 
-    /**
+/**
      * @var TextService
      */
-    protected $textService;
+protected $textService;
 
-    /**
+/**
      * @var FontService
      */
-    protected $fontService;
+protected $fontService;
 }

jaxon-annotations/tests/Attr/Ajax/DocBlockClassExcluded.php

Switch Indentation +12 added lines, -12 removed lines

@@ -9,26 +9,26 @@
  */
 class DocBlockClassExcluded extends FuncComponent
 {
-    /**
+/**
      * @exclude
      */
-    public function doNot()
-    {
-    }
+public function doNot()
+{
+}
 
-    /**
+/**
      * @databag user.name
      * @databag page.number
      */
-    public function withBags()
-    {
-    }
+public function withBags()
+{
+}
 
-    /**
+/**
      * @before funcBefore
      * @after funcAfter
      */
-    public function cbSingle()
-    {
-    }
+public function cbSingle()
+{
+}
 }

jaxon-annotations/tests/Attr/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()
+{
+}
 }