jaxon-php / jaxon-mono

jaxon-core/src/Plugin/Response/DataBag/DataBagPlugin.php

Switch Indentation +59 added lines, -59 removed lines

@@ -13,94 +13,94 @@
 
 class DataBagPlugin extends AbstractResponsePlugin
 {
-    /**
+/**
      * @const The plugin name
      */
-    public const NAME = 'bags';
+public const NAME = 'bags';
 
-    /**
+/**
      * @var DataBag
      */
-    protected $xDataBag = null;
+protected $xDataBag = null;
 
-    /**
+/**
      * The constructor
      */
-    public function __construct(protected Container $di)
-    {}
+public function __construct(protected Container $di)
+{}
 
-    /**
+/**
      * @return void
      */
-    private function initDataBag(): void
-    {
-        if($this->xDataBag !== null)
-        {
-            return;
-        }
+private function initDataBag(): void
+{
+if($this->xDataBag !== null)
+{
+return;
+}
 
-        // Get the databag contents from the HTTP request parameters.
-        $xRequest = $this->di->getRequest();
-        $aBody = $xRequest->getParsedBody();
-        $aParams = $xRequest->getQueryParams();
-        $aData = is_array($aBody) ?
-            $this->readData($aBody['jxnbags'] ?? []) :
-            $this->readData($aParams['jxnbags'] ?? []);
-        $this->xDataBag = new DataBag($this, $aData);
-    }
+// Get the databag contents from the HTTP request parameters.
+$xRequest = $this->di->getRequest();
+$aBody = $xRequest->getParsedBody();
+$aParams = $xRequest->getQueryParams();
+$aData = is_array($aBody) ?
+$this->readData($aBody['jxnbags'] ?? []) :
+$this->readData($aParams['jxnbags'] ?? []);
+$this->xDataBag = new DataBag($this, $aData);
+}
 
-    /**
+/**
      * @inheritDoc
      */
-    public function getName(): string
-    {
-        return self::NAME;
-    }
+public function getName(): string
+{
+return self::NAME;
+}
 
-    /**
+/**
      * @param mixed $xData
      *
      * @return array
      */
-    private function readData($xData): array
-    {
-        // Todo: clean input data.
-        // Todo: verify the checksums.
-        return is_string($xData) ?
-            (json_decode($xData, true) ?: []) :
-            (is_array($xData) ? $xData : []);
-    }
+private function readData($xData): array
+{
+// Todo: clean input data.
+// Todo: verify the checksums.
+return is_string($xData) ?
+(json_decode($xData, true) ?: []) :
+(is_array($xData) ? $xData : []);
+}
 
-    /**
+/**
      * @inheritDoc
      */
-    public function getHash(): string
-    {
-        // Use the version number as hash
-        return '4.0.0';
-    }
+public function getHash(): string
+{
+// Use the version number as hash
+return '4.0.0';
+}
 
-    /**
+/**
      * @return void
      */
-    public function writeCommand(): void
-    {
-        $this->initDataBag();
-        if($this->xDataBag->touched())
-        {
-            // Todo: calculate the checksums.
-            $this->addCommand('databag.set', ['values' => $this->xDataBag]);
-        }
-    }
+public function writeCommand(): void
+{
+$this->initDataBag();
+if($this->xDataBag->touched())
+{
+// Todo: calculate the checksums.
+$this->addCommand('databag.set', ['values' => $this->xDataBag]);
+}
+}
 
-    /**
+/**
      * @param string $sName
      *
      * @return DataBagContext
      */
-    public function bag(string $sName): DataBagContext
-    {
-        $this->initDataBag();
-        return new DataBagContext($this->xDataBag, $sName);
-    }
+public function bag(string $sName): DataBagContext
+{
+$this->initDataBag();
+return new DataBagContext($this->xDataBag, $sName);
+}
 }

jaxon-core/src/Plugin/AbstractCodeGenerator.php

Switch Indentation +25 added lines, -25 removed lines

@@ -18,43 +18,43 @@
 
 abstract class AbstractCodeGenerator implements CodeGeneratorInterface
 {
-    /**
+/**
      * @inheritDoc
      */
-    public function getHash(): string
-    {
-        return '';
-    }
+public function getHash(): string
+{
+return '';
+}
 
-    /**
+/**
      * @inheritDoc
      */
-    public function getCss(): string
-    {
-        return '';
-    }
+public function getCss(): string
+{
+return '';
+}
 
-    /**
+/**
      * @inheritDoc
      */
-    public function getJs(): string
-    {
-        return '';
-    }
+public function getJs(): string
+{
+return '';
+}
 
-    /**
+/**
      * @inheritDoc
      */
-    public function getScript(): string
-    {
-        return '';
-    }
+public function getScript(): string
+{
+return '';
+}
 
-    /**
+/**
      * @inheritDoc
      */
-    public function getJsCode(): ?JsCode
-    {
-        return null;
-    }
+public function getJsCode(): ?JsCode
+{
+return null;
+}
 }

jaxon-core/src/Plugin/ResponsePluginTrait.php

Switch Indentation +25 added lines, -25 removed lines

@@ -31,48 +31,48 @@ 
 
 trait ResponsePluginTrait
 {
-    /**
+/**
      * The object used to build the response that will be sent to the client browser
      *
      * @var AbstractResponse
      */
-    private $xResponse = null;
+private $xResponse = null;
 
-    /**
+/**
      * Get a unique name to identify the plugin.
      *
      * @return string
      */
-    abstract public function getName(): string;
+abstract public function getName(): string;
 
-    /**
+/**
      * Initialize the plugin
      *
      * @return void
      */
-    abstract protected function init();
+abstract protected function init();
 
-    /**
+/**
      * @param AbstractResponse $xResponse   The response
      *
      * @return static
      */
-    public function initPlugin(AbstractResponse $xResponse): static
-    {
-        $this->xResponse = $xResponse;
-        $this->init();
-        return $this;
-    }
+public function initPlugin(AbstractResponse $xResponse): static
+{
+$this->xResponse = $xResponse;
+$this->init();
+return $this;
+}
 
-    /**
+/**
      * @inheritDoc
      */
-    public function response(): ?AbstractResponse
-    {
-        return $this->xResponse;
-    }
+public function response(): ?AbstractResponse
+{
+return $this->xResponse;
+}
 
-    /**
+/**
      * Add a plugin command to the response
      *
      * @param string $sName    The command name
@@ -80,10 +80,10 @@ 
      *
      * @return Command
      */
-    public function addCommand(string $sName, array|JsonSerializable $aOptions): Command
-    {
-        return $this->xResponse
-            ->addCommand($sName, $aOptions)
-            ->setOption('plugin', $this->getName());
-    }
+public function addCommand(string $sName, array|JsonSerializable $aOptions): Command
+{
+return $this->xResponse
+->addCommand($sName, $aOptions)
+->setOption('plugin', $this->getName());
+}
 }

jaxon-core/src/Plugin/CodeGeneratorInterface.php

Switch Indentation +10 added lines, -10 removed lines

@@ -17,46 +17,46 @@
 
 interface CodeGeneratorInterface
 {
-    /**
+/**
      * Get the value to be hashed
      *
      * @return string
      */
-    public function getHash(): string;
+public function getHash(): string;
 
-    /**
+/**
      * Get the HTML tags to include CSS code and files into the page
      *
      * The code must be enclosed in the appropriate HTML tags.
      *
      * @return string
      */
-    public function getCss(): string;
+public function getCss(): string;
 
-    /**
+/**
      * Get the HTML tags to include javascript code and files into the page
      *
      * The code must be enclosed in the appropriate HTML tags.
      *
      * @return string
      */
-    public function getJs(): string;
+public function getJs(): string;
 
-    /**
+/**
      * Get the javascript code to include into the page
      *
      * The code must NOT be enclosed in HTML tags.
      *
      * @return string
      */
-    public function getScript(): string;
+public function getScript(): string;
 
-    /**
+/**
      * Get the javascript codes to include into the page
      *
      * The code must NOT be enclosed in HTML tags.
      *
      * @return JsCode|null
      */
-    public function getJsCode(): ?JsCode;
+public function getJsCode(): ?JsCode;
 }

jaxon-core/src/Plugin/Request/CallableFunction/CallableFunctionPlugin.php

Switch Indentation +142 added lines, -142 removed lines

@@ -42,21 +42,21 @@ 
 
 class CallableFunctionPlugin extends AbstractRequestPlugin
 {
-    /**
+/**
      * The registered functions names
      *
      * @var array
      */
-    protected $aFunctions = [];
+protected $aFunctions = [];
 
-    /**
+/**
      * The registered functions options
      *
      * @var array
      */
-    protected $aOptions = [];
+protected $aOptions = [];
 
-    /**
+/**
      * The constructor
      *
      * @param string $sPrefix
@@ -66,41 +66,41 @@ 
      * @param Translator $xTranslator
      * @param Validator $xValidator
      */
-    public function __construct(private string $sPrefix, private bool $bDebug,
-        private Container $di, private TemplateEngine $xTemplateEngine,
-        private Translator $xTranslator, private Validator $xValidator)
-    {}
+public function __construct(private string $sPrefix, private bool $bDebug,
+private Container $di, private TemplateEngine $xTemplateEngine,
+private Translator $xTranslator, private Validator $xValidator)
+{}
 
-    /**
+/**
      * @inheritDoc
      */
-    public function getName(): string
-    {
-        return Jaxon::CALLABLE_FUNCTION;
-    }
+public function getName(): string
+{
+return Jaxon::CALLABLE_FUNCTION;
+}
 
-    /**
+/**
      * @inheritDoc
      * @throws SetupException
      */
-    public function checkOptions(string $sCallable, $xOptions): array
-    {
-        if(!$this->xValidator->validateFunction(trim($sCallable)))
-        {
-            throw new SetupException($this->xTranslator->trans('errors.objects.invalid-declaration'));
-        }
-        if(is_string($xOptions))
-        {
-            $xOptions = ['include' => $xOptions];
-        }
-        elseif(!is_array($xOptions))
-        {
-            throw new SetupException($this->xTranslator->trans('errors.objects.invalid-declaration'));
-        }
-        return $xOptions;
-    }
+public function checkOptions(string $sCallable, $xOptions): array
+{
+if(!$this->xValidator->validateFunction(trim($sCallable)))
+{
+throw new SetupException($this->xTranslator->trans('errors.objects.invalid-declaration'));
+}
+if(is_string($xOptions))
+{
+$xOptions = ['include' => $xOptions];
+}
+elseif(!is_array($xOptions))
+{
+throw new SetupException($this->xTranslator->trans('errors.objects.invalid-declaration'));
+}
+return $xOptions;
+}
 
-    /**
+/**
      * Register a user defined function
      *
      * @param string $sType    The type of request handler being registered
@@ -109,149 +109,149 @@ 
      *
      * @return bool
      */
-    public function register(string $sType, string $sCallable, array $aOptions): bool
-    {
-        $sPhpFunction = trim($sCallable);
-        $sFunction = $sPhpFunction;
-        // Check if an alias is defined
-        if(isset($aOptions['alias']))
-        {
-            $sFunction = (string)$aOptions['alias'];
-            unset($aOptions['alias']);
-        }
-        $this->aFunctions[$sFunction] = $sPhpFunction;
-        $this->aOptions[$sFunction] = $aOptions;
-        return true;
-    }
+public function register(string $sType, string $sCallable, array $aOptions): bool
+{
+$sPhpFunction = trim($sCallable);
+$sFunction = $sPhpFunction;
+// Check if an alias is defined
+if(isset($aOptions['alias']))
+{
+$sFunction = (string)$aOptions['alias'];
+unset($aOptions['alias']);
+}
+$this->aFunctions[$sFunction] = $sPhpFunction;
+$this->aOptions[$sFunction] = $aOptions;
+return true;
+}
 
-    /**
+/**
      * @inheritDoc
      */
-    public function getHash(): string
-    {
-        return md5(implode('', array_keys($this->aFunctions)));
-    }
+public function getHash(): string
+{
+return md5(implode('', array_keys($this->aFunctions)));
+}
 
-    /**
+/**
      * @inheritDoc
      */
-    public function getCallable(string $sCallable): CallableFunction|null
-    {
-        $sFunction = trim($sCallable);
-        if(!isset($this->aFunctions[$sFunction]))
-        {
-            return null;
-        }
-        $xCallable = new CallableFunction($this->di, $sFunction,
-            $this->sPrefix . $sFunction, $this->aFunctions[$sFunction]);
-        foreach($this->aOptions[$sFunction] as $sName => $sValue)
-        {
-            $xCallable->configure($sName, $sValue);
-        }
-        return $xCallable;
-    }
+public function getCallable(string $sCallable): CallableFunction|null
+{
+$sFunction = trim($sCallable);
+if(!isset($this->aFunctions[$sFunction]))
+{
+return null;
+}
+$xCallable = new CallableFunction($this->di, $sFunction,
+$this->sPrefix . $sFunction, $this->aFunctions[$sFunction]);
+foreach($this->aOptions[$sFunction] as $sName => $sValue)
+{
+$xCallable->configure($sName, $sValue);
+}
+return $xCallable;
+}
 
-    /**
+/**
      * Generate the javascript function stub that is sent to the browser on initial page load
      *
      * @param CallableFunction $xFunction
      *
      * @return string
      */
-    private function getCallableScript(CallableFunction $xFunction): string
-    {
-        return $this->xTemplateEngine->render('jaxon::callables/function.js', [
-            'sName' => $xFunction->getName(),
-            'sJsName' => $xFunction->getJsName(),
-            'aOptions' => $xFunction->getOptions(),
-        ]);
-    }
+private function getCallableScript(CallableFunction $xFunction): string
+{
+return $this->xTemplateEngine->render('jaxon::callables/function.js', [
+'sName' => $xFunction->getName(),
+'sJsName' => $xFunction->getJsName(),
+'aOptions' => $xFunction->getOptions(),
+]);
+}
 
-    /**
+/**
      * @inheritDoc
      */
-    public function getScript(): string
-    {
-        $code = '';
-        foreach(array_keys($this->aFunctions) as $sFunction)
-        {
-            $xFunction = $this->getCallable($sFunction);
-            $code .= $this->getCallableScript($xFunction);
-        }
-        return $code;
-    }
+public function getScript(): string
+{
+$code = '';
+foreach(array_keys($this->aFunctions) as $sFunction)
+{
+$xFunction = $this->getCallable($sFunction);
+$code .= $this->getCallableScript($xFunction);
+}
+return $code;
+}
 
-    /**
+/**
      * @inheritDoc
      */
-    public static function canProcessRequest(ServerRequestInterface $xRequest): bool
-    {
-        $aCall = $xRequest->getAttribute('jxncall');
-        // throw new \Exception(json_encode(['call' => $aCall]));
-        return $aCall !== null && ($aCall['type'] ?? '') === 'func' && isset($aCall['name']);
-    }
+public static function canProcessRequest(ServerRequestInterface $xRequest): bool
+{
+$aCall = $xRequest->getAttribute('jxncall');
+// throw new \Exception(json_encode(['call' => $aCall]));
+return $aCall !== null && ($aCall['type'] ?? '') === 'func' && isset($aCall['name']);
+}
 
-    /**
+/**
      * @inheritDoc
      */
-    public function setTarget(ServerRequestInterface $xRequest): Target
-    {
-        $aCall = $xRequest->getAttribute('jxncall');
-        $this->xTarget = Target::makeFunction(trim($aCall['name']));
-        return $this->xTarget;
-    }
+public function setTarget(ServerRequestInterface $xRequest): Target
+{
+$aCall = $xRequest->getAttribute('jxncall');
+$this->xTarget = Target::makeFunction(trim($aCall['name']));
+return $this->xTarget;
+}
 
-    /**
+/**
      * @param Exception $xException
      * @param string $sErrorMessage
      *
      * @throws RequestException
      * @return void
      */
-    private function throwException(Exception $xException, string $sErrorMessage): void
-    {
-        $this->di->getLogger()->error($xException->getMessage());
-        throw new RequestException($sErrorMessage . (!$this->bDebug ? '' :
-            "\n" . $xException->getMessage()));
-    }
+private function throwException(Exception $xException, string $sErrorMessage): void
+{
+$this->di->getLogger()->error($xException->getMessage());
+throw new RequestException($sErrorMessage . (!$this->bDebug ? '' :
+"\n" . $xException->getMessage()));
+}
 
-    /**
+/**
      * @inheritDoc
      * @throws RequestException
      */
-    public function processRequest(): void
-    {
-        $sRequestedFunction = $this->xTarget->getFunctionName();
+public function processRequest(): void
+{
+$sRequestedFunction = $this->xTarget->getFunctionName();
 
-        // Security check: make sure the requested function was registered.
-        if(!$this->xValidator->validateFunction($sRequestedFunction) ||
-            !isset($this->aFunctions[$sRequestedFunction]))
-        {
-            // Unable to find the requested function
-            throw new RequestException($this->xTranslator->trans('errors.functions.invalid',
-                ['name' => $sRequestedFunction]));
-        }
+// Security check: make sure the requested function was registered.
+if(!$this->xValidator->validateFunction($sRequestedFunction) ||
+!isset($this->aFunctions[$sRequestedFunction]))
+{
+// Unable to find the requested function
+throw new RequestException($this->xTranslator->trans('errors.functions.invalid',
+    ['name' => $sRequestedFunction]));
+}
 
-        try
-        {
-            /** @var CallableFunction */
-            $xFunction = $this->getCallable($sRequestedFunction);
-        }
-        catch(Exception $e)
-        {
-            // Unable to find the requested function
-            $this->throwException($e, $this->xTranslator->trans('errors.functions.invalid',
-                ['name' => $sRequestedFunction]));
-        }
-        try
-        {
-            $xFunction->call($this->xTarget->args());
-        }
-        catch(Exception $e)
-        {
-            // Unable to execute the requested function
-            $this->throwException($e, $this->xTranslator->trans('errors.functions.call',
-                ['name' => $sRequestedFunction]));
-        }
-    }
+try
+{
+/** @var CallableFunction */
+$xFunction = $this->getCallable($sRequestedFunction);
+}
+catch(Exception $e)
+{
+// Unable to find the requested function
+$this->throwException($e, $this->xTranslator->trans('errors.functions.invalid',
+    ['name' => $sRequestedFunction]));
+}
+try
+{
+$xFunction->call($this->xTarget->args());
+}
+catch(Exception $e)
+{
+// Unable to execute the requested function
+$this->throwException($e, $this->xTranslator->trans('errors.functions.call',
+    ['name' => $sRequestedFunction]));
+}
+}
 }

jaxon-core/src/Plugin/Request/CallableFunction/CallableFunction.php

Switch Indentation +42 added lines, -42 removed lines

@@ -28,29 +28,29 @@ 
 
 class CallableFunction
 {
-    /**
+/**
      * A string or an array which defines the registered PHP function
      *
      * @var string|array
      */
-    private $xPhpFunction;
+private $xPhpFunction;
 
-    /**
+/**
      * The path and file name of the include file where the function is defined
      *
      * @var string
      */
-    private $sInclude = '';
+private $sInclude = '';
 
-    /**
+/**
      * An associative array containing call options that will be sent
      * to the browser with the client script.
      *
      * @var array
      */
-    private $aOptions = [];
+private $aOptions = [];
 
-    /**
+/**
      * The constructor
      *
      * @param Container $di
@@ -58,43 +58,43 @@ 
      * @param string $sJsFunction
      * @param string $sPhpFunction
      */
-    public function __construct(private Container $di, private string $sFunction,
-        private string $sJsFunction, string $sPhpFunction)
-    {
-        $this->xPhpFunction = $sPhpFunction;
-    }
+public function __construct(private Container $di, private string $sFunction,
+private string $sJsFunction, string $sPhpFunction)
+{
+$this->xPhpFunction = $sPhpFunction;
+}
 
-    /**
+/**
      * Get the name of the function being referenced
      *
      * @return string
      */
-    public function getName(): string
-    {
-        return $this->sFunction;
-    }
+public function getName(): string
+{
+return $this->sFunction;
+}
 
-    /**
+/**
      * Get name of the corresponding javascript function
      *
      * @return string
      */
-    public function getJsName(): string
-    {
-        return $this->sJsFunction;
-    }
+public function getJsName(): string
+{
+return $this->sJsFunction;
+}
 
-    /**
+/**
      * Get the config options of the function being referenced
      *
      * @return array
      */
-    public function getOptions(): array
-    {
-        return $this->aOptions;
-    }
+public function getOptions(): array
+{
+return $this->aOptions;
+}
 
-    /**
+/**
      * Set call options for this instance
      *
      * @param string $sName    The name of the configuration option
@@ -102,20 +102,20 @@ 
      *
      * @return void
      */
-    public function configure(string $sName, string $sValue): void
-    {
-        switch($sName)
-        {
-        case 'class': // The user function is a method in the given class
-            $this->xPhpFunction = [$sValue, $this->xPhpFunction];
-            break;
-        case 'include':
-            $this->sInclude = $sValue;
-            break;
-        default:
-            $this->aOptions[$sName] = $sValue;
-            break;
-        }
+public function configure(string $sName, string $sValue): void
+{
+switch($sName)
+{
+case 'class': // The user function is a method in the given class
+$this->xPhpFunction = [$sValue, $this->xPhpFunction];
+break;
+case 'include':
+$this->sInclude = $sValue;
+break;
+default:
+$this->aOptions[$sName] = $sValue;
+break;
+}
     }
 
     /**

jaxon-annotations/tests/TestAnnotation/TraitAnnotationTest.php

Switch Indentation +72 added lines, -72 removed lines

@@ -12,89 +12,89 @@
 
 class TraitAnnotationTest 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 testTraitAnnotation()
-    {
-        $xMetadata = $this->getAttributes(TraitAnnotated::class, []);
-        $bExcluded = $xMetadata->isExcluded();
-        $aProperties = $xMetadata->getProperties();
-
-        $this->assertFalse($bExcluded);
-
-        $this->assertCount(1, $aProperties);
-        $this->assertArrayHasKey('*', $aProperties);
-        $this->assertCount(4, $aProperties['*']);
-        $this->assertArrayHasKey('bags', $aProperties['*']);
-        $this->assertArrayHasKey('__before', $aProperties['*']);
-        $this->assertArrayHasKey('__after', $aProperties['*']);
-
-        $this->assertCount(2, $aProperties['*']['bags']);
-        $this->assertEquals('user.name', $aProperties['*']['bags'][0]);
-        $this->assertEquals('page.number', $aProperties['*']['bags'][1]);
-
-        $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']);
-
-        $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']);
-
-        $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 testTraitAnnotation()
+{
+$xMetadata = $this->getAttributes(TraitAnnotated::class, []);
+$bExcluded = $xMetadata->isExcluded();
+$aProperties = $xMetadata->getProperties();
+
+$this->assertFalse($bExcluded);
+
+$this->assertCount(1, $aProperties);
+$this->assertArrayHasKey('*', $aProperties);
+$this->assertCount(4, $aProperties['*']);
+$this->assertArrayHasKey('bags', $aProperties['*']);
+$this->assertArrayHasKey('__before', $aProperties['*']);
+$this->assertArrayHasKey('__after', $aProperties['*']);
+
+$this->assertCount(2, $aProperties['*']['bags']);
+$this->assertEquals('user.name', $aProperties['*']['bags'][0]);
+$this->assertEquals('page.number', $aProperties['*']['bags'][1]);
+
+$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']);
+
+$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']);
+
+$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']);
+}
 }

jaxon-annotations/tests/TestAnnotation/AnnotationTest.php

Switch Indentation +337 added lines, -337 removed lines

@@ -16,382 +16,382 @@
 
 class AnnotationTest 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(Annotated::class, ['saveFiles', 'doNot']);
-        $bExcluded = $xMetadata->isExcluded();
-        $aProperties = $xMetadata->getProperties();
-        $aProtected = $xMetadata->getProtectedMethods();
+public function testUploadAndExcludeAnnotation()
+{
+$xMetadata = $this->getAttributes(Annotated::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(Annotated::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(Annotated::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(Annotated::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(Annotated::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(Annotated::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(Annotated::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(ClassAnnotated::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(ClassAnnotated::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(ClassAnnotated::class, []);
-        $aProperties = $xMetadata->getProperties();
+public function testClassBagsAnnotation()
+{
+$xMetadata = $this->getAttributes(ClassAnnotated::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(ClassAnnotated::class, []);
-        $aProperties = $xMetadata->getProperties();
+public function testClassCallbackAnnotation()
+{
+$xMetadata = $this->getAttributes(ClassAnnotated::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(ClassAnnotated::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(ClassAnnotated::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(ClassAnnotated::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(ClassAnnotated::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(ClassAnnotated::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(ClassAnnotated::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(Annotated::class, ['doNotError']);
-    }
-
-    public function testDataBagAnnotationError()
-    {
-        $this->expectException(SetupException::class);
-        $this->getAttributes(Annotated::class, ['withBagsError']);
-    }
-
-    public function testUploadAnnotationWrongName()
-    {
-        $this->expectException(SetupException::class);
-        $this->getAttributes(Annotated::class, ['saveFilesWrongName']);
-    }
-
-    public function testUploadAnnotationMultiple()
-    {
-        $this->expectException(SetupException::class);
-        $this->getAttributes(Annotated::class, ['saveFilesMultiple']);
-    }
-
-    public function testCallbacksBeforeAnnotationNoCall()
-    {
-        $this->expectException(SetupException::class);
-        $this->getAttributes(Annotated::class, ['cbBeforeNoCall']);
-    }
-
-    public function testCallbacksBeforeAnnotationUnknownAttr()
-    {
-        $this->expectException(SetupException::class);
-        $this->getAttributes(Annotated::class, ['cbBeforeUnknownAttr']);
-    }
-
-    public function testCallbacksBeforeAnnotationWrongAttrType()
-    {
-        $this->expectException(SetupException::class);
-        $this->getAttributes(Annotated::class, ['cbBeforeWrongAttrType']);
-    }
-
-    public function testCallbacksAfterAnnotationNoCall()
-    {
-        $this->expectException(SetupException::class);
-        $this->getAttributes(Annotated::class, ['cbAfterNoCall']);
-    }
-
-    public function testCallbacksAfterAnnotationUnknownAttr()
-    {
-        $this->expectException(SetupException::class);
-        $this->getAttributes(Annotated::class, ['cbAfterUnknownAttr']);
-    }
-
-    public function testCallbacksAfterAnnotationWrongAttrType()
-    {
-        $this->expectException(SetupException::class);
-        $this->getAttributes(Annotated::class, ['cbAfterWrongAttrType']);
-    }
-
-    public function testContainerAnnotationUnknownAttr()
-    {
-        $this->expectException(SetupException::class);
-        $this->getAttributes(Annotated::class, ['diUnknownAttr']);
-    }
-
-    public function testContainerAnnotationWrongAttrType()
-    {
-        $this->expectException(SetupException::class);
-        $this->getAttributes(Annotated::class, ['diWrongAttrType']);
-    }
-
-    public function testContainerAnnotationWrongClassType()
-    {
-        $this->expectException(SetupException::class);
-        $this->getAttributes(Annotated::class, ['diWrongClassType']);
-    }
-
-    public function testContainerAnnotationWrongVarCount()
-    {
-        $this->expectException(SetupException::class);
-        $this->getAttributes(Annotated::class, ['diWrongVarCount']);
-    }
-
-    public function testContainerErrorTwiceOnProp()
-    {
-        $this->expectException(SetupException::class);
-        $this->getAttributes(ContainerError::class, [], ['prop']);
-    }
-
-    public function testCallbackErrorNoName()
-    {
-        $this->expectException(SetupException::class);
-        $this->getAttributes(CallbackError::class, ['noName']);
-    }
-
-    public function testCallbackErrorWrongNameType()
-    {
-        $this->expectException(SetupException::class);
-        $this->getAttributes(CallbackError::class, ['wrongNameType']);
-    }
-
-    public function testCallbackErrorWrongNameAttr()
-    {
-        $this->expectException(SetupException::class);
-        $this->getAttributes(CallbackError::class, ['wrongNameAttr']);
-    }
-
-    public function testCallbackErrorNameWithSpace()
-    {
-        $this->expectException(SetupException::class);
-        $this->getAttributes(CallbackError::class, ['nameWithSpace']);
-    }
-
-    public function testCallbackErrorStartWithInt()
-    {
-        $this->expectException(SetupException::class);
-        $this->getAttributes(CallbackError::class, ['startWithInt']);
-    }
+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(Annotated::class, ['doNotError']);
+}
+
+public function testDataBagAnnotationError()
+{
+$this->expectException(SetupException::class);
+$this->getAttributes(Annotated::class, ['withBagsError']);
+}
+
+public function testUploadAnnotationWrongName()
+{
+$this->expectException(SetupException::class);
+$this->getAttributes(Annotated::class, ['saveFilesWrongName']);
+}
+
+public function testUploadAnnotationMultiple()
+{
+$this->expectException(SetupException::class);
+$this->getAttributes(Annotated::class, ['saveFilesMultiple']);
+}
+
+public function testCallbacksBeforeAnnotationNoCall()
+{
+$this->expectException(SetupException::class);
+$this->getAttributes(Annotated::class, ['cbBeforeNoCall']);
+}
+
+public function testCallbacksBeforeAnnotationUnknownAttr()
+{
+$this->expectException(SetupException::class);
+$this->getAttributes(Annotated::class, ['cbBeforeUnknownAttr']);
+}
+
+public function testCallbacksBeforeAnnotationWrongAttrType()
+{
+$this->expectException(SetupException::class);
+$this->getAttributes(Annotated::class, ['cbBeforeWrongAttrType']);
+}
+
+public function testCallbacksAfterAnnotationNoCall()
+{
+$this->expectException(SetupException::class);
+$this->getAttributes(Annotated::class, ['cbAfterNoCall']);
+}
+
+public function testCallbacksAfterAnnotationUnknownAttr()
+{
+$this->expectException(SetupException::class);
+$this->getAttributes(Annotated::class, ['cbAfterUnknownAttr']);
+}
+
+public function testCallbacksAfterAnnotationWrongAttrType()
+{
+$this->expectException(SetupException::class);
+$this->getAttributes(Annotated::class, ['cbAfterWrongAttrType']);
+}
+
+public function testContainerAnnotationUnknownAttr()
+{
+$this->expectException(SetupException::class);
+$this->getAttributes(Annotated::class, ['diUnknownAttr']);
+}
+
+public function testContainerAnnotationWrongAttrType()
+{
+$this->expectException(SetupException::class);
+$this->getAttributes(Annotated::class, ['diWrongAttrType']);
+}
+
+public function testContainerAnnotationWrongClassType()
+{
+$this->expectException(SetupException::class);
+$this->getAttributes(Annotated::class, ['diWrongClassType']);
+}
+
+public function testContainerAnnotationWrongVarCount()
+{
+$this->expectException(SetupException::class);
+$this->getAttributes(Annotated::class, ['diWrongVarCount']);
+}
+
+public function testContainerErrorTwiceOnProp()
+{
+$this->expectException(SetupException::class);
+$this->getAttributes(ContainerError::class, [], ['prop']);
+}
+
+public function testCallbackErrorNoName()
+{
+$this->expectException(SetupException::class);
+$this->getAttributes(CallbackError::class, ['noName']);
+}
+
+public function testCallbackErrorWrongNameType()
+{
+$this->expectException(SetupException::class);
+$this->getAttributes(CallbackError::class, ['wrongNameType']);
+}
+
+public function testCallbackErrorWrongNameAttr()
+{
+$this->expectException(SetupException::class);
+$this->getAttributes(CallbackError::class, ['wrongNameAttr']);
+}
+
+public function testCallbackErrorNameWithSpace()
+{
+$this->expectException(SetupException::class);
+$this->getAttributes(CallbackError::class, ['nameWithSpace']);
+}
+
+public function testCallbackErrorStartWithInt()
+{
+$this->expectException(SetupException::class);
+$this->getAttributes(CallbackError::class, ['startWithInt']);
+}
 }

jaxon-annotations/tests/TestAnnotation/AttrAnnotationTest.php

Switch Indentation +161 added lines, -161 removed lines

@@ -12,186 +12,186 @@
 
 class AttrAnnotationTest 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 testContainerAnnotation()
-    {
-        $xMetadata = $this->getAttributes(AttrAnnotated::class,
-            ['attrVar'], ['colorService', 'fontService', 'textService']);
-        $bExcluded = $xMetadata->isExcluded();
-        $aProperties = $xMetadata->getProperties();
-
-        $this->assertFalse($bExcluded);
-
-        $this->assertCount(1, $aProperties);
-        $this->assertArrayHasKey('attrVar', $aProperties);
-        $this->assertCount(3, $aProperties['attrVar']['__di']);
-        $this->assertEquals('Jaxon\Annotations\Tests\Service\ColorService', $aProperties['attrVar']['__di']['colorService']);
-        $this->assertEquals('Jaxon\Annotations\Tests\App\Ajax\FontService', $aProperties['attrVar']['__di']['fontService']);
-        $this->assertEquals('Jaxon\Annotations\Tests\Service\TextService', $aProperties['attrVar']['__di']['textService']);
-    }
-
-    /**
+public function testContainerAnnotation()
+{
+$xMetadata = $this->getAttributes(AttrAnnotated::class,
+['attrVar'], ['colorService', 'fontService', 'textService']);
+$bExcluded = $xMetadata->isExcluded();
+$aProperties = $xMetadata->getProperties();
+
+$this->assertFalse($bExcluded);
+
+$this->assertCount(1, $aProperties);
+$this->assertArrayHasKey('attrVar', $aProperties);
+$this->assertCount(3, $aProperties['attrVar']['__di']);
+$this->assertEquals('Jaxon\Annotations\Tests\Service\ColorService', $aProperties['attrVar']['__di']['colorService']);
+$this->assertEquals('Jaxon\Annotations\Tests\App\Ajax\FontService', $aProperties['attrVar']['__di']['fontService']);
+$this->assertEquals('Jaxon\Annotations\Tests\Service\TextService', $aProperties['attrVar']['__di']['textService']);
+}
+
+/**
      * @throws SetupException
      */
-    public function testContainerDocBlockAnnotation()
-    {
-        $xMetadata = $this->getAttributes(AttrAnnotated::class,
-            ['attrDbVar'], ['colorService', 'fontService', 'textService']);
-        $bExcluded = $xMetadata->isExcluded();
-        $aProperties = $xMetadata->getProperties();
-
-        $this->assertFalse($bExcluded);
-
-        $this->assertCount(1, $aProperties);
-        $this->assertArrayHasKey('attrDbVar', $aProperties);
-        $this->assertCount(3, $aProperties['attrDbVar']['__di']);
-        $this->assertEquals('Jaxon\Annotations\Tests\Service\ColorService', $aProperties['attrDbVar']['__di']['colorService']);
-        $this->assertEquals('Jaxon\Annotations\Tests\App\Ajax\FontService', $aProperties['attrDbVar']['__di']['fontService']);
-        $this->assertEquals('Jaxon\Annotations\Tests\Service\TextService', $aProperties['attrDbVar']['__di']['textService']);
-    }
-
-    /**
+public function testContainerDocBlockAnnotation()
+{
+$xMetadata = $this->getAttributes(AttrAnnotated::class,
+['attrDbVar'], ['colorService', 'fontService', 'textService']);
+$bExcluded = $xMetadata->isExcluded();
+$aProperties = $xMetadata->getProperties();
+
+$this->assertFalse($bExcluded);
+
+$this->assertCount(1, $aProperties);
+$this->assertArrayHasKey('attrDbVar', $aProperties);
+$this->assertCount(3, $aProperties['attrDbVar']['__di']);
+$this->assertEquals('Jaxon\Annotations\Tests\Service\ColorService', $aProperties['attrDbVar']['__di']['colorService']);
+$this->assertEquals('Jaxon\Annotations\Tests\App\Ajax\FontService', $aProperties['attrDbVar']['__di']['fontService']);
+$this->assertEquals('Jaxon\Annotations\Tests\Service\TextService', $aProperties['attrDbVar']['__di']['textService']);
+}
+
+/**
      * @throws SetupException
      */
-    public function testContainerDiAnnotation()
-    {
-        $xMetadata = $this->getAttributes(AttrAnnotated::class,
-            ['attrDi'], ['colorService1', 'fontService1', 'textService1']);
-        $bExcluded = $xMetadata->isExcluded();
-        $aProperties = $xMetadata->getProperties();
-
-        $this->assertFalse($bExcluded);
-
-        $this->assertCount(1, $aProperties);
-        $this->assertArrayHasKey('*', $aProperties);
-        $this->assertCount(3, $aProperties['*']['__di']);
-        $this->assertEquals('Jaxon\Annotations\Tests\Service\ColorService', $aProperties['*']['__di']['colorService1']);
-        $this->assertEquals('Jaxon\Annotations\Tests\App\Ajax\FontService', $aProperties['*']['__di']['fontService1']);
-        $this->assertEquals('Jaxon\Annotations\Tests\Service\TextService', $aProperties['*']['__di']['textService1']);
-    }
-
-    /**
+public function testContainerDiAnnotation()
+{
+$xMetadata = $this->getAttributes(AttrAnnotated::class,
+['attrDi'], ['colorService1', 'fontService1', 'textService1']);
+$bExcluded = $xMetadata->isExcluded();
+$aProperties = $xMetadata->getProperties();
+
+$this->assertFalse($bExcluded);
+
+$this->assertCount(1, $aProperties);
+$this->assertArrayHasKey('*', $aProperties);
+$this->assertCount(3, $aProperties['*']['__di']);
+$this->assertEquals('Jaxon\Annotations\Tests\Service\ColorService', $aProperties['*']['__di']['colorService1']);
+$this->assertEquals('Jaxon\Annotations\Tests\App\Ajax\FontService', $aProperties['*']['__di']['fontService1']);
+$this->assertEquals('Jaxon\Annotations\Tests\Service\TextService', $aProperties['*']['__di']['textService1']);
+}
+
+/**
      * @throws SetupException
      */
-    public function testContainerDiAndVarAnnotation()
-    {
-        $xMetadata = $this->getAttributes(AttrAnnotated::class,
-            ['attrDi'], ['colorService2', 'fontService2', 'textService2']);
-        $bExcluded = $xMetadata->isExcluded();
-        $aProperties = $xMetadata->getProperties();
-
-        $this->assertFalse($bExcluded);
-
-        $this->assertCount(1, $aProperties);
-        $this->assertArrayHasKey('*', $aProperties);
-        $this->assertCount(3, $aProperties['*']['__di']);
-        $this->assertEquals('Jaxon\Annotations\Tests\Service\ColorService', $aProperties['*']['__di']['colorService2']);
-        $this->assertEquals('Jaxon\Annotations\Tests\App\Ajax\FontService', $aProperties['*']['__di']['fontService2']);
-        $this->assertEquals('Jaxon\Annotations\Tests\Service\TextService', $aProperties['*']['__di']['textService2']);
-    }
-
-    /**
+public function testContainerDiAndVarAnnotation()
+{
+$xMetadata = $this->getAttributes(AttrAnnotated::class,
+['attrDi'], ['colorService2', 'fontService2', 'textService2']);
+$bExcluded = $xMetadata->isExcluded();
+$aProperties = $xMetadata->getProperties();
+
+$this->assertFalse($bExcluded);
+
+$this->assertCount(1, $aProperties);
+$this->assertArrayHasKey('*', $aProperties);
+$this->assertCount(3, $aProperties['*']['__di']);
+$this->assertEquals('Jaxon\Annotations\Tests\Service\ColorService', $aProperties['*']['__di']['colorService2']);
+$this->assertEquals('Jaxon\Annotations\Tests\App\Ajax\FontService', $aProperties['*']['__di']['fontService2']);
+$this->assertEquals('Jaxon\Annotations\Tests\Service\TextService', $aProperties['*']['__di']['textService2']);
+}
+
+/**
      * @throws SetupException
      */
-    public function testContainerPropAnnotation()
-    {
-        $xMetadata = $this->getAttributes(AttrAnnotated::class,
-            ['attrDi'], ['colorService3', 'fontService3', 'textService3']);
-        $bExcluded = $xMetadata->isExcluded();
-        $aProperties = $xMetadata->getProperties();
-
-        $this->assertFalse($bExcluded);
-
-        $this->assertCount(1, $aProperties);
-        $this->assertArrayHasKey('*', $aProperties);
-        $this->assertCount(3, $aProperties['*']['__di']);
-        $this->assertEquals('Jaxon\Annotations\Tests\Service\ColorService', $aProperties['*']['__di']['colorService3']);
-        $this->assertEquals('Jaxon\Annotations\Tests\App\Ajax\FontService', $aProperties['*']['__di']['fontService3']);
-        $this->assertEquals('Jaxon\Annotations\Tests\Service\TextService', $aProperties['*']['__di']['textService3']);
-    }
-
-    public function testContainerAnnotationErrorTwoParams()
-    {
-        $this->expectException(SetupException::class);
-        $this->getAttributes(AttrAnnotated::class, [], ['errorTwoParams']);
-    }
-
-    public function testContainerAnnotationErrorDiAttr()
-    {
-        $this->expectException(SetupException::class);
-        $this->getAttributes(AttrAnnotated::class, [], ['errorDiAttr']);
-    }
-
-    public function testContainerAnnotationErrorDiDbAttr()
-    {
-        $this->expectException(SetupException::class);
-        $this->getAttributes(AttrAnnotated::class, [], ['errorDiDbAttr']);
-    }
-
-    public function testContainerAnnotationErrorTwoDi()
-    {
-        $this->expectException(SetupException::class);
-        $this->getAttributes(AttrAnnotated::class, [], ['errorTwoDi']);
-    }
-
-    public function testContainerAnnotationErrorDiClass()
-    {
-        $this->expectException(SetupException::class);
-        $this->getAttributes(AttrAnnotated::class, ['errorDiClass']);
-    }
-
-    public function testContainerAnnotationErrorNoVar()
-    {
-        $this->expectException(SetupException::class);
-        $this->getAttributes(AttrAnnotated::class, ['errorDiNoVar']);
-    }
-
-    public function testContainerAnnotationErrorTwoVars()
-    {
-        $this->expectException(SetupException::class);
-        $this->getAttributes(AttrAnnotated::class, ['errorDiTwoVars']);
-    }
+public function testContainerPropAnnotation()
+{
+$xMetadata = $this->getAttributes(AttrAnnotated::class,
+['attrDi'], ['colorService3', 'fontService3', 'textService3']);
+$bExcluded = $xMetadata->isExcluded();
+$aProperties = $xMetadata->getProperties();
+
+$this->assertFalse($bExcluded);
+
+$this->assertCount(1, $aProperties);
+$this->assertArrayHasKey('*', $aProperties);
+$this->assertCount(3, $aProperties['*']['__di']);
+$this->assertEquals('Jaxon\Annotations\Tests\Service\ColorService', $aProperties['*']['__di']['colorService3']);
+$this->assertEquals('Jaxon\Annotations\Tests\App\Ajax\FontService', $aProperties['*']['__di']['fontService3']);
+$this->assertEquals('Jaxon\Annotations\Tests\Service\TextService', $aProperties['*']['__di']['textService3']);
+}
+
+public function testContainerAnnotationErrorTwoParams()
+{
+$this->expectException(SetupException::class);
+$this->getAttributes(AttrAnnotated::class, [], ['errorTwoParams']);
+}
+
+public function testContainerAnnotationErrorDiAttr()
+{
+$this->expectException(SetupException::class);
+$this->getAttributes(AttrAnnotated::class, [], ['errorDiAttr']);
+}
+
+public function testContainerAnnotationErrorDiDbAttr()
+{
+$this->expectException(SetupException::class);
+$this->getAttributes(AttrAnnotated::class, [], ['errorDiDbAttr']);
+}
+
+public function testContainerAnnotationErrorTwoDi()
+{
+$this->expectException(SetupException::class);
+$this->getAttributes(AttrAnnotated::class, [], ['errorTwoDi']);
+}
+
+public function testContainerAnnotationErrorDiClass()
+{
+$this->expectException(SetupException::class);
+$this->getAttributes(AttrAnnotated::class, ['errorDiClass']);
+}
+
+public function testContainerAnnotationErrorNoVar()
+{
+$this->expectException(SetupException::class);
+$this->getAttributes(AttrAnnotated::class, ['errorDiNoVar']);
+}
+
+public function testContainerAnnotationErrorTwoVars()
+{
+$this->expectException(SetupException::class);
+$this->getAttributes(AttrAnnotated::class, ['errorDiTwoVars']);
+}
 }