jaxon-php / jaxon-mono

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

Switch Indentation +4 added lines, -4 removed lines

@@ -4,7 +4,7 @@ 
 
 interface ViewInterface
 {
-    /**
+/**
      * Add a namespace to the view renderer
      *
      * @param string $sNamespace    The namespace name
@@ -13,14 +13,14 @@ 
      *
      * @return void
      */
-    public function addNamespace(string $sNamespace, string $sDirectory, string $sExtension = ''): void;
+public function addNamespace(string $sNamespace, string $sDirectory, string $sExtension = ''): void;
 
-    /**
+/**
      * Render a view
      *
      * @param Store $store    A store populated with the view data
      *
      * @return string
      */
-    public function render(Store $store): string;
+public function render(Store $store): string;
 }

jaxon-core/src/App/View/Helper/EventAttr.php

Switch Indentation +38 added lines, -38 removed lines

@@ -23,33 +23,33 @@ 
 
 class EventAttr
 {
-    /**
+/**
      * @var array
      */
-    private array $aHandlers = [];
+private array $aHandlers = [];
 
-    /**
+/**
      * The constructor
      *
      * @param string $sSelector
      */
-    public function __construct(private string $sSelector)
-    {}
+public function __construct(private string $sSelector)
+{}
 
-    /**
+/**
      * Set a selector for the next event handler
      *
      * @param string $sSelector
      *
      * @return self
      */
-    public function select(string $sSelector): self
-    {
-        $this->sSelector = trim($sSelector);
-        return $this;
-    }
+public function select(string $sSelector): self
+{
+$this->sSelector = trim($sSelector);
+return $this;
+}
 
-    /**
+/**
      * Set an event handler with the "on" keyword
      *
      * @param string $event
@@ -57,43 +57,43 @@ 
      *
      * @return self
      */
-    public function on(string $event, JsExpr $xJsExpr): self
-    {
-        if($this->sSelector === '')
-        {
-            return $this;
-        }
+public function on(string $event, JsExpr $xJsExpr): self
+{
+if($this->sSelector === '')
+{
+return $this;
+}
 
-        $this->aHandlers[] = [
-            'select' => $this->sSelector,
-            'event' => trim($event),
-            'handler' => $xJsExpr,
-        ];
-        $this->sSelector = '';
-        return $this;
-    }
+$this->aHandlers[] = [
+'select' => $this->sSelector,
+'event' => trim($event),
+'handler' => $xJsExpr,
+];
+$this->sSelector = '';
+return $this;
+}
 
-    /**
+/**
      * Shortcut to set a click event handler
      *
      * @param JsExpr $xJsExpr
      *
      * @return self
      */
-    public function click(JsExpr $xJsExpr): self
-    {
-        return $this->on('click', $xJsExpr);
-    }
+public function click(JsExpr $xJsExpr): self
+{
+return $this->on('click', $xJsExpr);
+}
 
-    /**
+/**
      * Convert to string.
      *
      * @return string
      */
-    public function __toString(): string
-    {
-        // No output if no handler is defined.
-        return count($this->aHandlers) === 0 ? '' : 'jxn-event="' .
-            htmlentities(json_encode($this->aHandlers)) . '"';
-    }
+public function __toString(): string
+{
+// No output if no handler is defined.
+return count($this->aHandlers) === 0 ? '' : 'jxn-event="' .
+htmlentities(json_encode($this->aHandlers)) . '"';
+}
 }

jaxon-core/src/App/View/Helper/HtmlAttrHelper.php

Switch Indentation +101 added lines, -101 removed lines

@@ -31,40 +31,40 @@ 
 
 class HtmlAttrHelper
 {
-    /**
+/**
      * @var string|null
      */
-    private string|null $sPaginationComponent = null;
+private string|null $sPaginationComponent = null;
 
-    /**
+/**
      * The constructor
      *
      * @param ComponentContainer $cdi
      */
-    public function __construct(protected ComponentContainer $cdi)
-    {}
+public function __construct(protected ComponentContainer $cdi)
+{}
 
-    /**
+/**
      * Get the component HTML code
      *
      * @param JxnCall $xJsCall
      *
      * @return string
      */
-    public function html(JxnCall $xJsCall): string
-    {
-        $sClassName = $xJsCall->_class();
-        if(!$sClassName)
-        {
-            return '';
-        }
-
-        $xComponent = $this->cdi->makeComponent($sClassName);
-        return is_a($xComponent, NodeComponent::class) ?
-            (string)$xComponent->html() : '';
-    }
-
-    /**
+public function html(JxnCall $xJsCall): string
+{
+$sClassName = $xJsCall->_class();
+if(!$sClassName)
+{
+return '';
+}
+
+$xComponent = $this->cdi->makeComponent($sClassName);
+return is_a($xComponent, NodeComponent::class) ?
+(string)$xComponent->html() : '';
+}
+
+/**
      * Attach a component to a DOM node
      *
      * @param JxnCall $xJsCall
@@ -72,41 +72,41 @@ 
      *
      * @return string
      */
-    public function bind(JxnCall $xJsCall, string $item = ''): string
-    {
-        $item = trim($item);
-        return 'jxn-bind="' . $xJsCall->_class() . (!$item ? '"' : '" jxn-item="' . $item . '"');
-    }
+public function bind(JxnCall $xJsCall, string $item = ''): string
+{
+$item = trim($item);
+return 'jxn-bind="' . $xJsCall->_class() . (!$item ? '"' : '" jxn-item="' . $item . '"');
+}
 
-    /**
+/**
      * Attach the pagination component to a DOM node
      *
      * @param JxnCall $xJsCall
      *
      * @return string
      */
-    public function pagination(JxnCall $xJsCall): string
-    {
-        // The pagination is always rendered with the same Pagination component.
-        $sComponent = $this->sPaginationComponent ?:
-            ($this->sPaginationComponent = rq(Pagination::class)->_class());
-        $sItem = $xJsCall->_class();
-        return "jxn-bind=\"$sComponent\" jxn-item=\"$sItem\"";
-    }
-
-    /**
+public function pagination(JxnCall $xJsCall): string
+{
+// The pagination is always rendered with the same Pagination component.
+$sComponent = $this->sPaginationComponent ?:
+($this->sPaginationComponent = rq(Pagination::class)->_class());
+$sItem = $xJsCall->_class();
+return "jxn-bind=\"$sComponent\" jxn-item=\"$sItem\"";
+}
+
+/**
      * Set a selector for the next event handler
      *
      * @param string $sSelector
      *
      * @return EventAttr
      */
-    public function select(string $sSelector): EventAttr
-    {
-        return new EventAttr($sSelector);
-    }
+public function select(string $sSelector): EventAttr
+{
+return new EventAttr($sSelector);
+}
 
-    /**
+/**
      * Set an event handler
      *
      * @param string $event
@@ -114,83 +114,83 @@ 
      *
      * @return string
      */
-    public function on(string $event, JsExpr $xJsExpr): string
-    {
-        $event = trim($event);
-        $sCall = htmlentities(json_encode($xJsExpr->jsonSerialize()));
-        return "jxn-on=\"$event\" jxn-call=\"$sCall\"";
-    }
-
-    /**
+public function on(string $event, JsExpr $xJsExpr): string
+{
+$event = trim($event);
+$sCall = htmlentities(json_encode($xJsExpr->jsonSerialize()));
+return "jxn-on=\"$event\" jxn-call=\"$sCall\"";
+}
+
+/**
      * Shortcut to set a click event handler
      *
      * @param JsExpr $xJsExpr
      *
      * @return string
      */
-    public function click(JsExpr $xJsExpr): string
-    {
-        return $this->on('click', $xJsExpr);
-    }
+public function click(JsExpr $xJsExpr): string
+{
+return $this->on('click', $xJsExpr);
+}
 
-    /**
+/**
      * @param array $aHandler
      *
      * @return bool
      */
-    private function eventIsValid(array $aHandler): bool
-    {
-        return count($aHandler) === 3 &&
-            isset($aHandler[0]) && isset($aHandler[1]) && isset($aHandler[2]) &&
-            is_string($aHandler[0]) && is_string($aHandler[1]) &&
-            is_a($aHandler[2], JsExpr::class);
-    }
-
-    /**
+private function eventIsValid(array $aHandler): bool
+{
+return count($aHandler) === 3 &&
+isset($aHandler[0]) && isset($aHandler[1]) && isset($aHandler[2]) &&
+is_string($aHandler[0]) && is_string($aHandler[1]) &&
+is_a($aHandler[2], JsExpr::class);
+}
+
+/**
      * @param array $aHandler
      * @param EventAttr|null $xAttr
      *
      * @return EventAttr|null
      */
-    private function setEventHandler(array $aHandler, ?EventAttr $xAttr = null): EventAttr|null
-    {
-        if(!$this->eventIsValid($aHandler))
-        {
-            return $xAttr;
-        }
-        // The array content is valid.
-        [$sSelector, $sEvent, $xJsExpr] = $aHandler;
-        return !$xAttr ?
-            $this->select($sSelector)->on($sEvent, $xJsExpr) :
-            $xAttr->select($sSelector)->on($sEvent, $xJsExpr);
-    }
-
-    /**
+private function setEventHandler(array $aHandler, ?EventAttr $xAttr = null): EventAttr|null
+{
+if(!$this->eventIsValid($aHandler))
+{
+return $xAttr;
+}
+// The array content is valid.
+[$sSelector, $sEvent, $xJsExpr] = $aHandler;
+return !$xAttr ?
+$this->select($sSelector)->on($sEvent, $xJsExpr) :
+$xAttr->select($sSelector)->on($sEvent, $xJsExpr);
+}
+
+/**
      * Set an event handler
      *
      * @param array $aHandler
      *
      * @return string
      */
-    public function event(array $aHandler): string
-    {
-        return $this->setEventHandler($aHandler)?->__toString() ?? '';
-    }
+public function event(array $aHandler): string
+{
+return $this->setEventHandler($aHandler)?->__toString() ?? '';
+}
 
-    /**
+/**
      * Set event handlers
      *
      * @param array $aHandlers
      *
      * @return string
      */
-    public function events(array $aHandlers): string
-    {
-        return array_reduce($aHandlers, fn(EventAttr|null $xAttr, array $aHandler)
-            => $this->setEventHandler($aHandler, $xAttr), null)?->__toString() ?? '';
-    }
+public function events(array $aHandlers): string
+{
+return array_reduce($aHandlers, fn(EventAttr|null $xAttr, array $aHandler)
+=> $this->setEventHandler($aHandler, $xAttr), null)?->__toString() ?? '';
+}
 
-    /**
+/**
      * Get the HTML or Javascript ready code for a package
      *
      * @param string $sClass
@@ -198,17 +198,17 @@ 
      *
      * @return string
      */
-    public function package(string $sClass, string $sType = 'html'): string
-    {
-        $sCode = match($sType) {
-            'html' => jaxon()->package($sClass)?->getHtml() ?? '',
-            'ready' => jaxon()->package($sClass)?->getReadyScript() ?? '',
-            default => ''
-        };
-        $sCode = trim($sCode);
-
-        return $sType !== 'ready' || $sCode === '' ? $sCode :
-            // Call the ready code with the jaxon.dom.ready function.
-            "jaxon.dom.ready(() => $sCode)";
-    }
+public function package(string $sClass, string $sType = 'html'): string
+{
+$sCode = match($sType) {
+'html' => jaxon()->package($sClass)?->getHtml() ?? '',
+'ready' => jaxon()->package($sClass)?->getReadyScript() ?? '',
+default => ''
+};
+$sCode = trim($sCode);
+
+return $sType !== 'ready' || $sCode === '' ? $sCode :
+// Call the ready code with the jaxon.dom.ready function.
+"jaxon.dom.ready(() => $sCode)";
+}
 }

jaxon-annotations/src/Annotation/ExportAnnotation.php

Switch Indentation +25 added lines, -25 removed lines

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

jaxon-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));"];
+}
 }

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\Attr\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\Attr\Ajax\FontService', $aProperties['*']['__di']['fontService']);
+}
 }

jaxon-annotations/tests/TestAnnotation/ExtendAnnotationTest.php

Switch Indentation +301 added lines, -301 removed lines

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

jaxon-annotations/tests/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\Attr\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\Attr\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\Attr\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\Attr\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\Attr\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\Attr\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\Attr\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\Attr\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\Attr\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\Attr\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']);
+}
 }

jaxon-annotations/tests/TestAnnotation/DocBlockAnnotationTest.php

Switch Indentation +287 added lines, -287 removed lines

@@ -16,320 +16,320 @@
 
 class DocBlockAnnotationTest 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(DocBlockAnnotated::class, ['saveFiles', 'doNot']);
-        $bExcluded = $xMetadata->isExcluded();
-        $aProperties = $xMetadata->getProperties();
-        $aExcluded = $xMetadata->getExceptMethods();
+public function testUploadAndExcludeAnnotation()
+{
+$xMetadata = $this->getAttributes(DocBlockAnnotated::class, ['saveFiles', 'doNot']);
+$bExcluded = $xMetadata->isExcluded();
+$aProperties = $xMetadata->getProperties();
+$aExcluded = $xMetadata->getExceptMethods();
 
-        $this->assertFalse($bExcluded);
+$this->assertFalse($bExcluded);
 
-        $this->assertCount(1, $aExcluded);
-        $this->assertEquals('doNot', $aExcluded[0]);
+$this->assertCount(1, $aExcluded);
+$this->assertEquals('doNot', $aExcluded[0]);
 
-        $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']);
+}
 
-    /**
+/**
      * @throws SetupException
      */
-    public function testDatabagAnnotation()
-    {
-        $xMetadata = $this->getAttributes(DocBlockAnnotated::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(DocBlockAnnotated::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 testCallbackAnnotation()
-    {
-        $xMetadata = $this->getAttributes(DocBlockAnnotated::class, ['withCallback']);
-        $bExcluded = $xMetadata->isExcluded();
-        $aProperties = $xMetadata->getProperties();
-
-        $this->assertFalse($bExcluded);
-
-        $this->assertCount(1, $aProperties);
-        $this->assertArrayHasKey('withCallback', $aProperties);
-        $this->assertCount(1, $aProperties['withCallback']);
-        $this->assertIsArray($aProperties['withCallback']['callback']);
-        $this->assertEquals('jaxon.ajax.callback.test', $aProperties['withCallback']['callback'][0]);
-    }
-
-    /**
+public function testCallbackAnnotation()
+{
+$xMetadata = $this->getAttributes(DocBlockAnnotated::class, ['withCallback']);
+$bExcluded = $xMetadata->isExcluded();
+$aProperties = $xMetadata->getProperties();
+
+$this->assertFalse($bExcluded);
+
+$this->assertCount(1, $aProperties);
+$this->assertArrayHasKey('withCallback', $aProperties);
+$this->assertCount(1, $aProperties['withCallback']);
+$this->assertIsArray($aProperties['withCallback']['callback']);
+$this->assertEquals('jaxon.ajax.callback.test', $aProperties['withCallback']['callback'][0]);
+}
+
+/**
      * @throws SetupException
      */
-    public function testHooksAnnotation()
-    {
-        $xMetadata = $this->getAttributes(DocBlockAnnotated::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 testHooksAnnotation()
+{
+$xMetadata = $this->getAttributes(DocBlockAnnotated::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(DocBlockAnnotated::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\Attr\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(DocBlockAnnotated::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\Attr\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(DocBlockClassAnnotated::class, []);
-        // $this->assertEquals('', json_encode($aProperties));
-        $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['*']);
-
-        $this->assertCount(2, $aProperties['*']['bags']);
-        $this->assertEquals('user.name', $aProperties['*']['bags'][0]);
-        $this->assertEquals('page.number', $aProperties['*']['bags'][1]);
-
-        $this->assertIsArray($aProperties['*']['callback']);
-        $this->assertEquals('jaxon.ajax.callback.test', $aProperties['*']['callback'][0]);
-
-        $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\Attr\Ajax\FontService', $aProperties['*']['__di']['fontService']);
-    }
-
-    /**
+public function testClassAnnotation()
+{
+$xMetadata = $this->getAttributes(DocBlockClassAnnotated::class, []);
+// $this->assertEquals('', json_encode($aProperties));
+$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['*']);
+
+$this->assertCount(2, $aProperties['*']['bags']);
+$this->assertEquals('user.name', $aProperties['*']['bags'][0]);
+$this->assertEquals('page.number', $aProperties['*']['bags'][1]);
+
+$this->assertIsArray($aProperties['*']['callback']);
+$this->assertEquals('jaxon.ajax.callback.test', $aProperties['*']['callback'][0]);
+
+$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\Attr\Ajax\FontService', $aProperties['*']['__di']['fontService']);
+}
+
+/**
      * @throws SetupException
      */
-    public function testClassExcludeAnnotation()
-    {
-        $xMetadata = $this->getAttributes(DocBlockClassExcluded::class,
-            ['doNot', 'withBags', 'cbSingle']);
-        $bExcluded = $xMetadata->isExcluded();
-        $aProperties = $xMetadata->getProperties();
-        $aExcluded = $xMetadata->getExceptMethods();
-
-        $this->assertTrue($bExcluded);
-        $this->assertEmpty($aProperties);
-        $this->assertEmpty($aExcluded);
-    }
-
-    public function testUploadAnnotationErrorFieldName()
-    {
-        $this->expectException(SetupException::class);
-        $this->getAttributes(DocBlockAnnotated::class, ['saveFileErrorFieldName']);
-    }
-
-    public function testUploadAnnotationErrorFieldNumber()
-    {
-        $this->expectException(SetupException::class);
-        $this->getAttributes(DocBlockAnnotated::class, ['saveFileErrorFieldNumber']);
-    }
-
-    public function testDatabagAnnotationErrorName()
-    {
-        $this->expectException(SetupException::class);
-        $this->getAttributes(DocBlockAnnotated::class, ['withBagsErrorName']);
-    }
-
-    public function testDatabagAnnotationErrorNumber()
-    {
-        $this->expectException(SetupException::class);
-        $this->getAttributes(DocBlockAnnotated::class, ['withBagsErrorNumber']);
-    }
-
-    public function testContainerAnnotationErrorAttr()
-    {
-        $this->expectException(SetupException::class);
-        $this->getAttributes(DocBlockAnnotated::class, ['diErrorAttr']);
-    }
-
-    public function testContainerAnnotationErrorClass()
-    {
-        $this->expectException(SetupException::class);
-        $this->getAttributes(DocBlockAnnotated::class, ['diErrorClass']);
-    }
-
-    public function testContainerAnnotationErrorOneParam()
-    {
-        $this->expectException(SetupException::class);
-        $this->getAttributes(DocBlockAnnotated::class, ['diErrorOneParam']);
-    }
-
-    public function testContainerAnnotationErrorThreeParams()
-    {
-        $this->expectException(SetupException::class);
-        $this->getAttributes(DocBlockAnnotated::class, ['diErrorThreeParams']);
-    }
-
-    public function testCbBeforeAnnotationErrorName()
-    {
-        $this->expectException(SetupException::class);
-        $this->getAttributes(DocBlockAnnotated::class, ['cbBeforeErrorName']);
-    }
-
-    public function testCbBeforeAnnotationErrorParam()
-    {
-        $this->expectException(SetupException::class);
-        $this->getAttributes(DocBlockAnnotated::class, ['cbBeforeErrorParam']);
-    }
-
-    public function testCbBeforeAnnotationErrorNumber()
-    {
-        $this->expectException(SetupException::class);
-        $this->getAttributes(DocBlockAnnotated::class, ['cbBeforeErrorNumber']);
-    }
-
-    public function testCbAfterAnnotationErrorName()
-    {
-        $this->expectException(SetupException::class);
-        $this->getAttributes(DocBlockAnnotated::class, ['cbAfterErrorName']);
-    }
-
-    public function testCbAfterAnnotationErrorParam()
-    {
-        $this->expectException(SetupException::class);
-        $this->getAttributes(DocBlockAnnotated::class, ['cbAfterErrorParam']);
-    }
-
-    public function testCbAfterAnnotationErrorNumber()
-    {
-        $this->expectException(SetupException::class);
-        $this->getAttributes(DocBlockAnnotated::class, ['cbAfterErrorNumber']);
-    }
+public function testClassExcludeAnnotation()
+{
+$xMetadata = $this->getAttributes(DocBlockClassExcluded::class,
+['doNot', 'withBags', 'cbSingle']);
+$bExcluded = $xMetadata->isExcluded();
+$aProperties = $xMetadata->getProperties();
+$aExcluded = $xMetadata->getExceptMethods();
+
+$this->assertTrue($bExcluded);
+$this->assertEmpty($aProperties);
+$this->assertEmpty($aExcluded);
+}
+
+public function testUploadAnnotationErrorFieldName()
+{
+$this->expectException(SetupException::class);
+$this->getAttributes(DocBlockAnnotated::class, ['saveFileErrorFieldName']);
+}
+
+public function testUploadAnnotationErrorFieldNumber()
+{
+$this->expectException(SetupException::class);
+$this->getAttributes(DocBlockAnnotated::class, ['saveFileErrorFieldNumber']);
+}
+
+public function testDatabagAnnotationErrorName()
+{
+$this->expectException(SetupException::class);
+$this->getAttributes(DocBlockAnnotated::class, ['withBagsErrorName']);
+}
+
+public function testDatabagAnnotationErrorNumber()
+{
+$this->expectException(SetupException::class);
+$this->getAttributes(DocBlockAnnotated::class, ['withBagsErrorNumber']);
+}
+
+public function testContainerAnnotationErrorAttr()
+{
+$this->expectException(SetupException::class);
+$this->getAttributes(DocBlockAnnotated::class, ['diErrorAttr']);
+}
+
+public function testContainerAnnotationErrorClass()
+{
+$this->expectException(SetupException::class);
+$this->getAttributes(DocBlockAnnotated::class, ['diErrorClass']);
+}
+
+public function testContainerAnnotationErrorOneParam()
+{
+$this->expectException(SetupException::class);
+$this->getAttributes(DocBlockAnnotated::class, ['diErrorOneParam']);
+}
+
+public function testContainerAnnotationErrorThreeParams()
+{
+$this->expectException(SetupException::class);
+$this->getAttributes(DocBlockAnnotated::class, ['diErrorThreeParams']);
+}
+
+public function testCbBeforeAnnotationErrorName()
+{
+$this->expectException(SetupException::class);
+$this->getAttributes(DocBlockAnnotated::class, ['cbBeforeErrorName']);
+}
+
+public function testCbBeforeAnnotationErrorParam()
+{
+$this->expectException(SetupException::class);
+$this->getAttributes(DocBlockAnnotated::class, ['cbBeforeErrorParam']);
+}
+
+public function testCbBeforeAnnotationErrorNumber()
+{
+$this->expectException(SetupException::class);
+$this->getAttributes(DocBlockAnnotated::class, ['cbBeforeErrorNumber']);
+}
+
+public function testCbAfterAnnotationErrorName()
+{
+$this->expectException(SetupException::class);
+$this->getAttributes(DocBlockAnnotated::class, ['cbAfterErrorName']);
+}
+
+public function testCbAfterAnnotationErrorParam()
+{
+$this->expectException(SetupException::class);
+$this->getAttributes(DocBlockAnnotated::class, ['cbAfterErrorParam']);
+}
+
+public function testCbAfterAnnotationErrorNumber()
+{
+$this->expectException(SetupException::class);
+$this->getAttributes(DocBlockAnnotated::class, ['cbAfterErrorNumber']);
+}
 }