jaxon-php / jaxon-mono

jaxon-utils/src/Template/Context.php

Spacing +5 added lines, -6 removed lines

@@ -138,13 +138,13 @@ 
         // Get the namespace name
         $namespace = $this->__default_namespace__;
         $separatorPosition = strrpos($template, '::');
-        if($separatorPosition !== false)
+        if ($separatorPosition !== false)
         {
             $namespace = substr($template, 0, $separatorPosition);
             $template = substr($template, $separatorPosition + 2);
         }
         // Check if the namespace is defined
-        if(!isset($this->__namespaces__[$namespace]))
+        if (!isset($this->__namespaces__[$namespace]))
         {
             return $template;
         }
@@ -165,13 +165,13 @@ 
     {
         // Get the template path
         $templatePath = $this->__path();
-        if(!@is_readable($templatePath))
+        if (!@is_readable($templatePath))
         {
             return '';
         }
 
         // Save the template properties.
-        foreach($vars as $name => $value)
+        foreach ($vars as $name => $value)
         {
             $this->__set((string)$name, $value);
         }
@@ -182,8 +182,7 @@ 
             include $templatePath;
             $content = ob_get_clean();
 
-            return $this->__extends__ === null ? $content :
-                // Render the extended template with the same properties.
+            return $this->__extends__ === null ? $content : // Render the extended template with the same properties.
                 $this->__extends__->__render($this->__properties__);
         };
 

Switch Indentation +100 added lines, -100 removed lines

@@ -30,54 +30,54 @@ 
 
 class Context
 {
-    /**
+/**
      * @var Context|null
      */
-    private $__extends__ = null;
+private $__extends__ = null;
 
-    /**
+/**
      * @var string
      */
-    private $__block_name__;
+private $__block_name__;
 
-    /**
+/**
      * @var array
      */
-    private $__properties__ = [];
+private $__properties__ = [];
 
-    /**
+/**
      * The constructor
      *
      * @param array $__namespaces__
      * @param string $__default_namespace__
      * @param string $__template__
      */
-    public function __construct(protected array $__namespaces__,
-        protected string $__default_namespace__, protected string $__template__)
-    {}
+public function __construct(protected array $__namespaces__,
+protected string $__default_namespace__, protected string $__template__)
+{}
 
-    /**
+/**
      * @param string $name
      *
      * @return mixed
      */
-    public function __get(string $name): mixed
-    {
-        return $this->__properties__[$name] ?? '';
-    }
+public function __get(string $name): mixed
+{
+return $this->__properties__[$name] ?? '';
+}
 
-    /**
+/**
      * @param string $name
      * @param mixed $value
      *
      * @return void
      */
-    public function __set(string $name, $value): void
-    {
-        $this->__properties__[$name] = $value;
-    }
+public function __set(string $name, $value): void
+{
+$this->__properties__[$name] = $value;
+}
 
-    /**
+/**
      * Include a template
      *
      * @param string $template The name of template to be rendered
@@ -85,110 +85,110 @@ 
      *
      * @return void
      */
-    protected function include(string $template, array $vars = []): void
-    {
-        $context = new Context($this->__namespaces__,
-            $this->__default_namespace__, $template);
-        echo $context->__render($vars);
-    }
-
-    /**
+protected function include(string $template, array $vars = []): void
+{
+$context = new Context($this->__namespaces__,
+$this->__default_namespace__, $template);
+echo $context->__render($vars);
+}
+
+/**
      * @param string $template The name of template to be rendered
      *
      * @return void
      */
-    public function extends(string $template): void
-    {
-        $this->__extends__ = new Context($this->__namespaces__,
-            $this->__default_namespace__, $template);
-    }
+public function extends(string $template): void
+{
+$this->__extends__ = new Context($this->__namespaces__,
+$this->__default_namespace__, $template);
+}
 
-    /**
+/**
      * Start a new block
      *
      * @param string $name
      *
      * @return void
      */
-    public function block(string $name): void
-    {
-        ob_start();
-        $this->__block_name__ = $name;
-    }
+public function block(string $name): void
+{
+ob_start();
+$this->__block_name__ = $name;
+}
 
-    /**
+/**
      * End the current block
      *
      * @param Closure|null $filter
      *
      * @return void
      */
-    public function endblock(?Closure $filter = null): void
-    {
-        $content = ob_get_clean();
-        $this->__set($this->__block_name__, !$filter ? $content : $filter($content));
-    }
+public function endblock(?Closure $filter = null): void
+{
+$content = ob_get_clean();
+$this->__set($this->__block_name__, !$filter ? $content : $filter($content));
+}
 
-    /**
+/**
      * @return string
      */
-    private function __path(): string
-    {
-        $template = trim($this->__template__);
-        // Get the namespace name
-        $namespace = $this->__default_namespace__;
-        $separatorPosition = strrpos($template, '::');
-        if($separatorPosition !== false)
-        {
-            $namespace = substr($template, 0, $separatorPosition);
-            $template = substr($template, $separatorPosition + 2);
-        }
-        // Check if the namespace is defined
-        if(!isset($this->__namespaces__[$namespace]))
-        {
-            return $template;
-        }
-
-        $namespace = $this->__namespaces__[$namespace];
-        // Get the template path
-        return $namespace['directory'] . $template . $namespace['extension'];
-    }
-
-    /**
+private function __path(): string
+{
+$template = trim($this->__template__);
+// Get the namespace name
+$namespace = $this->__default_namespace__;
+$separatorPosition = strrpos($template, '::');
+if($separatorPosition !== false)
+{
+$namespace = substr($template, 0, $separatorPosition);
+$template = substr($template, $separatorPosition + 2);
+}
+// Check if the namespace is defined
+if(!isset($this->__namespaces__[$namespace]))
+{
+return $template;
+}
+
+$namespace = $this->__namespaces__[$namespace];
+// Get the template path
+return $namespace['directory'] . $template . $namespace['extension'];
+}
+
+/**
      * Render a template
      *
      * @param array $vars The template vars
      *
      * @return string
      */
-    public function __render(array $vars): string
-    {
-        // Get the template path
-        $templatePath = $this->__path();
-        if(!@is_readable($templatePath))
-        {
-            return '';
-        }
-
-        // Save the template properties.
-        foreach($vars as $name => $value)
-        {
-            $this->__set((string)$name, $value);
-        }
-
-        // Render the template
-        $renderer = function() use($templatePath) {
-            ob_start();
-            include $templatePath;
-            $content = ob_get_clean();
-
-            return $this->__extends__ === null ? $content :
-                // Render the extended template with the same properties.
-                $this->__extends__->__render($this->__properties__);
-        };
-
-        // Call the closure in the context of this object.
-        // So the keyword '$this' in the template will refer to this object.
-        return call_user_func($renderer->bindTo($this));
-    }
+public function __render(array $vars): string
+{
+// Get the template path
+$templatePath = $this->__path();
+if(!@is_readable($templatePath))
+{
+return '';
+}
+
+// Save the template properties.
+foreach($vars as $name => $value)
+{
+$this->__set((string)$name, $value);
+}
+
+// Render the template
+$renderer = function() use($templatePath) {
+ob_start();
+include $templatePath;
+$content = ob_get_clean();
+
+return $this->__extends__ === null ? $content :
+    // Render the extended template with the same properties.
+    $this->__extends__->__render($this->__properties__);
+};
+
+// Call the closure in the context of this object.
+// So the keyword '$this' in the template will refer to this object.
+return call_user_func($renderer->bindTo($this));
+}
 }

jaxon-utils/src/Translation/Translator.php

Spacing +12 added lines, -12 removed lines

@@ -56,7 +56,7 @@ 
      */
     public function setLocale(string $sLocale): void
     {
-        if(($sLocale = trim($sLocale)))
+        if (($sLocale = trim($sLocale)))
         {
             $this->sDefaultLocale = $sLocale;
         }
@@ -73,11 +73,11 @@ 
      */
     private function _loadTranslations(string $sLanguage, string $sPrefix, array $aTranslations): void
     {
-        foreach($aTranslations as $sKey => $xTranslation)
+        foreach ($aTranslations as $sKey => $xTranslation)
         {
             $sKey = trim($sKey);
             $sKey = ($sPrefix) ? $sPrefix . '.' . $sKey : $sKey;
-            if(is_array($xTranslation))
+            if (is_array($xTranslation))
             {
                 // Recursively read the translations in the array
                 $this->_loadTranslations($sLanguage, $sKey, $xTranslation);
@@ -100,18 +100,18 @@ 
      */
     public function loadTranslations(string $sFilePath, string $sLanguage): bool
     {
-        if(!file_exists($sFilePath))
+        if (!file_exists($sFilePath))
         {
             return false;
         }
         $aTranslations = require($sFilePath);
-        if(!is_array($aTranslations))
+        if (!is_array($aTranslations))
         {
             return false;
         }
 
         // Load the translations
-        if(!isset($this->aTranslations[$sLanguage]))
+        if (!isset($this->aTranslations[$sLanguage]))
         {
             $this->aTranslations[$sLanguage] = [];
         }
@@ -133,16 +133,16 @@ 
     public function trans(string $sText, array $aPlaceHolders = [], string $sLanguage = ''): string
     {
         $sText = trim($sText);
-        if(empty($sLanguage))
+        if (empty($sLanguage))
         {
             $sLanguage = $this->sDefaultLocale;
         }
-        if(!isset($this->aTranslations[$sLanguage][$sText]))
+        if (!isset($this->aTranslations[$sLanguage][$sText]))
         {
             return $sText;
         }
         $sMessage = $this->aTranslations[$sLanguage][$sText];
-        if(!empty($aPlaceHolders))
+        if (!empty($aPlaceHolders))
         {
             $aVars = array_map(function($sVar) {
                 return ':' . $sVar;
@@ -162,16 +162,16 @@ 
      */
     public function translations(string $sKey, string $sLanguage = ''): array
     {
-        if(empty($sLanguage))
+        if (empty($sLanguage))
         {
             $sLanguage = $this->sDefaultLocale;
         }
         $aKeys = explode('.', $sKey);
 
         $aTranslations = $this->aRawTranslations[$sLanguage];
-        foreach($aKeys as $sKey)
+        foreach ($aKeys as $sKey)
         {
-            if($sKey !== '')
+            if ($sKey !== '')
             {
                 $aTranslations = $aTranslations[$sKey] ?? [];
             }

Braces +1 added lines, -2 removed lines

@@ -81,8 +81,7 @@
             {
                 // Recursively read the translations in the array
                 $this->_loadTranslations($sLanguage, $sKey, $xTranslation);
-            }
-            else
+            } else
             {
                 // Save this translation
                 $this->aTranslations[$sLanguage][$sKey] = $xTranslation;

Switch Indentation +95 added lines, -95 removed lines

@@ -26,43 +26,43 @@ 
 
 class Translator
 {
-    /**
+/**
      * The default locale
      *
      * @var string
      */
-    protected $sDefaultLocale = 'en';
+protected $sDefaultLocale = 'en';
 
-    /**
+/**
      * The translations in a flattened array
      *
      * @var array
      */
-    protected $aTranslations = [];
+protected $aTranslations = [];
 
-    /**
+/**
      * The translations as received as input
      *
      * @var array
      */
-    protected $aRawTranslations = [];
+protected $aRawTranslations = [];
 
-    /**
+/**
      * Set the default locale
      *
      * @param string $sLocale
      *
      * @return void
      */
-    public function setLocale(string $sLocale): void
-    {
-        if(($sLocale = trim($sLocale)))
-        {
-            $this->sDefaultLocale = $sLocale;
-        }
-    }
+public function setLocale(string $sLocale): void
+{
+if(($sLocale = trim($sLocale)))
+{
+$this->sDefaultLocale = $sLocale;
+}
+}
 
-    /**
+/**
      * Recursively load translated strings from an array
      *
      * @param string $sLanguage The language of the translations
@@ -71,26 +71,26 @@ 
      *
      * @return void
      */
-    private function _loadTranslations(string $sLanguage, string $sPrefix, array $aTranslations): void
-    {
-        foreach($aTranslations as $sKey => $xTranslation)
-        {
-            $sKey = trim($sKey);
-            $sKey = ($sPrefix) ? $sPrefix . '.' . $sKey : $sKey;
-            if(is_array($xTranslation))
-            {
-                // Recursively read the translations in the array
-                $this->_loadTranslations($sLanguage, $sKey, $xTranslation);
-            }
-            else
-            {
-                // Save this translation
-                $this->aTranslations[$sLanguage][$sKey] = $xTranslation;
-            }
-        }
-    }
+private function _loadTranslations(string $sLanguage, string $sPrefix, array $aTranslations): void
+{
+foreach($aTranslations as $sKey => $xTranslation)
+{
+$sKey = trim($sKey);
+$sKey = ($sPrefix) ? $sPrefix . '.' . $sKey : $sKey;
+if(is_array($xTranslation))
+{
+    // Recursively read the translations in the array
+    $this->_loadTranslations($sLanguage, $sKey, $xTranslation);
+}
+else
+{
+    // Save this translation
+    $this->aTranslations[$sLanguage][$sKey] = $xTranslation;
+}
+}
+}
 
-    /**
+/**
      * Load translated strings from a file
      *
      * @param string $sFilePath The file full path
@@ -98,30 +98,30 @@ 
      *
      * @return bool
      */
-    public function loadTranslations(string $sFilePath, string $sLanguage): bool
-    {
-        if(!file_exists($sFilePath))
-        {
-            return false;
-        }
-        $aTranslations = require($sFilePath);
-        if(!is_array($aTranslations))
-        {
-            return false;
-        }
+public function loadTranslations(string $sFilePath, string $sLanguage): bool
+{
+if(!file_exists($sFilePath))
+{
+return false;
+}
+$aTranslations = require($sFilePath);
+if(!is_array($aTranslations))
+{
+return false;
+}
 
-        // Load the translations
-        if(!isset($this->aTranslations[$sLanguage]))
-        {
-            $this->aTranslations[$sLanguage] = [];
-        }
-        $this->aRawTranslations[$sLanguage] =
-            array_merge($this->aRawTranslations[$sLanguage] ?? [], $aTranslations);
-        $this->_loadTranslations($sLanguage, '', $aTranslations);
-        return true;
-    }
+// Load the translations
+if(!isset($this->aTranslations[$sLanguage]))
+{
+$this->aTranslations[$sLanguage] = [];
+}
+$this->aRawTranslations[$sLanguage] =
+array_merge($this->aRawTranslations[$sLanguage] ?? [], $aTranslations);
+$this->_loadTranslations($sLanguage, '', $aTranslations);
+return true;
+}
 
-    /**
+/**
      * Get a translated string
      *
      * @param string $sText The key of the translated string
@@ -130,29 +130,29 @@ 
      *
      * @return string
      */
-    public function trans(string $sText, array $aPlaceHolders = [], string $sLanguage = ''): string
-    {
-        $sText = trim($sText);
-        if(empty($sLanguage))
-        {
-            $sLanguage = $this->sDefaultLocale;
-        }
-        if(!isset($this->aTranslations[$sLanguage][$sText]))
-        {
-            return $sText;
-        }
-        $sMessage = $this->aTranslations[$sLanguage][$sText];
-        if(!empty($aPlaceHolders))
-        {
-            $aVars = array_map(function($sVar) {
-                return ':' . $sVar;
-            }, array_keys($aPlaceHolders));
-            $sMessage = str_replace($aVars, array_values($aPlaceHolders), $sMessage);
-        }
-        return $sMessage;
-    }
+public function trans(string $sText, array $aPlaceHolders = [], string $sLanguage = ''): string
+{
+$sText = trim($sText);
+if(empty($sLanguage))
+{
+$sLanguage = $this->sDefaultLocale;
+}
+if(!isset($this->aTranslations[$sLanguage][$sText]))
+{
+return $sText;
+}
+$sMessage = $this->aTranslations[$sLanguage][$sText];
+if(!empty($aPlaceHolders))
+{
+$aVars = array_map(function($sVar) {
+    return ':' . $sVar;
+}, array_keys($aPlaceHolders));
+$sMessage = str_replace($aVars, array_values($aPlaceHolders), $sMessage);
+}
+return $sMessage;
+}
 
-    /**
+/**
      * Get all the translations under a given key
      *
      * @param string $sKey
@@ -160,22 +160,22 @@ 
      *
      * @return array
      */
-    public function translations(string $sKey, string $sLanguage = ''): array
-    {
-        if(empty($sLanguage))
-        {
-            $sLanguage = $this->sDefaultLocale;
-        }
-        $aKeys = explode('.', $sKey);
+public function translations(string $sKey, string $sLanguage = ''): array
+{
+if(empty($sLanguage))
+{
+$sLanguage = $this->sDefaultLocale;
+}
+$aKeys = explode('.', $sKey);
 
-        $aTranslations = $this->aRawTranslations[$sLanguage];
-        foreach($aKeys as $sKey)
-        {
-            if($sKey !== '')
-            {
-                $aTranslations = $aTranslations[$sKey] ?? [];
-            }
-        }
-        return $aTranslations;
-    }
+$aTranslations = $this->aRawTranslations[$sLanguage];
+foreach($aKeys as $sKey)
+{
+if($sKey !== '')
+{
+    $aTranslations = $aTranslations[$sKey] ?? [];
+}
+}
+return $aTranslations;
+}
 }

jaxon-utils/src/File/FileMinifier.php

Spacing +3 added lines, -3 removed lines

@@ -37,7 +37,7 @@ 
         {
             return file_get_contents($sPath);
         }
-        catch(Exception $e)
+        catch (Exception $e)
         {
             return false;
         }
@@ -56,7 +56,7 @@ 
         {
             return Minifier::minify($sCode);
         }
-        catch(Exception $e)
+        catch (Exception $e)
         {
             return false;
         }
@@ -72,7 +72,7 @@ 
      */
     public function minify(string $sJsFile, string $sMinFile): bool
     {
-        if(($sJsCode = $this->readFile($sJsFile)) === false ||
+        if (($sJsCode = $this->readFile($sJsFile)) === false ||
             ($sMinCode = $this->minifyCode($sJsCode)) === false)
         {
             return false;

Braces +2 added lines, -4 removed lines

@@ -36,8 +36,7 @@ 
         try
         {
             return file_get_contents($sPath);
-        }
-        catch(Exception $e)
+        } catch(Exception $e)
         {
             return false;
         }
@@ -55,8 +54,7 @@ 
         try
         {
             return Minifier::minify($sCode);
-        }
-        catch(Exception $e)
+        } catch(Exception $e)
         {
             return false;
         }

Switch Indentation +35 added lines, -35 removed lines

@@ -24,45 +24,45 @@ 
 
 class FileMinifier
 {
-    /**
+/**
      * Read the file content
      *
      * @param string $sPath
      *
      * @return string|false
      */
-    private function readFile(string $sPath): bool|string
-    {
-        try
-        {
-            return file_get_contents($sPath);
-        }
-        catch(Exception $e)
-        {
-            return false;
-        }
-    }
+private function readFile(string $sPath): bool|string
+{
+try
+{
+return file_get_contents($sPath);
+}
+catch(Exception $e)
+{
+return false;
+}
+}
 
-    /**
+/**
      * Read the file content
      *
      * @param string $sCode
      *
      * @return string|false
      */
-    private function minifyCode(string $sCode): bool|string
-    {
-        try
-        {
-            return Minifier::minify($sCode);
-        }
-        catch(Exception $e)
-        {
-            return false;
-        }
-    }
+private function minifyCode(string $sCode): bool|string
+{
+try
+{
+return Minifier::minify($sCode);
+}
+catch(Exception $e)
+{
+return false;
+}
+}
 
-    /**
+/**
      * Minify javascript code
      *
      * @param string $sJsFile The javascript file to be minified
@@ -70,14 +70,14 @@ 
      *
      * @return bool
      */
-    public function minify(string $sJsFile, string $sMinFile): bool
-    {
-        if(($sJsCode = $this->readFile($sJsFile)) === false ||
-            ($sMinCode = $this->minifyCode($sJsCode)) === false)
-        {
-            return false;
-        }
-        file_put_contents($sMinFile, $sMinCode);
-        return is_file($sMinFile);
-    }
+public function minify(string $sJsFile, string $sMinFile): bool
+{
+if(($sJsCode = $this->readFile($sJsFile)) === false ||
+($sMinCode = $this->minifyCode($sJsCode)) === false)
+{
+return false;
+}
+file_put_contents($sMinFile, $sMinCode);
+return is_file($sMinFile);
+}
 }

jaxon-config/tests/TestConfig/ConfigTest.php

Spacing +1 added lines, -1 removed lines

@@ -35,7 +35,7 @@
 
     protected function setUp(): void
     {
-        $this->sConfigDir = __DIR__ .  '/../config';
+        $this->sConfigDir = __DIR__ . '/../config';
         $this->xConfigSetter = new ConfigSetter();
         $this->xConfigReader = new ConfigReader($this->xConfigSetter);
         $this->xConfig = $this->xConfigSetter->newConfig(['core' => ['language' => 'en']]);

jaxon-config/src/Config.php

Spacing +2 added lines, -2 removed lines

@@ -90,11 +90,11 @@
         $sKey = trim($sKey, ' .');
         $aKeys = Value::explodeName($sKey);
         $aValues = $this->aValues;
-        foreach($aKeys as $_sKey)
+        foreach ($aKeys as $_sKey)
         {
             $aValues = $aValues[$_sKey] ?? [];
         }
-        if(!Value::containsOptions($aValues))
+        if (!Value::containsOptions($aValues))
         {
             return [];
         }

jaxon-config/src/Reader/Value.php

Spacing +3 added lines, -3 removed lines

@@ -34,13 +34,13 @@
      */
     public static function containsOptions($xValue): bool
     {
-        if(!is_array($xValue) || count($xValue) === 0)
+        if (!is_array($xValue) || count($xValue) === 0)
         {
             return false;
         }
-        foreach(array_keys($xValue) as $xKey)
+        foreach (array_keys($xValue) as $xKey)
         {
-            if(!is_string($xKey))
+            if (!is_string($xKey))
             {
                 return false;
             }

jaxon-config/src/Reader/PhpReader.php

Spacing +2 added lines, -2 removed lines

@@ -35,13 +35,13 @@
     public static function read(string $sConfigFile): array
     {
         $sConfigFile = realpath($sConfigFile);
-        if(!is_readable($sConfigFile))
+        if (!is_readable($sConfigFile))
         {
             throw new FileAccess($sConfigFile);
         }
 
         $aConfigOptions = include($sConfigFile);
-        if(!is_array($aConfigOptions))
+        if (!is_array($aConfigOptions))
         {
             throw new FileContent($sConfigFile);
         }

jaxon-config/src/Reader/YamlReader.php

Spacing +3 added lines, -3 removed lines

@@ -38,19 +38,19 @@
      */
     public static function read(string $sConfigFile): array
     {
-        if(!extension_loaded('yaml'))
+        if (!extension_loaded('yaml'))
         {
             throw new YamlExtension();
         }
 
         $sConfigFile = realpath($sConfigFile);
-        if(!is_readable($sConfigFile))
+        if (!is_readable($sConfigFile))
         {
             throw new FileAccess($sConfigFile);
         }
 
         $aConfigOptions = yaml_parse_file($sConfigFile);
-        if(!is_array($aConfigOptions))
+        if (!is_array($aConfigOptions))
         {
             throw new FileContent($sConfigFile);
         }

jaxon-config/src/Reader/JsonReader.php

Spacing +2 added lines, -2 removed lines

@@ -37,14 +37,14 @@
     public static function read(string $sConfigFile): array
     {
         $sConfigFile = realpath($sConfigFile);
-        if(!is_readable($sConfigFile))
+        if (!is_readable($sConfigFile))
         {
             throw new FileAccess($sConfigFile);
         }
 
         $sFileContent = file_get_contents($sConfigFile);
         $aConfigOptions = json_decode($sFileContent, true);
-        if(!is_array($aConfigOptions))
+        if (!is_array($aConfigOptions))
         {
             throw new FileContent($sConfigFile);
         }