jaxon-php / jaxon-mono

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

jaxon-config/src/ConfigSetter.php

Spacing +11 added lines, -12 removed lines

@@ -44,8 +44,7 @@ 
     public function newConfig(array $aOptions = [],
         string $sNamePrefix = '', string $sValuePrefix = ''): Config
     {
-        return count($aOptions) === 0 ? new Config() :
-            $this->setOptions(new Config(), $aOptions, $sNamePrefix, $sValuePrefix);
+        return count($aOptions) === 0 ? new Config() : $this->setOptions(new Config(), $aOptions, $sNamePrefix, $sValuePrefix);
     }
 
     /**
@@ -77,7 +76,7 @@ 
         $xValue = $xOptionValue;
         $sLastName = '';
         $aNames = Value::explodeName($sOptionName);
-        while($this->pop($sLastName, $aNames) > 0)
+        while ($this->pop($sLastName, $aNames) > 0)
         {
             $sName = implode('.', $aNames);
             // The current value is overwritten if it is not an array of options.
@@ -121,15 +120,15 @@ 
         string $sNamePrefix = '', int $nDepth = 0): array
     {
         // Check the max depth
-        if($nDepth < 0 || $nDepth > 9)
+        if ($nDepth < 0 || $nDepth > 9)
         {
             throw new DataDepth($sNamePrefix, $nDepth);
         }
 
-        foreach($aOptions as $sName => $xValue)
+        foreach ($aOptions as $sName => $xValue)
         {
             $sName = trim($sName);
-            if(!Value::containsOptions($xValue))
+            if (!Value::containsOptions($xValue))
             {
                 // Save the value of this option
                 $aValues = $this->setValue($aValues, $sNamePrefix . $sName, $xValue);
@@ -160,11 +159,11 @@ 
         // Find the config array in the input data
         $sValuePrefix = trim($sValuePrefix, ' .');
         $aKeys = Value::explodeName($sValuePrefix);
-        foreach($aKeys as $sKey)
+        foreach ($aKeys as $sKey)
         {
-            if(($sKey))
+            if (($sKey))
             {
-                if(!isset($aOptions[$sKey]) || !is_array($aOptions[$sKey]))
+                if (!isset($aOptions[$sKey]) || !is_array($aOptions[$sKey]))
                 {
                     // No change if the required key is not found.
                     return new Config($xConfig->getValues(), false);
@@ -175,7 +174,7 @@ 
         }
 
         $sNamePrefix = trim($sNamePrefix, ' .');
-        if(($sNamePrefix))
+        if (($sNamePrefix))
         {
             $sNamePrefix .= '.';
         }
@@ -204,7 +203,7 @@ 
     private function deleteEntries(array $aValues, string $sName): array
     {
         $sName = rtrim($sName, '.');
-        if(!array_key_exists($sName, $aValues))
+        if (!array_key_exists($sName, $aValues))
         {
             return $aValues;
         }
@@ -229,7 +228,7 @@ 
     {
         $aValues = $xConfig->getValues();
         $nEntryCount = count($aValues);
-        foreach($aNames as $sName)
+        foreach ($aNames as $sName)
         {
             $aValues = $this->deleteEntries($aValues, $sName);
         }