jaxon-php / jaxon-mono

jaxon-annotations/tests/App/Ajax/TraitAnnotated.php

Switch Indentation +1 added lines, -1 removed lines

@@ -20,5 +20,5 @@
  */
 class TraitAnnotated extends FuncComponent
 {
-    use Traits\Annotated;
+use Traits\Annotated;
 }

jaxon-annotations/tests/App/Ajax/DocBlockAnnotated.php

Switch Indentation +104 added lines, -104 removed lines

@@ -8,197 +8,197 @@
 
 class DocBlockAnnotated extends FuncComponent
 {
-    /**
+/**
      * @exclude true
      */
-    public function doNot()
-    {
-    }
+public function doNot()
+{
+}
 
-    /**
+/**
      * @exclude Me
      */
-    public function doNotError()
-    {
-    }
+public function doNotError()
+{
+}
 
-    /**
+/**
      * @databag user.name
      * @databag page.number
      */
-    public function withBags()
-    {
-    }
+public function withBags()
+{
+}
 
-    /**
+/**
      * @databag user:name
      */
-    public function withBagsErrorName()
-    {
-    }
+public function withBagsErrorName()
+{
+}
 
-    /**
+/**
      * @databag page number
      */
-    public function withBagsErrorNumber()
-    {
-    }
+public function withBagsErrorNumber()
+{
+}
 
-    /**
+/**
      * @upload user-files
      * @exclude false
      */
-    public function saveFiles()
-    {
-    }
+public function saveFiles()
+{
+}
 
-    /**
+/**
      * @upload user:file
      */
-    public function saveFileErrorFieldName()
-    {
-    }
+public function saveFileErrorFieldName()
+{
+}
 
-    /**
+/**
      * @upload user file
      */
-    public function saveFileErrorFieldNumber()
-    {
-    }
+public function saveFileErrorFieldNumber()
+{
+}
 
-    /**
+/**
      * @upload user-files
      */
-    public function saveFilesWrongName()
-    {
-    }
+public function saveFilesWrongName()
+{
+}
 
-    /**
+/**
      * @upload user-file1
      * @upload user-file2
      */
-    public function saveFilesMultiple()
-    {
-    }
+public function saveFilesMultiple()
+{
+}
 
-    /**
+/**
      * @before funcBefore
      * @after funcAfter
      */
-    public function cbSingle()
-    {
-    }
+public function cbSingle()
+{
+}
 
-    /**
+/**
      * @before funcBefore1
      * @before funcBefore2
      * @after funcAfter1
      * @after funcAfter2
      * @after funcAfter3
      */
-    public function cbMultiple()
-    {
-    }
+public function cbMultiple()
+{
+}
 
-    /**
+/**
      * @before funcBefore1 ["param1"]
      * @before funcBefore2 ["param1", "param2"]
      * @after funcAfter1 ["param1", "param2"]
      */
-    public function cbParams()
-    {
-    }
+public function cbParams()
+{
+}
 
-    /**
+/**
      * @before func:Before
      */
-    public function cbBeforeErrorName()
-    {
-    }
+public function cbBeforeErrorName()
+{
+}
 
-    /**
+/**
      * @before funcBefore false
      */
-    public function cbBeforeErrorParam()
-    {
-    }
+public function cbBeforeErrorParam()
+{
+}
 
-    /**
+/**
      * @before funcBefore ["param1"] false
      */
-    public function cbBeforeErrorNumber()
-    {
-    }
+public function cbBeforeErrorNumber()
+{
+}
 
-    /**
+/**
      * @before func:After
      */
-    public function cbAfterErrorName()
-    {
-    }
+public function cbAfterErrorName()
+{
+}
 
-    /**
+/**
      * @before funcAfter false
      */
-    public function cbAfterErrorParam()
-    {
-    }
+public function cbAfterErrorParam()
+{
+}
 
-    /**
+/**
      * @before funcAfter ["param1"] false
      */
-    public function cbAfterErrorNumber()
-    {
-    }
+public function cbAfterErrorNumber()
+{
+}
 
-    /**
+/**
      * @di $colorService ColorService
      * @di $fontService FontService
      */
-    public function di1()
-    {
-    }
+public function di1()
+{
+}
 
-    /**
+/**
      * @di $colorService ColorService
      * @di $textService \Jaxon\Annotations\Tests\Service\TextService
      */
-    public function di2()
-    {
-    }
+public function di2()
+{
+}
 
-    /**
+/**
      * @di $color.Service ColorService
      */
-    public function diErrorAttr()
-    {
-    }
+public function diErrorAttr()
+{
+}
 
-    /**
+/**
      * @di $colorService Color.Service
      */
-    public function diErrorClass()
-    {
-    }
+public function diErrorClass()
+{
+}
 
-    /**
+/**
      * @di $colorService
      */
-    public function diErrorOneParam()
-    {
-    }
+public function diErrorOneParam()
+{
+}
 
-    /**
+/**
      * @di $colorService ColorService TextService
      */
-    public function diErrorThreeParams()
-    {
-    }
+public function diErrorThreeParams()
+{
+}
 
-    /**
+/**
      * @callback jaxon.ajax.callback.test
      */
-    public function withCallback()
-    {
-    }
+public function withCallback()
+{
+}
 }

jaxon-annotations/tests/App/Ajax/AttrAnnotated.php

Switch Indentation +55 added lines, -55 removed lines

@@ -7,130 +7,130 @@
 
 class AttrAnnotated extends FuncComponent
 {
-    /**
+/**
      * @var ColorService
      */
-    protected $colorService;
+protected $colorService;
 
-    /**
+/**
      * @var FontService
      */
-    protected $fontService;
+protected $fontService;
 
-    /**
+/**
      * @var \Jaxon\Annotations\Tests\Service\TextService
      */
-    protected $textService;
+protected $textService;
 
-    /**
+/**
      * @di ColorService
      */
-    protected $colorService1;
+protected $colorService1;
 
-    /**
+/**
      * @di FontService
      */
-    protected $fontService1;
+protected $fontService1;
 
-    /**
+/**
      * @di \Jaxon\Annotations\Tests\Service\TextService
      */
-    protected $textService1;
+protected $textService1;
 
-    /**
+/**
      * @di
      * @var ColorService
      */
-    protected $colorService2;
+protected $colorService2;
 
-    /**
+/**
      * @di
      * @var FontService
      */
-    protected $fontService2;
+protected $fontService2;
 
-    /**
+/**
      * @di
      * @var \Jaxon\Annotations\Tests\Service\TextService
      */
-    protected $textService2;
+protected $textService2;
 
-    /**
+/**
      * @di('class' => 'ColorService')
      */
-    protected $colorService3;
+protected $colorService3;
 
-    /**
+/**
      * @di('class' => 'FontService')
      */
-    protected $fontService3;
+protected $fontService3;
 
-    /**
+/**
      * @di('class' => '\Jaxon\Annotations\Tests\Service\TextService')
      */
-    protected $textService3;
+protected $textService3;
 
-    /**
+/**
      * @di $fontService FontService
      */
-    protected $errorTwoParams;
+protected $errorTwoParams;
 
-    /**
+/**
      * @di('attr' => 'fontService')
      */
-    protected $errorDiAttr;
+protected $errorDiAttr;
 
-    /**
+/**
      * @di $fontService
      */
-    protected $errorDiDbAttr;
+protected $errorDiDbAttr;
 
-    /**
+/**
      * @di
      * @di FontService
      */
-    protected $errorTwoDi;
+protected $errorTwoDi;
 
-    /**
+/**
      * @di('attr' => 'colorService')
      * @di('attr' => 'fontService')
      * @di('attr' => 'textService')
      */
-    public function attrVar()
-    {
-    }
+public function attrVar()
+{
+}
 
-    /**
+/**
      * @di $colorService
      * @di $fontService
      * @di $textService
      */
-    public function attrDbVar()
-    {
-    }
+public function attrDbVar()
+{
+}
 
-    public function attrDi()
-    {
-    }
+public function attrDi()
+{
+}
 
-    /**
+/**
      * @di ColorService
      */
-    public function errorDiClass()
-    {
-    }
+public function errorDiClass()
+{
+}
 
-    /**
+/**
      * @di colorService ColorService
      */
-    public function errorDiNoVar()
-    {
-    }
+public function errorDiNoVar()
+{
+}
 
-    /**
+/**
      * @di $colorService $ColorService
      */
-    public function errorDiTwoVars()
-    {
-    }
+public function errorDiTwoVars()
+{
+}
 }

jaxon-annotations/tests/App/Ajax/ContainerError.php

Switch Indentation +2 added lines, -2 removed lines

@@ -6,9 +6,9 @@
 

 class ContainerError extends FuncComponent

 {

-    /**

+/**

      * @di('class' => 'Class1')

      * @di('class' => 'Class2')

      */

-    public $prop;

+public $prop;

 }

jaxon-annotations/tests/AnnotationTrait.php

Switch Indentation +8 added lines, -8 removed lines

@@ -10,7 +10,7 @@ 
 
 trait AnnotationTrait
 {
-    /**
+/**
      * Get the metadata from a given class
      *
      * @param ReflectionClass|string $xClass
@@ -19,11 +19,11 @@ 
      *
      * @return Metadata|null
      */
-    public function getAttributes(ReflectionClass|string $xClass,
-        array $aMethods = [], array $aProperties = []): ?Metadata
-    {
-        $xInputData = new InputData($xClass, $aMethods, $aProperties);
-        $xMetadataReader = jaxon()->di()->getMetadataReader('annotations');
-        return $xMetadataReader->getAttributes($xInputData);
-    }
+public function getAttributes(ReflectionClass|string $xClass,
+array $aMethods = [], array $aProperties = []): ?Metadata
+{
+$xInputData = new InputData($xClass, $aMethods, $aProperties);
+$xMetadataReader = jaxon()->di()->getMetadataReader('annotations');
+return $xMetadataReader->getAttributes($xInputData);
+}
 }

jaxon-core/src/Request/Upload/UploadHandlerInterface.php

Switch Indentation +10 added lines, -10 removed lines

@@ -20,45 +20,45 @@
 
 interface UploadHandlerInterface
 {
-    /**
+/**
      * Set the uploaded file name sanitizer
      *
      * @param Closure $cSanitizer    The closure
      *
      * @return void
      */
-    public function sanitizer(Closure $cSanitizer);
+public function sanitizer(Closure $cSanitizer);
 
-    /**
+/**
      * Get the uploaded files
      *
      * @return FileInterface[]
      */
-    public function files(): array;
+public function files(): array;
 
-    /**
+/**
      * Check if the current request contains uploaded files
      *
      * @param ServerRequestInterface $xRequest
      *
      * @return bool
      */
-    public function canProcessRequest(ServerRequestInterface $xRequest): bool;
+public function canProcessRequest(ServerRequestInterface $xRequest): bool;
 
-    /**
+/**
      * Process the uploaded files in the HTTP request
      *
      * @param ServerRequestInterface $xRequest
      *
      * @return bool
      */
-    public function processRequest(ServerRequestInterface $xRequest): bool;
+public function processRequest(ServerRequestInterface $xRequest): bool;
 
-    /**
+/**
      * @param string $sStorage
      * @param Closure $cFactory
      *
      * @return void
      */
-    public function registerStorageAdapter(string $sStorage, Closure $cFactory);
+public function registerStorageAdapter(string $sStorage, Closure $cFactory);
 }

jaxon-upload/src/Manager/FileStorage.php

Spacing +5 added lines, -6 removed lines

@@ -81,8 +81,7 @@ 
     {
         // Local file system adapter
         $this->registerAdapter('local', function(string $sRootDir, $xOptions) {
-            return empty($xOptions) ? new LocalFilesystemAdapter($sRootDir) :
-                new LocalFilesystemAdapter($sRootDir, $xOptions);
+            return empty($xOptions) ? new LocalFilesystemAdapter($sRootDir) : new LocalFilesystemAdapter($sRootDir, $xOptions);
         });
 
         // AWS S3 file system adapter
@@ -140,7 +139,7 @@ 
     public function filesystem(string $sField = ''): Filesystem
     {
         $sField = trim($sField);
-        if(isset($this->aFilesystems[$sField]))
+        if (isset($this->aFilesystems[$sField]))
         {
             return $this->aFilesystems[$sField];
         }
@@ -150,18 +149,18 @@ 
         $sRootDir = $this->xConfigManager->getOption('upload.default.dir', '');
         $aOptions = $this->xConfigManager->getOption('upload.default.options');
         $sConfigKey = "upload.files.$sField";
-        if($sField !== '' && $this->xConfigManager->hasOption($sConfigKey))
+        if ($sField !== '' && $this->xConfigManager->hasOption($sConfigKey))
         {
             $sStorage = $this->xConfigManager->getOption("$sConfigKey.storage", $sStorage);
             $sRootDir = $this->xConfigManager->getOption("$sConfigKey.dir", $sRootDir);
             $aOptions = $this->xConfigManager->getOption("$sConfigKey.options", $aOptions);
         }
 
-        if(!is_string($sRootDir))
+        if (!is_string($sRootDir))
         {
             throw new RequestException($this->xTranslator->trans('errors.upload.dir'));
         }
-        if(!isset($this->aAdapters[$sStorage]))
+        if (!isset($this->aAdapters[$sStorage]))
         {
             throw new RequestException($this->xTranslator->trans('errors.upload.adapter'));
         }

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

Spacing +14 added lines, -15 removed lines

@@ -144,15 +144,15 @@ 
         $xRegistry->updateHash(false); // Disable hash calculation.
 
         $sComponentId = str_replace('\\', '.', $sClassName);
-        if(!isset($this->aComponents[$sComponentId]))
+        if (!isset($this->aComponents[$sComponentId]))
         {
             $aOptions = $xRegistry->getNamespaceComponentOptions($sClassName);
-            if($aOptions !== null)
+            if ($aOptions !== null)
             {
                 $this->saveComponent($sClassName, $aOptions);
             }
         }
-        if(isset($this->aComponents[$sComponentId]))
+        if (isset($this->aComponents[$sComponentId]))
         {
             return; // The component is found.
         }
@@ -160,11 +160,11 @@ 
         // The component was not found in a registered namespace. We need to parse all
         // the directories to be able to find a component registered without a namespace.
         $sComponentId = str_replace('\\', '_', $sClassName);
-        if(!isset($this->aComponents[$sComponentId]))
+        if (!isset($this->aComponents[$sComponentId]))
         {
             $xRegistry->registerComponentsInDirectories();
         }
-        if(isset($this->aComponents[$sComponentId]))
+        if (isset($this->aComponents[$sComponentId]))
         {
             return; // The component is found.
         }
@@ -182,7 +182,7 @@ 
     public function getCallableObjects(): array
     {
         $aCallableObjects = [];
-        foreach($this->aComponents as $sComponentId => $_)
+        foreach ($this->aComponents as $sComponentId => $_)
         {
             $aCallableObjects[$sComponentId] = $this->makeCallableObject($sComponentId);
         }
@@ -233,12 +233,12 @@ 
     {
         /** @var Config|null */
         $xPackageConfig = $aOptions['config'] ?? null;
-        if($xPackageConfig === null || (bool)($aOptions['excluded'] ?? false))
+        if ($xPackageConfig === null || (bool)($aOptions['excluded'] ?? false))
         {
             return null;
         }
         $sMetadataFormat = $xPackageConfig->getOption('metadata.format');
-        if(!in_array($sMetadataFormat, ['attributes', 'annotations']))
+        if (!in_array($sMetadataFormat, ['attributes', 'annotations']))
         {
             return null;
         }
@@ -248,23 +248,23 @@ 
         $xMetadata = null;
         $xMetadataCache = null;
         $xConfig = $di->config();
-        if($xConfig->getAppOption('metadata.cache.enabled', false))
+        if ($xConfig->getAppOption('metadata.cache.enabled', false))
         {
-            if(!$di->h('jaxon_metadata_cache_dir'))
+            if (!$di->h('jaxon_metadata_cache_dir'))
             {
                 $sCacheDir = $xConfig->getAppOption('metadata.cache.dir');
                 $di->val('jaxon_metadata_cache_dir', $sCacheDir);
             }
             $xMetadataCache = $di->getMetadataCache();
             $xMetadata = $xMetadataCache->read($xReflectionClass->getName());
-            if($xMetadata !== null)
+            if ($xMetadata !== null)
             {
                 return $xMetadata;
             }
         }
 
         $aProperties = array_map(fn($xProperty) => $xProperty->getName(),
-            $xReflectionClass->getProperties(ReflectionProperty::IS_PUBLIC |
+            $xReflectionClass->getProperties(ReflectionProperty::IS_PUBLIC|
                 ReflectionProperty::IS_PROTECTED));
         $aMethods = $this->getPublicMethods($xReflectionClass);
 
@@ -273,7 +273,7 @@ 
         $xMetadata = $xMetadataReader->getAttributes($xInput);
 
         // Try to save the metadata in the cache
-        if($xMetadataCache !== null && $xMetadata !== null)
+        if ($xMetadataCache !== null && $xMetadata !== null)
         {
             $xMetadataCache->save($xReflectionClass->getName(), $xMetadata);
         }
@@ -291,8 +291,7 @@ 
         array $aOptions): ComponentOptions
     {
         $xMetadata = $this->getComponentMetadata($xReflectionClass, $aOptions);
-        return !$xMetadata ? new ComponentOptions($aOptions) :
-            new ComponentOptions($aOptions, $xMetadata->isExcluded(),
+        return !$xMetadata ? new ComponentOptions($aOptions) : new ComponentOptions($aOptions, $xMetadata->isExcluded(),
             $xMetadata->getProtectedMethods(), $xMetadata->getProperties());
     }
 }

jaxon-core/src/Jaxon.php

Switch Indentation +8 added lines, -8 removed lines

@@ -16,23 +16,23 @@
 
 class Jaxon
 {
-    /**
+/**
      * @const string
      */
-    public const VERSION = 'Jaxon 5.x';
+public const VERSION = 'Jaxon 5.x';
 
-    /**
+/**
      * @const string
      */
-    public const CALLABLE_CLASS = 'CallableClass';
+public const CALLABLE_CLASS = 'CallableClass';
 
-    /**
+/**
      * @const string
      */
-    public const CALLABLE_DIR = 'CallableDir';
+public const CALLABLE_DIR = 'CallableDir';
 
-    /**
+/**
      * @const string
      */
-    public const CALLABLE_FUNCTION = 'CallableFunction';
+public const CALLABLE_FUNCTION = 'CallableFunction';
 }