jaxon-php / jaxon-mono

jaxon-annotations/tests/TestAnnotation/AnnotationTest.php

Spacing +1 added lines, -1 removed lines

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

Switch Indentation +341 added lines, -341 removed lines

@@ -16,386 +16,386 @@
 
 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();
-        $aExcluded = $xMetadata->getExceptMethods();
+public function testUploadAndExcludeAnnotation()
+{
+$xMetadata = $this->getAttributes(Annotated::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(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\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(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\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(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\Attr\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\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();
-
-        $xData = $xMetadata->exclude();
-        $this->assertTrue($xData->getValue());
-        $this->assertEquals('protected', $xData->getName());
-
-        $this->assertTrue($bExcluded);
-        $this->assertEmpty($aProperties);
-        $this->assertEmpty($aExcluded);
-    }
-
-    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();
+$aExcluded = $xMetadata->getExceptMethods();
+
+$xData = $xMetadata->exclude();
+$this->assertTrue($xData->getValue());
+$this->assertEquals('protected', $xData->getName());
+
+$this->assertTrue($bExcluded);
+$this->assertEmpty($aProperties);
+$this->assertEmpty($aExcluded);
+}
+
+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/src/Annotation/AbstractAnnotation.php

Switch Indentation +2 added lines, -2 removed lines

@@ -20,7 +20,7 @@ 
 
 abstract class AbstractAnnotation extends Annotation implements IAnnotationParser
 {
-    /**
+/**
      * Save the annotation value
      *
      * @param Metadata $xMetadata
@@ -28,5 +28,5 @@ 
      *
      * @return void
      */
-    abstract public function saveValue(Metadata $xMetadata, string $sMethod = '*'): void;
+abstract public function saveValue(Metadata $xMetadata, string $sMethod = '*'): void;
 }

jaxon-annotations/src/register.php

Spacing +1 added lines, -1 removed lines

@@ -30,7 +30,7 @@
 function register(): void
 {
     // Do nothing if running in cli.
-    if(php_sapi_name() !== 'cli')
+    if (php_sapi_name() !== 'cli')
     {
         _register();
     };

jaxon-flot/src/register.php

Spacing +1 added lines, -1 removed lines

@@ -30,7 +30,7 @@
 function register(): void
 {
     // Do nothing if running in cli.
-    if(php_sapi_name() !== 'cli')
+    if (php_sapi_name() !== 'cli')
     {
         _register();
     };

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

Spacing +5 added lines, -5 removed lines

@@ -139,16 +139,16 @@ 
     {
         $aProperties = [];
         $aClassProperties = [];
-        foreach($this->aAttributes as $sType => $aValues)
+        foreach ($this->aAttributes as $sType => $aValues)
         {
-            if($sType === 'exclude')
+            if ($sType === 'exclude')
             {
                 continue;
             }
 
-            foreach($aValues as $sMethod => $xData)
+            foreach ($aValues as $sMethod => $xData)
             {
-                if($sMethod === '*')
+                if ($sMethod === '*')
                 {
                     $aClassProperties[$xData->getName()] = $xData->getValue();
                     continue;
@@ -157,7 +157,7 @@ 
             }
         }
 
-        if(count($aClassProperties) > 0)
+        if (count($aClassProperties) > 0)
         {
             $aProperties['*'] = $aClassProperties;
         }

Switch Indentation +133 added lines, -133 removed lines

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

jaxon-core/src/Script/CallFactory.php

Spacing +1 added lines, -2 removed lines

@@ -50,8 +50,7 @@
     public function rq(string $sClassName = ''): ?JxnCall
     {
         $sClassName = trim($sClassName);
-        return $sClassName === '' ? $this->cdi->getFunctionRequestFactory() :
-            $this->cdi->getComponentRequestFactory($sClassName);
+        return $sClassName === '' ? $this->cdi->getFunctionRequestFactory() : $this->cdi->getComponentRequestFactory($sClassName);
     }
 
     /**

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

Spacing +3 added lines, -3 removed lines

@@ -51,12 +51,12 @@
         $sMetadataVar = '$xMetadata';
         $sDataVar = '$xData';
         $aCalls = ["$sMetadataVar = new " . Metadata::class . '();'];
-        foreach($xMetadata->getAttributes() as $sType => $aValues)
+        foreach ($xMetadata->getAttributes() as $sType => $aValues)
         {
-            foreach($aValues as $sMethod => $xData)
+            foreach ($aValues as $sMethod => $xData)
             {
                 $aCalls[] = "$sDataVar = {$sMetadataVar}->{$sType}('{$sMethod}');";
-                foreach($xData->encode($sDataVar) as $sCall)
+                foreach ($xData->encode($sDataVar) as $sCall)
                 {
                     $aCalls[] = $sCall;
                 }

Switch Indentation +46 added lines, -46 removed lines

@@ -28,60 +28,60 @@ 
 
 class MetadataCache
 {
-    /**
+/**
      * @param string $sCacheDir
      */
-    public function __construct(private string $sCacheDir)
-    {}
+public function __construct(private string $sCacheDir)
+{}
 
-    /**
+/**
      * @param string $sClass
      *
      * @return string
      */
-    private function filepath(string $sClass): string
-    {
-        $sFilename = trim(str_replace(['\\', '.'], DIRECTORY_SEPARATOR,
-            strtolower($sClass)), DIRECTORY_SEPARATOR);
-        return rtrim($this->sCacheDir, "/\\") . DIRECTORY_SEPARATOR .
-            "metadata" . DIRECTORY_SEPARATOR . "{$sFilename}.php";
-    }
+private function filepath(string $sClass): string
+{
+$sFilename = trim(str_replace(['\\', '.'], DIRECTORY_SEPARATOR,
+strtolower($sClass)), DIRECTORY_SEPARATOR);
+return rtrim($this->sCacheDir, "/\\") . DIRECTORY_SEPARATOR .
+"metadata" . DIRECTORY_SEPARATOR . "{$sFilename}.php";
+}
 
-    /**
+/**
      * Generate the PHP code to create a metadata object.
      *
      * @return array
      */
-    private function encode(Metadata $xMetadata): array
+private function encode(Metadata $xMetadata): array
+{
+$sMetadataVar = '$xMetadata';
+$sDataVar = '$xData';
+$aCalls = ["$sMetadataVar = new " . Metadata::class . '();'];
+foreach($xMetadata->getAttributes() as $sType => $aValues)
+{
+foreach($aValues as $sMethod => $xData)
+{
+    $aCalls[] = "$sDataVar = {$sMetadataVar}->{$sType}('{$sMethod}');";
+    foreach($xData->encode($sDataVar) as $sCall)
     {
-        $sMetadataVar = '$xMetadata';
-        $sDataVar = '$xData';
-        $aCalls = ["$sMetadataVar = new " . Metadata::class . '();'];
-        foreach($xMetadata->getAttributes() as $sType => $aValues)
-        {
-            foreach($aValues as $sMethod => $xData)
-            {
-                $aCalls[] = "$sDataVar = {$sMetadataVar}->{$sType}('{$sMethod}');";
-                foreach($xData->encode($sDataVar) as $sCall)
-                {
-                    $aCalls[] = $sCall;
-                }
-            }
-        }
-        $aCalls[] = "return $sMetadataVar;";
-        return $aCalls;
+        $aCalls[] = $sCall;
     }
+}
+}
+$aCalls[] = "return $sMetadataVar;";
+return $aCalls;
+}
 
-    /**
+/**
      * @param string $sClass
      * @param Metadata $xMetadata
      *
      * @return void
      */
-    public function save(string $sClass, Metadata $xMetadata): void
-    {
-        $sDataCode = implode("\n    ", $this->encode($xMetadata));
-        $sPhpCode = <<<CODE
+public function save(string $sClass, Metadata $xMetadata): void
+{
+$sDataCode = implode("\n    ", $this->encode($xMetadata));
+$sPhpCode = <<<CODE
 <?php
 
 return function() {
@@ -89,21 +89,21 @@ 
 };
 
 CODE;
-        // Recursively create the directories.
-        $sPath = $this->filepath($sClass);
-        @mkdir(dirname($sPath), 0755, true);
-        file_put_contents($sPath, $sPhpCode);
-    }
+// Recursively create the directories.
+$sPath = $this->filepath($sClass);
+@mkdir(dirname($sPath), 0755, true);
+file_put_contents($sPath, $sPhpCode);
+}
 
-    /**
+/**
      * @param string $sClass
      *
      * @return Metadata|null
      */
-    public function read(string $sClass): ?Metadata
-    {
-        $sPath = $this->filepath($sClass);
-        $fCreator = file_exists($sPath) ? require $sPath : null;
-        return $fCreator instanceof Closure ? $fCreator() : null;
-    }
+public function read(string $sClass): ?Metadata
+{
+$sPath = $this->filepath($sClass);
+$fCreator = file_exists($sPath) ? require $sPath : null;
+return $fCreator instanceof Closure ? $fCreator() : null;
+}
 }

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

Spacing +3 added lines, -3 removed lines

@@ -51,7 +51,7 @@ 
      */
     protected function validateAttr(string $sAttr): void
     {
-        if(preg_match('/^[a-zA-Z][a-zA-Z0-9_]*$/', $sAttr) > 0)
+        if (preg_match('/^[a-zA-Z][a-zA-Z0-9_]*$/', $sAttr) > 0)
         {
             return;
         }
@@ -65,7 +65,7 @@ 
      */
     protected function validateClass(string $sClass): void
     {
-        if(preg_match('/^(\\\)?([a-zA-Z][a-zA-Z0-9_]*)(\\\[a-zA-Z][a-zA-Z0-9_]*)*$/', $sClass) > 0)
+        if (preg_match('/^(\\\)?([a-zA-Z][a-zA-Z0-9_]*)(\\\[a-zA-Z][a-zA-Z0-9_]*)*$/', $sClass) > 0)
         {
             return;
         }
@@ -92,7 +92,7 @@ 
     public function encode(string $sVarName): array
     {
         $aCalls = [];
-        foreach($this->aProperties as $sAttr => $sClass)
+        foreach ($this->aProperties as $sAttr => $sClass)
         {
             $aCalls[] = "{$sVarName}->addValue('$sAttr', '" . addslashes($sClass) . "');";
         }

Switch Indentation +47 added lines, -47 removed lines

@@ -21,81 +21,81 @@
 
 class ContainerData extends AbstractData
 {
-    /**
+/**
      * The properties to get from the container
      *
      * @var array
      */
-    protected $aProperties = [];
+protected $aProperties = [];
 
-    /**
+/**
      * @return string
      */
-    public function getName(): string
-    {
-        return '__di';
-    }
+public function getName(): string
+{
+return '__di';
+}
 
-    /**
+/**
      * @return mixed
      */
-    public function getValue(): mixed
-    {
-        return $this->aProperties;
-    }
+public function getValue(): mixed
+{
+return $this->aProperties;
+}
 
-    /**
+/**
      * @param string $sAttr
      *
      * @return void
      */
-    protected function validateAttr(string $sAttr): void
-    {
-        if(preg_match('/^[a-zA-Z][a-zA-Z0-9_]*$/', $sAttr) > 0)
-        {
-            return;
-        }
-        throw new SetupException("$sAttr is not a valid \"attr\" value for di");
-    }
+protected function validateAttr(string $sAttr): void
+{
+if(preg_match('/^[a-zA-Z][a-zA-Z0-9_]*$/', $sAttr) > 0)
+{
+return;
+}
+throw new SetupException("$sAttr is not a valid \"attr\" value for di");
+}
 
-    /**
+/**
      * @param string $sClass
      *
      * @return void
      */
-    protected function validateClass(string $sClass): void
-    {
-        if(preg_match('/^(\\\)?([a-zA-Z][a-zA-Z0-9_]*)(\\\[a-zA-Z][a-zA-Z0-9_]*)*$/', $sClass) > 0)
-        {
-            return;
-        }
-        throw new SetupException("$sClass is not a valid \"class\" value for di");
-    }
+protected function validateClass(string $sClass): void
+{
+if(preg_match('/^(\\\)?([a-zA-Z][a-zA-Z0-9_]*)(\\\[a-zA-Z][a-zA-Z0-9_]*)*$/', $sClass) > 0)
+{
+return;
+}
+throw new SetupException("$sClass is not a valid \"class\" value for di");
+}
 
-    /**
+/**
      * @param string $sAttr
      * @param string $sClass
      *
      * @return void
      */
-    public function addValue(string $sAttr, string $sClass): void
-    {
-        $this->validateAttr($sAttr);
-        $this->validateClass($sClass);
+public function addValue(string $sAttr, string $sClass): void
+{
+$this->validateAttr($sAttr);
+$this->validateClass($sClass);
 
-        $this->aProperties[$sAttr] = $sClass;
-    }
+$this->aProperties[$sAttr] = $sClass;
+}
 
-    /**
+/**
      * @inheritDoc
      */
-    public function encode(string $sVarName): array
-    {
-        $aCalls = [];
-        foreach($this->aProperties as $sAttr => $sClass)
-        {
-            $aCalls[] = "{$sVarName}->addValue('$sAttr', '" . addslashes($sClass) . "');";
-        }
-        return $aCalls;
-    }
+public function encode(string $sVarName): array
+{
+$aCalls = [];
+foreach($this->aProperties as $sAttr => $sClass)
+{
+$aCalls[] = "{$sVarName}->addValue('$sAttr', '" . addslashes($sClass) . "');";
+}
+return $aCalls;
+}
 }

jaxon-core/src/Plugin/ResponsePluginInterface.php

Switch Indentation +4 added lines, -4 removed lines

@@ -6,17 +6,17 @@
 
 interface ResponsePluginInterface
 {
-    /**
+/**
      * Get the attached response
      *
      * @return AbstractResponse|null
      */
-    public function response(): ?AbstractResponse;
+public function response(): ?AbstractResponse;
 
-    /**
+/**
      * @param AbstractResponse $xResponse   The response
      *
      * @return static
      */
-    public function initPlugin(AbstractResponse $xResponse): static;
+public function initPlugin(AbstractResponse $xResponse): static;
 }