jaxon-php / jaxon-mono

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

Switch Indentation +23 added lines, -23 removed lines

@@ -20,34 +20,34 @@ 
 
 class MetadataCache
 {
-    /**
+/**
      * @param string $sCacheDir
      */
-    public function __construct(private string $sCacheDir)
-    {}
+public function __construct(private string $sCacheDir)
+{}
 
-    /**
+/**
      * @param string $sClass
      *
      * @return string
      */
-    private function filename(string $sClass): string
-    {
-        $sName = str_replace(['\\', '.'], '_', strtolower($sClass));
-        return "{$this->sCacheDir}/{$sName}.php";
-    }
+private function filename(string $sClass): string
+{
+$sName = str_replace(['\\', '.'], '_', strtolower($sClass));
+return "{$this->sCacheDir}/{$sName}.php";
+}
 
-    /**
+/**
      * @param string $sClass
      * @param Metadata $xMetadata
      *
      * @return void
      */
-    public function save(string $sClass, Metadata $xMetadata): void
-    {
-        $sFilename = $this->filename($sClass);
-        $sDataCode = implode("\n    ", $xMetadata->encode());
-        $sPhpCode = <<<CODE
+public function save(string $sClass, Metadata $xMetadata): void
+{
+$sFilename = $this->filename($sClass);
+$sDataCode = implode("\n    ", $xMetadata->encode());
+$sPhpCode = <<<CODE
 <?php
 
 return function() {
@@ -55,17 +55,17 @@ 
 };
 
 CODE;
-        file_put_contents($sFilename, $sPhpCode);
-    }
+file_put_contents($sFilename, $sPhpCode);
+}
 
-    /**
+/**
      * @param string $sClass
      *
      * @return Metadata|null
      */
-    public function read(string $sClass): ?Metadata
-    {
-        $fFunction = require $this->filename($sClass);
-        return !is_callable($fFunction) ? null : $fFunction();
-    }
+public function read(string $sClass): ?Metadata
+{
+$fFunction = require $this->filename($sClass);
+return !is_callable($fFunction) ? null : $fFunction();
+}
 }

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

Switch Indentation +162 added lines, -162 removed lines

@@ -21,239 +21,239 @@
 
 class Metadata implements MetadataInterface
 {
-    /**
+/**
      * @var array<Data\ExcludeData>
      */
-    private array $aExcludes = [];
+private array $aExcludes = [];
 
-    /**
+/**
      * @var array<Data\ContainerData>
      */
-    private array $aContainers = [];
+private array $aContainers = [];
 
-    /**
+/**
      * @var array<Data\DatabagData>
      */
-    private array $aDatabags = [];
+private array $aDatabags = [];
 
-    /**
+/**
      * @var array<Data\CallbackData>
      */
-    private array $aCallbacks = [];
+private array $aCallbacks = [];
 
-    /**
+/**
      * @var array<Data\BeforeData>
      */
-    private array $aBefores = [];
+private array $aBefores = [];
 
-    /**
+/**
      * @var array<Data\AfterData>
      */
-    private array $aAfters = [];
+private array $aAfters = [];
 
-    /**
+/**
      * @var array<Data\UploadData>
      */
-    private array $aUploads = [];
+private array $aUploads = [];
 
-    // /**
-    //  * @param bool $bIsExcluded
-    //  * @param array $aProperties
-    //  * @param array $aProtectedMethods
-    //  */
-    // public function __construct(private bool $bIsExcluded,
-    //     private array $aProperties, private array $aProtectedMethods)
-    // {}
+// /**
+//  * @param bool $bIsExcluded
+//  * @param array $aProperties
+//  * @param array $aProtectedMethods
+//  */
+// public function __construct(private bool $bIsExcluded,
+//     private array $aProperties, private array $aProtectedMethods)
+// {}
 
-    /**
+/**
      * @param string $sMethod
      *
      * @return Data\ExcludeData
      */
-    public function exclude(string $sMethod = '*'): Data\ExcludeData
-    {
-        if(!isset($this->aExcludes[$sMethod]))
-        {
-            $this->aExcludes[$sMethod] = new Data\ExcludeData();
-        }
-        return $this->aExcludes[$sMethod];
-    }
+public function exclude(string $sMethod = '*'): Data\ExcludeData
+{
+if(!isset($this->aExcludes[$sMethod]))
+{
+$this->aExcludes[$sMethod] = new Data\ExcludeData();
+}
+return $this->aExcludes[$sMethod];
+}
 
-    /**
+/**
      * @param string $sMethod
      *
      * @return Data\ContainerData
      */
-    public function container(string $sMethod = '*'): Data\ContainerData
-    {
-        if(!isset($this->aContainers[$sMethod]))
-        {
-            $this->aContainers[$sMethod] = new Data\ContainerData();
-        }
-        return $this->aContainers[$sMethod];
-    }
+public function container(string $sMethod = '*'): Data\ContainerData
+{
+if(!isset($this->aContainers[$sMethod]))
+{
+$this->aContainers[$sMethod] = new Data\ContainerData();
+}
+return $this->aContainers[$sMethod];
+}
 
-    /**
+/**
      * @param string $sMethod
      *
      * @return Data\DatabagData
      */
-    public function databag(string $sMethod = '*'): Data\DatabagData
-    {
-        if(!isset($this->aDatabags[$sMethod]))
-        {
-            $this->aDatabags[$sMethod] = new Data\DatabagData();
-        }
-        return $this->aDatabags[$sMethod];
-    }
+public function databag(string $sMethod = '*'): Data\DatabagData
+{
+if(!isset($this->aDatabags[$sMethod]))
+{
+$this->aDatabags[$sMethod] = new Data\DatabagData();
+}
+return $this->aDatabags[$sMethod];
+}
 
-    /**
+/**
      * @param string $sMethod
      *
      * @return Data\CallbackData
      */
-    public function callback(string $sMethod = '*'): Data\CallbackData
-    {
-        if(!isset($this->aCallbacks[$sMethod]))
-        {
-            $this->aCallbacks[$sMethod] = new Data\CallbackData();
-        }
-        return $this->aCallbacks[$sMethod];
-    }
+public function callback(string $sMethod = '*'): Data\CallbackData
+{
+if(!isset($this->aCallbacks[$sMethod]))
+{
+$this->aCallbacks[$sMethod] = new Data\CallbackData();
+}
+return $this->aCallbacks[$sMethod];
+}
 
-    /**
+/**
      * @param string $sMethod
      *
      * @return Data\BeforeData
      */
-    public function before(string $sMethod = '*'): Data\BeforeData
-    {
-        if(!isset($this->aBefores[$sMethod]))
-        {
-            $this->aBefores[$sMethod] = new Data\BeforeData();
-        }
-        return $this->aBefores[$sMethod];
-    }
+public function before(string $sMethod = '*'): Data\BeforeData
+{
+if(!isset($this->aBefores[$sMethod]))
+{
+$this->aBefores[$sMethod] = new Data\BeforeData();
+}
+return $this->aBefores[$sMethod];
+}
 
-    /**
+/**
      * @param string $sMethod
      *
      * @return Data\AfterData
      */
-    public function after(string $sMethod = '*'): Data\AfterData
-    {
-        if(!isset($this->aAfters[$sMethod]))
-        {
-            $this->aAfters[$sMethod] = new Data\AfterData();
-        }
-        return $this->aAfters[$sMethod];
-    }
+public function after(string $sMethod = '*'): Data\AfterData
+{
+if(!isset($this->aAfters[$sMethod]))
+{
+$this->aAfters[$sMethod] = new Data\AfterData();
+}
+return $this->aAfters[$sMethod];
+}
 
-    /**
+/**
      * @param string $sMethod
      *
      * @return Data\UploadData
      */
-    public function upload(string $sMethod = '*'): Data\UploadData
-    {
-        if(!isset($this->aUploads[$sMethod]))
-        {
-            $this->aUploads[$sMethod] = new Data\UploadData();
-        }
-        return $this->aUploads[$sMethod];
-    }
+public function upload(string $sMethod = '*'): Data\UploadData
+{
+if(!isset($this->aUploads[$sMethod]))
+{
+$this->aUploads[$sMethod] = new Data\UploadData();
+}
+return $this->aUploads[$sMethod];
+}
 
-    /**
+/**
      * @inheritDoc
      */
-    public function isExcluded(): bool
-    {
-        return isset($this->aExcludes['*']) && $this->aExcludes['*']->getValue() === true;
-    }
+public function isExcluded(): bool
+{
+return isset($this->aExcludes['*']) && $this->aExcludes['*']->getValue() === true;
+}
 
-    /**
+/**
      * @inheritDoc
      */
-    public function getProperties(): array
-    {
-        $aAttributes = [
-            // $this->aExcludes,
-            $this->aContainers,
-            $this->aDatabags,
-            $this->aCallbacks,
-            $this->aBefores,
-            $this->aAfters,
-            $this->aUploads,
-        ];
-        $aProperties = [];
-        $aClassProperties = [];
+public function getProperties(): array
+{
+$aAttributes = [
+// $this->aExcludes,
+$this->aContainers,
+$this->aDatabags,
+$this->aCallbacks,
+$this->aBefores,
+$this->aAfters,
+$this->aUploads,
+];
+$aProperties = [];
+$aClassProperties = [];
 
-        foreach($aAttributes as $aValues)
-        {
-            foreach($aValues as $sMethod => $xData)
-            {
-                if($sMethod === '*')
-                {
-                    $aClassProperties[$xData->getName()] = $xData->getValue();
-                    continue;
-                }
-                $aProperties[$sMethod][$xData->getName()] = $xData->getValue();
-            }
-        }
+foreach($aAttributes as $aValues)
+{
+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;
-        }
+if(count($aClassProperties) > 0)
+{
+$aProperties['*'] = $aClassProperties;
+}
 
-        return $aProperties;
-    }
+return $aProperties;
+}
 
-    /**
+/**
      * @inheritDoc
      */
-    public function getProtectedMethods(): array
-    {
-        $aMethods = array_keys($this->aExcludes);
-        return array_values(array_filter($aMethods, fn(string $sName) =>
-            $sName !== '*' && $this->aExcludes[$sName]->getValue() === true));
-    }
+public function getProtectedMethods(): array
+{
+$aMethods = array_keys($this->aExcludes);
+return array_values(array_filter($aMethods, fn(string $sName) =>
+$sName !== '*' && $this->aExcludes[$sName]->getValue() === true));
+}
 
-    /**
+/**
      * @return array
      */
-    public function encode(): array
-    {
-        $aAttributes = [
-            'exclude' => $this->aExcludes,
-            'container' => $this->aContainers,
-            'databag' => $this->aDatabags,
-            'callback' => $this->aCallbacks,
-            'before' => $this->aBefores,
-            'after' => $this->aAfters,
-            'upload' => $this->aUploads,
-        ];
+public function encode(): array
+{
+$aAttributes = [
+'exclude' => $this->aExcludes,
+'container' => $this->aContainers,
+'databag' => $this->aDatabags,
+'callback' => $this->aCallbacks,
+'before' => $this->aBefores,
+'after' => $this->aAfters,
+'upload' => $this->aUploads,
+];
 
-        $sVar = '$'; // The dollar car.
-        $aCalls = [
-            "{$sVar}xMetadata = new " . Metadata::class . '();'
-        ];
-        foreach($aAttributes as $sAttr => $aValues)
-        {
-            if(count($aValues) === 0)
-            {
-                continue;
-            }
-            foreach($aValues as $sMethod => $xData)
-            {
-                $aCalls[] = "{$sVar}xData = {$sVar}xMetadata->{$sAttr}('$sMethod');";
-                foreach($xData->encode("{$sVar}xData") as $sCall)
-                {
-                    $aCalls[] = $sCall;
-                }
-            }
-        }
-        $aCalls[] = "return {$sVar}xMetadata;";
-        return $aCalls;
+$sVar = '$'; // The dollar car.
+$aCalls = [
+"{$sVar}xMetadata = new " . Metadata::class . '();'
+];
+foreach($aAttributes as $sAttr => $aValues)
+{
+if(count($aValues) === 0)
+{
+    continue;
+}
+foreach($aValues as $sMethod => $xData)
+{
+    $aCalls[] = "{$sVar}xData = {$sVar}xMetadata->{$sAttr}('$sMethod');";
+    foreach($xData->encode("{$sVar}xData") as $sCall)
+    {
+        $aCalls[] = $sCall;
     }
 }
+}
+$aCalls[] = "return {$sVar}xMetadata;";
+return $aCalls;
+}
+}

Spacing +15 added lines, -15 removed lines

@@ -72,7 +72,7 @@ 
      */
     public function exclude(string $sMethod = '*'): Data\ExcludeData
     {
-        if(!isset($this->aExcludes[$sMethod]))
+        if (!isset($this->aExcludes[$sMethod]))
         {
             $this->aExcludes[$sMethod] = new Data\ExcludeData();
         }
@@ -86,7 +86,7 @@ 
      */
     public function container(string $sMethod = '*'): Data\ContainerData
     {
-        if(!isset($this->aContainers[$sMethod]))
+        if (!isset($this->aContainers[$sMethod]))
         {
             $this->aContainers[$sMethod] = new Data\ContainerData();
         }
@@ -100,7 +100,7 @@ 
      */
     public function databag(string $sMethod = '*'): Data\DatabagData
     {
-        if(!isset($this->aDatabags[$sMethod]))
+        if (!isset($this->aDatabags[$sMethod]))
         {
             $this->aDatabags[$sMethod] = new Data\DatabagData();
         }
@@ -114,7 +114,7 @@ 
      */
     public function callback(string $sMethod = '*'): Data\CallbackData
     {
-        if(!isset($this->aCallbacks[$sMethod]))
+        if (!isset($this->aCallbacks[$sMethod]))
         {
             $this->aCallbacks[$sMethod] = new Data\CallbackData();
         }
@@ -128,7 +128,7 @@ 
      */
     public function before(string $sMethod = '*'): Data\BeforeData
     {
-        if(!isset($this->aBefores[$sMethod]))
+        if (!isset($this->aBefores[$sMethod]))
         {
             $this->aBefores[$sMethod] = new Data\BeforeData();
         }
@@ -142,7 +142,7 @@ 
      */
     public function after(string $sMethod = '*'): Data\AfterData
     {
-        if(!isset($this->aAfters[$sMethod]))
+        if (!isset($this->aAfters[$sMethod]))
         {
             $this->aAfters[$sMethod] = new Data\AfterData();
         }
@@ -156,7 +156,7 @@ 
      */
     public function upload(string $sMethod = '*'): Data\UploadData
     {
-        if(!isset($this->aUploads[$sMethod]))
+        if (!isset($this->aUploads[$sMethod]))
         {
             $this->aUploads[$sMethod] = new Data\UploadData();
         }
@@ -188,11 +188,11 @@ 
         $aProperties = [];
         $aClassProperties = [];
 
-        foreach($aAttributes as $aValues)
+        foreach ($aAttributes as $aValues)
         {
-            foreach($aValues as $sMethod => $xData)
+            foreach ($aValues as $sMethod => $xData)
             {
-                if($sMethod === '*')
+                if ($sMethod === '*')
                 {
                     $aClassProperties[$xData->getName()] = $xData->getValue();
                     continue;
@@ -201,7 +201,7 @@ 
             }
         }
 
-        if(count($aClassProperties) > 0)
+        if (count($aClassProperties) > 0)
         {
             $aProperties['*'] = $aClassProperties;
         }
@@ -238,16 +238,16 @@ 
         $aCalls = [
             "{$sVar}xMetadata = new " . Metadata::class . '();'
         ];
-        foreach($aAttributes as $sAttr => $aValues)
+        foreach ($aAttributes as $sAttr => $aValues)
         {
-            if(count($aValues) === 0)
+            if (count($aValues) === 0)
             {
                 continue;
             }
-            foreach($aValues as $sMethod => $xData)
+            foreach ($aValues as $sMethod => $xData)
             {
                 $aCalls[] = "{$sVar}xData = {$sVar}xMetadata->{$sAttr}('$sMethod');";
-                foreach($xData->encode("{$sVar}xData") as $sCall)
+                foreach ($xData->encode("{$sVar}xData") as $sCall)
                 {
                     $aCalls[] = $sCall;
                 }

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

Switch Indentation +24 added lines, -24 removed lines

@@ -16,44 +16,44 @@
 
 class ExcludeData extends AbstractData
 {
-    /**
+/**
      * @var bool
      */
-    private bool $bValue = true;
+private bool $bValue = true;
 
-    /**
+/**
      * @return string
      */
-    public function getName(): string
-    {
-        return 'protected';
-    }
+public function getName(): string
+{
+return 'protected';
+}
 
-    /**
+/**
      * @return mixed
      */
-    public function getValue(): mixed
-    {
-        return $this->bValue;
-    }
+public function getValue(): mixed
+{
+return $this->bValue;
+}
 
-    /**
+/**
      * @param bool $bValue
      *
      * @return void
      */
-    public function setValue(bool $bValue): void
-    {
-        $this->bValue = $bValue;
-    }
+public function setValue(bool $bValue): void
+{
+$this->bValue = $bValue;
+}
 
-    /**
+/**
      * @inheritDoc
      */
-    public function encode(string $sVarName): array
-    {
-        return [
-            "{$sVarName}->setValue(" . ($this->bValue ? 'true' : 'false') . ");",
-        ];
-    }
+public function encode(string $sVarName): array
+{
+return [
+"{$sVarName}->setValue(" . ($this->bValue ? 'true' : 'false') . ");",
+];
+}
 }

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

Switch Indentation +41 added lines, -41 removed lines

@@ -21,71 +21,71 @@
 
 abstract class HookData extends AbstractData
 {
-    /**
+/**
      * @var array
      */
-    protected $aCalls = [];
+protected $aCalls = [];
 
-    /**
+/**
      * @return string
      */
-    abstract protected function getType(): string;
+abstract protected function getType(): string;
 
-    /**
+/**
      * @return string
      */
-    public function getName(): string
-    {
-        return '__' . $this->getType();
-    }
+public function getName(): string
+{
+return '__' . $this->getType();
+}
 
-    /**
+/**
      * @return mixed
      */
-    public function getValue(): mixed
-    {
-        return $this->aCalls;
-    }
+public function getValue(): mixed
+{
+return $this->aCalls;
+}
 
-    /**
+/**
      * @param string $sMethod
      *
      * @return void
      */
-    protected function validateMethod(string $sMethod): void
-    {
-        if(preg_match('/^[a-zA-Z][a-zA-Z0-9_]*$/', $sMethod) > 0)
-        {
-            return;
-        }
-        $sType = $this->getType();
-        throw new SetupException("$sMethod is not a valid \"call\" value for $sType.");
-    }
+protected function validateMethod(string $sMethod): void
+{
+if(preg_match('/^[a-zA-Z][a-zA-Z0-9_]*$/', $sMethod) > 0)
+{
+return;
+}
+$sType = $this->getType();
+throw new SetupException("$sMethod is not a valid \"call\" value for $sType.");
+}
 
-    /**
+/**
      * @param string $sMethod
      * @param array $aParams
      *
      * @return void
      */
-    public function addCall(string $sMethod, array $aParams): void
-    {
-        $this->validateMethod($sMethod);
+public function addCall(string $sMethod, array $aParams): void
+{
+$this->validateMethod($sMethod);
 
-        $this->aCalls[$sMethod] = $aParams;
-    }
+$this->aCalls[$sMethod] = $aParams;
+}
 
-    /**
+/**
      * @inheritDoc
      */
-    public function encode(string $sVarName): array
-    {
-        $aCalls = [];
-        foreach($this->aCalls as $sMethod => $aParams)
-        {
-            $sParams = addslashes(json_encode($aParams));
-            $aCalls[] = "{$sVarName}->addCall('$sMethod', json_decode(\"$sParams\", true));";
-        }
-        return $aCalls;
-    }
+public function encode(string $sVarName): array
+{
+$aCalls = [];
+foreach($this->aCalls as $sMethod => $aParams)
+{
+$sParams = addslashes(json_encode($aParams));
+$aCalls[] = "{$sVarName}->addCall('$sMethod', json_decode(\"$sParams\", true));";
+}
+return $aCalls;
+}
 }

Spacing +2 added lines, -2 removed lines

@@ -54,7 +54,7 @@ 
      */
     protected function validateMethod(string $sMethod): void
     {
-        if(preg_match('/^[a-zA-Z][a-zA-Z0-9_]*$/', $sMethod) > 0)
+        if (preg_match('/^[a-zA-Z][a-zA-Z0-9_]*$/', $sMethod) > 0)
         {
             return;
         }
@@ -81,7 +81,7 @@ 
     public function encode(string $sVarName): array
     {
         $aCalls = [];
-        foreach($this->aCalls as $sMethod => $aParams)
+        foreach ($this->aCalls as $sMethod => $aParams)
         {
             $sParams = addslashes(json_encode($aParams));
             $aCalls[] = "{$sVarName}->addCall('$sMethod', json_decode(\"$sParams\", true));";

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

Switch Indentation +32 added lines, -32 removed lines

@@ -21,60 +21,60 @@
 
 class CallbackData extends AbstractData
 {
-    /**
+/**
      * The callback js objects
      *
      * @var string
      */
-    protected $aNames = [];
+protected $aNames = [];
 
-    /**
+/**
      * @return string
      */
-    public function getName(): string
-    {
-        return 'callback';
-    }
+public function getName(): string
+{
+return 'callback';
+}
 
-    /**
+/**
      * @return mixed
      */
-    public function getValue(): mixed
-    {
-        return $this->aNames;
-    }
+public function getValue(): mixed
+{
+return $this->aNames;
+}
 
-    /**
+/**
      * @param string $sName
      *
      * @return void
      */
-    protected function validateObjectName(string $sName): void
-    {
-        if(preg_match('/^[a-zA-Z][a-zA-Z0-9_\-\.]*$/', $sName) > 0)
-        {
-            return;
-        }
-        throw new SetupException("$sName is not a valid \"name\" value for callback");
-    }
+protected function validateObjectName(string $sName): void
+{
+if(preg_match('/^[a-zA-Z][a-zA-Z0-9_\-\.]*$/', $sName) > 0)
+{
+return;
+}
+throw new SetupException("$sName is not a valid \"name\" value for callback");
+}
 
-    /**
+/**
      * @param string $sName
      *
      * @return void
      */
-    public function addValue(string $sName): void
-    {
-        $this->validateObjectName($sName);
+public function addValue(string $sName): void
+{
+$this->validateObjectName($sName);
 
-        $this->aNames[] = $sName;
-    }
+$this->aNames[] = $sName;
+}
 
-    /**
+/**
      * @inheritDoc
      */
-    public function encode(string $sVarName): array
-    {
-        return array_map(fn($sName) => "{$sVarName}->addValue('$sName');", $this->aNames);
-    }
+public function encode(string $sVarName): array
+{
+return array_map(fn($sName) => "{$sVarName}->addValue('$sName');", $this->aNames);
+}
 }

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

Switch Indentation +35 added lines, -35 removed lines

@@ -20,63 +20,63 @@
 
 class UploadData extends AbstractData
 {
-    /**
+/**
      * The id of the upload field
      *
      * @var string
      */
-    protected $sField = '';
+protected $sField = '';
 
-    /**
+/**
      * @return string
      */
-    public function getName(): string
-    {
-        return 'upload';
-    }
+public function getName(): string
+{
+return 'upload';
+}
 
-    /**
+/**
      * @return mixed
      */
-    public function getValue(): mixed
-    {
-        // The field id is surrounded with simple quotes.
-        return "'{$this->sField}'";
-    }
+public function getValue(): mixed
+{
+// The field id is surrounded with simple quotes.
+return "'{$this->sField}'";
+}
 
-    /**
+/**
      * @param string $sField
      *
      * @return void
      */
-    protected function validateField(string $sField): void
-    {
-        if(preg_match('/^[a-zA-Z][a-zA-Z0-9_\-\.]*$/', $sField) > 0)
-        {
-            return;
-        }
-        throw new SetupException("$sField is not a valid \"field\" value for upload");
-    }
+protected function validateField(string $sField): void
+{
+if(preg_match('/^[a-zA-Z][a-zA-Z0-9_\-\.]*$/', $sField) > 0)
+{
+return;
+}
+throw new SetupException("$sField is not a valid \"field\" value for upload");
+}
 
-    /**
+/**
      * @param string $sField
      *
      * @return void
      */
-    public function setValue(string $sField): void
-    {
-        $this->validateField($sField);
+public function setValue(string $sField): void
+{
+$this->validateField($sField);
 
-        $this->sField = $sField;
-    }
+$this->sField = $sField;
+}
 
-    /**
+/**
      * @inheritDoc
      */
-    public function encode(string $sVarName): array
-    {
-        return [
-            "{$sVarName}->setValue('{$this->sField}');",
-        ];
-    }
+public function encode(string $sVarName): array
+{
+return [
+"{$sVarName}->setValue('{$this->sField}');",
+];
+}
 }

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

Switch Indentation +48 added lines, -48 removed lines

@@ -21,83 +21,83 @@
 
 class ContainerData extends AbstractData
 {
-    /**
+/**
      * The properties to get from the container
      *
      * @var string
      */
-    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)
-        {
-            $sClass = addslashes($sClass);
-            $aCalls[] = "{$sVarName}->addValue('$sAttr', '$sClass');";
-        }
+public function encode(string $sVarName): array
+{
+$aCalls = [];
+foreach($this->aProperties as $sAttr => $sClass)
+{
+$sClass = addslashes($sClass);
+$aCalls[] = "{$sVarName}->addValue('$sAttr', '$sClass');";
+}
 
-        return $aCalls;
-    }
+return $aCalls;
+}
 }

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)
         {
             $sClass = addslashes($sClass);
             $aCalls[] = "{$sVarName}->addValue('$sAttr', '$sClass');";

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

Switch Indentation +2 added lines, -2 removed lines

@@ -16,12 +16,12 @@
 
 abstract class AbstractData
 {
-    /**
+/**
      * Generate the PHP code to populate a Metadata object
      *
      * @param string $sVarName
      *
      * @return array
      */
-    abstract public function encode(string $sVarName): array;
+abstract public function encode(string $sVarName): array;
 }