jaxon-php / jaxon-mono

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

Spacing +3 added lines, -3 removed lines

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

Switch Indentation +46 added lines, -46 removed lines

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

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

Spacing +3 added lines, -3 removed lines

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

Switch Indentation +47 added lines, -47 removed lines

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

jaxon-core/src/Plugin/ResponsePluginInterface.php

Switch Indentation +4 added lines, -4 removed lines

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

jaxon-core/src/Plugin/CallableRegistryInterface.php

Switch Indentation +6 added lines, -6 removed lines

@@ -4,7 +4,7 @@ 
 
 interface CallableRegistryInterface
 {
-    /**
+/**
      * Check if the provided options are correct, and convert them into an array.
      *
      * @param string $sCallable
@@ -12,9 +12,9 @@ 
      *
      * @return array
      */
-    public function checkOptions(string $sCallable, $xOptions): array;
+public function checkOptions(string $sCallable, $xOptions): array;
 
-    /**
+/**
      * Register a callable entity: a function or a class.
      *
      * Called by the <Jaxon\Plugin\RequestManager> when a user script
@@ -27,14 +27,14 @@ 
      *
      * @return bool
      */
-    public function register(string $sType, string $sCallable, array $aOptions): bool;
+public function register(string $sType, string $sCallable, array $aOptions): bool;
 
-    /**
+/**
      * Get the callable object for a registered item
      *
      * @param string $sCallable
      *
      * @return mixed
      */
-    public function getCallable(string $sCallable): mixed;
+public function getCallable(string $sCallable): mixed;
 }

jaxon-core/src/Plugin/Code/JsCode.php

Switch Indentation +8 added lines, -8 removed lines

@@ -16,31 +16,31 @@
 
 class JsCode
 {
-    /**
+/**
      * The main javascript code
      *
      * @var string
      */
-    public $sJs = '';
+public $sJs = '';
 
-    /**
+/**
      * The js files
      *
      * @var array
      */
-    public $aFiles = [];
+public $aFiles = [];
 
-    /**
+/**
      * The javascript code to be inserted inline before the main code
      *
      * @var string
      */
-    public $sJsBefore = '';
+public $sJsBefore = '';
 
-    /**
+/**
      * The javascript code to be inserted inline after the main code
      *
      * @var string
      */
-    public $sJsAfter = '';
+public $sJsAfter = '';
 }

jaxon-core/src/Plugin/Code/ReadyScriptGenerator.php

Switch Indentation +5 added lines, -5 removed lines

@@ -18,11 +18,11 @@
 
 class ReadyScriptGenerator extends AbstractCodeGenerator
 {
-    /**
+/**
      * @inheritDoc
      */
-    public function getScript(): string
-    {
-        return "jaxon.dom.ready(() => jaxon.processCustomAttrs());";
-    }
+public function getScript(): string
+{
+return "jaxon.dom.ready(() => jaxon.processCustomAttrs());";
+}
 }

jaxon-core/src/Plugin/Code/MinifierInterface.php

Switch Indentation +2 added lines, -2 removed lines

@@ -4,7 +4,7 @@ 
 
 interface MinifierInterface
 {
-    /**
+/**
      * Minify javascript code
      *
      * @param string $sJsFile The javascript file to be minified
@@ -12,5 +12,5 @@ 
      *
      * @return bool
      */
-    public function minify(string $sJsFile, string $sMinFile): bool;
+public function minify(string $sJsFile, string $sMinFile): bool;
 }

jaxon-core/src/Plugin/Response/Pagination/PaginatorPlugin.php

Switch Indentation +30 added lines, -30 removed lines

@@ -43,60 +43,60 @@ 
  */
 class PaginatorPlugin extends AbstractResponsePlugin
 {
-    /**
+/**
      * @const The plugin name
      */
-    public const NAME = 'pg';
+public const NAME = 'pg';
 
-    /**
+/**
      * The constructor.
      *
      * @param RendererInterface $xRenderer
      */
-    public function __construct(protected RendererInterface $xRenderer)
-    {}
+public function __construct(protected RendererInterface $xRenderer)
+{}
 
-    /**
+/**
      * @inheritDoc
      */
-    public function getName(): string
-    {
-        return self::NAME;
-    }
+public function getName(): string
+{
+return self::NAME;
+}
 
-    /**
+/**
      * @inheritDoc
      */
-    public function getHash(): string
-    {
-        return '5.0.0'; // Use the version number as hash
-    }
+public function getHash(): string
+{
+return '5.0.0'; // Use the version number as hash
+}
 
-    /**
+/**
      * @inheritDoc
      */
-    public function getCss(): string
-    {
-        return '
+public function getCss(): string
+{
+return '
 <style>
   .pagination li a {
     cursor: pointer;
   }
 </style>
 ';
-    }
+}
 
-    /**
+/**
      * Get the view renderer
      *
      * @return RendererInterface
      */
-    public function renderer(): RendererInterface
-    {
-        return $this->xRenderer;
-    }
+public function renderer(): RendererInterface
+{
+return $this->xRenderer;
+}
 
-    /**
+/**
      * Create a paginator
      *
      * @param int $nPageNumber     The current page number
@@ -105,8 +105,8 @@ 
      *
      * @return Paginator
      */
-    public function paginator(int $nPageNumber, int $nItemsPerPage, int $nTotalItems): Paginator
-    {
-        return new Paginator($this, $nPageNumber, $nItemsPerPage, $nTotalItems);
-    }
+public function paginator(int $nPageNumber, int $nItemsPerPage, int $nTotalItems): Paginator
+{
+return new Paginator($this, $nPageNumber, $nItemsPerPage, $nTotalItems);
+}
 }

jaxon-core/src/Plugin/Response/Script/ScriptPlugin.php

Switch Indentation +47 added lines, -47 removed lines

@@ -26,56 +26,56 @@ 
 
 class ScriptPlugin extends AbstractResponsePlugin
 {
-    /**
+/**
      * @const The plugin name
      */
-    public const NAME = 'script';
+public const NAME = 'script';
 
-    /**
+/**
      * The class constructor
      *
      * @param CallFactory $xFactory
      */
-    public function __construct(private CallFactory $xFactory)
-    {}
+public function __construct(private CallFactory $xFactory)
+{}
 
-    /**
+/**
      * @return Closure
      */
-    private function getCallback(): Closure
-    {
-        // The closure needs to capture the response object the script plugin is called with.
-        $xResponse = $this->response();
-        return function(JsExpr $xJsExpr) use($xResponse) {
-            // Add the newly created expression to the response
-            $aOptions = [
-                'expr' => $xJsExpr,
-                'context' => is_a($xResponse, NodeResponse::class) ?
-                    ['component' => true] : [],
-            ];
-            $xResponse->addCommand('script.exec.expr', $aOptions)
-                ->setOption('plugin', $this->getName());
-        };
-    }
+private function getCallback(): Closure
+{
+// The closure needs to capture the response object the script plugin is called with.
+$xResponse = $this->response();
+return function(JsExpr $xJsExpr) use($xResponse) {
+// Add the newly created expression to the response
+$aOptions = [
+    'expr' => $xJsExpr,
+    'context' => is_a($xResponse, NodeResponse::class) ?
+        ['component' => true] : [],
+];
+$xResponse->addCommand('script.exec.expr', $aOptions)
+    ->setOption('plugin', $this->getName());
+};
+}
 
-    /**
+/**
      * @inheritDoc
      */
-    public function getName(): string
-    {
-        return self::NAME;
-    }
+public function getName(): string
+{
+return self::NAME;
+}
 
-    /**
+/**
      * @inheritDoc
      */
-    public function getHash(): string
-    {
-        // Use the version number as hash
-        return '5.0.0';
-    }
+public function getHash(): string
+{
+// Use the version number as hash
+return '5.0.0';
+}
 
-    /**
+/**
      * Create a JQuery selector expression, and link it to the current response.
      *
      * @param string $sPath    The jQuery selector path
@@ -83,32 +83,32 @@ 
      *
      * @return JqSelectorCall
      */
-    public function jq(string $sPath = '', $xContext = null): JqSelectorCall
-    {
-        return $this->xFactory->jq($sPath, $xContext, $this->getCallback());
-    }
+public function jq(string $sPath = '', $xContext = null): JqSelectorCall
+{
+return $this->xFactory->jq($sPath, $xContext, $this->getCallback());
+}
 
-    /**
+/**
      * Create a Javascript object expression, and link it to the current response.
      *
      * @param string $sObject
      *
      * @return JsObjectCall
      */
-    public function jo(string $sObject = ''): JsObjectCall
-    {
-        return $this->xFactory->jo($sObject, $this->getCallback());
-    }
+public function jo(string $sObject = ''): JsObjectCall
+{
+return $this->xFactory->jo($sObject, $this->getCallback());
+}
 
-    /**
+/**
      * Create a Javascript element selector expression, and link it to the current response.
      *
      * @param string $sElementId
      *
      * @return JsSelectorCall
      */
-    public function je(string $sElementId = ''): JsSelectorCall
-    {
-        return $this->xFactory->je($sElementId, $this->getCallback());
-    }
+public function je(string $sElementId = ''): JsSelectorCall
+{
+return $this->xFactory->je($sElementId, $this->getCallback());
+}
 }