jaxon-php / jaxon-mono

jaxon-core/src/App/Ajax/AppInterface.php

Switch Indentation +34 added lines, -34 removed lines

@@ -22,58 +22,58 @@ 
 
 interface AppInterface
 {
-    /**
+/**
      * Set the logger.
      *
      * @param LoggerInterface|Closure $xLogger
      *
      * @return void
      */
-    public function setLogger(LoggerInterface|Closure $xLogger): void;
+public function setLogger(LoggerInterface|Closure $xLogger): void;
 
-    /**
+/**
      * Get the configured character encoding
      *
      * @return string
      */
-    public function getCharacterEncoding(): string;
+public function getCharacterEncoding(): string;
 
-    /**
+/**
      * Get the content type of the HTTP response
      *
      * @return string
      */
-    public function getContentType(): string;
+public function getContentType(): string;
 
-    /**
+/**
      * Get the HTML tags to include Jaxon javascript files into the page.
      *
      * @return string
      */
-    public function getJs(): string;
+public function getJs(): string;
 
-    /**
+/**
      * Get the HTML tags to include Jaxon javascript files into the page.
      *
      * @return string  the javascript code
      */
-    public function js(): string;
+public function js(): string;
 
-    /**
+/**
      * Get the HTML tags to include Jaxon CSS code and files into the page.
      *
      * @return string
      */
-    public function getCss(): string;
+public function getCss(): string;
 
-    /**
+/**
      * Get the HTML tags to include Jaxon CSS code and files into the page.
      *
      * @return string  the javascript code
      */
-    public function css(): string;
+public function css(): string;
 
-    /**
+/**
      * Returns the js header and wrapper code to be printed into the page
      *
      * The javascript code returned by this function is dependent on the plugins
@@ -84,9 +84,9 @@ 
      *
      * @return string
      */
-    public function getScript(bool $bIncludeJs = false, bool $bIncludeCss = false): string;
+public function getScript(bool $bIncludeJs = false, bool $bIncludeCss = false): string;
 
-    /**
+/**
      * Returns the js header and wrapper code to be printed into the page
      *
      * @param bool $bIncludeJs    Also get the JS files
@@ -95,46 +95,46 @@ 
      * @return string  the javascript code
      * @throws UriException
      */
-    public function script(bool $bIncludeJs = false, bool $bIncludeCss = false): string;
+public function script(bool $bIncludeJs = false, bool $bIncludeCss = false): string;
 
-    /**
+/**
      * Determine if a call is a jaxon request or a page load request
      *
      * @return bool
      */
-    public function canProcessRequest(): bool;
+public function canProcessRequest(): bool;
 
-    /**
+/**
      * Process an incoming Jaxon request, and return the response.
      *
      * @return mixed
      */
-    public function processRequest(): mixed;
+public function processRequest(): mixed;
 
-    /**
+/**
      * Get the Jaxon ajax response
      *
      * @return AjaxResponse
      */
-    public function ajaxResponse(): AjaxResponse;
+public function ajaxResponse(): AjaxResponse;
 
-    /**
+/**
      * @param Closure $xClosure    A closure to create the session manager instance
      *
      * @return void
      */
-    public function setSessionManager(Closure $xClosure);
+public function setSessionManager(Closure $xClosure);
 
-    /**
+/**
      * Set the container provided by the integrated framework
      *
      * @param ContainerInterface $xContainer    The container implementation
      *
      * @return void
      */
-    public function setContainer(ContainerInterface $xContainer);
+public function setContainer(ContainerInterface $xContainer);
 
-    /**
+/**
      * Add a view renderer with an id
      *
      * @param string $sRenderer    The renderer name
@@ -143,9 +143,9 @@ 
      *
      * @return void
      */
-    public function addViewRenderer(string $sRenderer, string $sExtension, Closure $xClosure);
+public function addViewRenderer(string $sRenderer, string $sExtension, Closure $xClosure);
 
-    /**
+/**
      * Set the javascript asset
      *
      * @param bool $bExport    Whether to export the js code in a file
@@ -155,14 +155,14 @@ 
      *
      * @return void
      */
-    public function asset(bool $bExport, bool $bMinify, string $sUri = '', string $sDir = ''): void;
+public function asset(bool $bExport, bool $bMinify, string $sUri = '', string $sDir = ''): void;
 
-    /**
+/**
      * Read config options from a config file and set up the library
      *
      * @param string $sConfigFile    The full path to the config file
      *
      * @return void
      */
-    public function setup(string $sConfigFile = ''): void;
+public function setup(string $sConfigFile = ''): void;
 }

jaxon-core/src/App/Ajax/AbstractApp.php

Switch Indentation +29 added lines, -29 removed lines

@@ -20,32 +20,32 @@ 
 
 abstract class AbstractApp implements AppInterface
 {
-    use Traits\ServicesTrait;
-    use Traits\PluginTrait;
-    use Traits\RequestTrait;
-    use Traits\ResponseTrait;
+use Traits\ServicesTrait;
+use Traits\PluginTrait;
+use Traits\RequestTrait;
+use Traits\ResponseTrait;
 
-    /**
+/**
      * The class constructor
      */
-    public function __construct()
-    {
-        // Declared in DiTrait.
-        $this->xContainer = Jaxon::getInstance()->di();
-        $this->xComponentContainer = Jaxon::getInstance()->cdi();
-    }
+public function __construct()
+{
+// Declared in DiTrait.
+$this->xContainer = Jaxon::getInstance()->di();
+$this->xComponentContainer = Jaxon::getInstance()->cdi();
+}
 
-    /**
+/**
      * Get the Jaxon application bootstrapper.
      *
      * @return Bootstrap
      */
-    protected function bootstrap(): Bootstrap
-    {
-        return $this->xContainer->getBootstrap();
-    }
+protected function bootstrap(): Bootstrap
+{
+return $this->xContainer->getBootstrap();
+}
 
-    /**
+/**
      * Set the javascript asset
      *
      * @param bool $bExport    Whether to export the js code in a file
@@ -55,26 +55,26 @@ 
      *
      * @return void
      */
-    public function asset(bool $bExport, bool $bMinify, string $sUri = '', string $sDir = ''): void
-    {
-        $this->bootstrap()->asset($bExport, $bMinify, $sUri, $sDir);
-    }
+public function asset(bool $bExport, bool $bMinify, string $sUri = '', string $sDir = ''): void
+{
+$this->bootstrap()->asset($bExport, $bMinify, $sUri, $sDir);
+}
 
-    /**
+/**
      * Set the container provided by the integrated framework
      *
      * @param ContainerInterface $xContainer    The container implementation
      *
      * @return void
      */
-    public function setContainer(ContainerInterface $xContainer): void
-    {
-        $this->di()->setContainer($xContainer);
-    }
+public function setContainer(ContainerInterface $xContainer): void
+{
+$this->di()->setContainer($xContainer);
+}
 
-    /**
+/**
      * @inheritDoc
      */
-    public function setup(string $sConfigFile = ''): void
-    {}
+public function setup(string $sConfigFile = ''): void
+{}
 }

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/Plugin/Request/CallableClass/CallableObject.php

Spacing +4 added lines, -5 removed lines

@@ -73,8 +73,7 @@ 
      */
     public function excluded(?string $sMethodName = null): bool
     {
-        return $sMethodName === null ? $this->xOptions->excluded() :
-            !$this->xOptions->isPublicMethod($sMethodName);
+        return $sMethodName === null ? $this->xOptions->excluded() : !$this->xOptions->isPublicMethod($sMethodName);
     }
 
     /**
@@ -160,11 +159,11 @@ 
         $sMethod = $this->xTarget->getMethodName();
         // The hooks defined at method level are merged with those defined at class level.
         $aMethods = array_merge($aHookMethods['*'] ?? [], $aHookMethods[$sMethod] ?? []);
-        foreach($aMethods as $xKey => $xValue)
+        foreach ($aMethods as $xKey => $xValue)
         {
             $sHookName = $xValue;
             $aHookArgs = [];
-            if(is_string($xKey))
+            if (is_string($xKey))
             {
                 $sHookName = $xKey;
                 $aHookArgs = is_array($xValue) ? $xValue : [$xValue];
@@ -202,7 +201,7 @@ 
             // Warning: dynamic properties will be deprecated in PHP8.2.
             $this->$sAttr = $xDiValue;
         };
-        foreach($aDiOptions as $sAttr => $sClass)
+        foreach ($aDiOptions as $sAttr => $sClass)
         {
             $this->setDiAttribute($xComponent, $sAttr, $this->di->get($sClass), $cSetter);
         }

jaxon-attributes/src/Attribute/Export.php

Spacing +2 added lines, -2 removed lines

@@ -38,9 +38,9 @@
     public function saveValue(Metadata $xMetadata, string $sMethod = '*'): void
     {
         $aMethods = [];
-        foreach(['base', 'only', 'except'] as $key)
+        foreach (['base', 'only', 'except'] as $key)
         {
-            if($this->$key !== null && count($this->$key) > 0)
+            if ($this->$key !== null && count($this->$key) > 0)
             {
                 $aMethods[$key] = $this->$key;
             }

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

Spacing +2 added lines, -2 removed lines

@@ -46,9 +46,9 @@
      */
     public function initAnnotation(array $properties)
     {
-        foreach(['base', 'only', 'except'] as $key)
+        foreach (['base', 'only', 'except'] as $key)
         {
-            if(isset($properties[$key]) && is_array($properties[$key]) &&
+            if (isset($properties[$key]) && is_array($properties[$key]) &&
                 count($properties[$key]) > 0)
             {
                 $this->aMethods[$key] = $properties[$key];

jaxon-annotations/tests/TestAnnotation/ExtendAnnotationTest.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 +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-core/src/App/Metadata/Data/ExportData.php

Switch Indentation +31 added lines, -31 removed lines

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

Spacing +3 added lines, -3 removed lines

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

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

Spacing +22 added lines, -25 removed lines

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