Mistralys / application-utils

src/Traits/Classable.php

Indentation +17 added lines, -17 removed lines

@@ -25,9 +25,9 @@ 
  */
 trait Traits_Classable
 {
-   /**
-    * @var string[]
-    */
+    /**
+     * @var string[]
+     */
     protected array $classes = array();
 
     public function hasClasses() : bool
@@ -82,30 +82,30 @@ 
         return $this;
     }
     
-   /**
-    * Retrieves a list of all classes, if any.
-    * 
-    * @return string[]
-    */
+    /**
+     * Retrieves a list of all classes, if any.
+     * 
+     * @return string[]
+     */
     public function getClasses() : array
     {
         return $this->classes;
     }
     
-   /**
-    * Renders the class names list as space-separated string for use in an HTML tag.
-    * 
-    * @return string
-    */
+    /**
+     * Renders the class names list as space-separated string for use in an HTML tag.
+     * 
+     * @return string
+     */
     public function classesToString() : string
     {
         return implode(' ', $this->classes);
     }
     
-   /**
-    * Renders the "class" attribute string for inserting into an HTML tag.
-    * @return string
-    */
+    /**
+     * Renders the "class" attribute string for inserting into an HTML tag.
+     * @return string
+     */
     public function classesToAttribute() : string
     {
         if(!empty($this->classes))

Spacing +4 added lines, -4 removed lines

@@ -41,7 +41,7 @@ 
      */
     public function addClass($name)
     {
-        if(!in_array($name, $this->classes, true)) {
+        if (!in_array($name, $this->classes, true)) {
             $this->classes[] = $name;
         }
         
@@ -54,7 +54,7 @@ 
      */
     public function addClasses(array $names) : self
     {
-        foreach($names as $name) {
+        foreach ($names as $name) {
             $this->addClass($name);
         }
         
@@ -74,7 +74,7 @@ 
     {
         $idx = array_search($name, $this->classes, true);
         
-        if($idx !== false) {
+        if ($idx !== false) {
             unset($this->classes[$idx]);
             sort($this->classes);
         }
@@ -108,7 +108,7 @@ 
     */
     public function classesToAttribute() : string
     {
-        if(!empty($this->classes))
+        if (!empty($this->classes))
         {
             return sprintf(
                 ' class="%s" ',

src/Traits/Optionable.php

Indentation +66 added lines, -66 removed lines

@@ -26,9 +26,9 @@ 
  */
 trait Traits_Optionable
 {
-   /**
-    * @var array<string,mixed>|NULL
-    */
+    /**
+     * @var array<string,mixed>|NULL
+     */
     protected ?array $options = null;
 
     /**
@@ -49,13 +49,13 @@ 
         return $this;
     }
     
-   /**
-    * Sets a collection of options at once, from an
-    * associative array.
-    * 
-    * @param array<string,mixed> $options
-    * @return $this
-    */
+    /**
+     * Sets a collection of options at once, from an
+     * associative array.
+     * 
+     * @param array<string,mixed> $options
+     * @return $this
+     */
     public function setOptions(array $options) : self
     {
         foreach($options as $name => $value) {
@@ -65,16 +65,16 @@ 
         return $this;
     }
     
-   /**
-    * Retrieves an option's value.
-    * 
-    * NOTE: Use the specialized type getters to ensure an option
-    * contains the expected type (for ex. getArrayOption()). 
-    * 
-    * @param string $name
-    * @param mixed $default The default value to return if the option does not exist.
-    * @return mixed
-    */
+    /**
+     * Retrieves an option's value.
+     * 
+     * NOTE: Use the specialized type getters to ensure an option
+     * contains the expected type (for ex. getArrayOption()). 
+     * 
+     * @param string $name
+     * @param mixed $default The default value to return if the option does not exist.
+     * @return mixed
+     */
     public function getOption(string $name, $default=null)
     {
         if(!isset($this->options))
@@ -85,16 +85,16 @@ 
         return $this->options[$name] ?? $default;
     }
     
-   /**
-    * Enforces that the option value is a string. Numbers are converted
-    * to string, strings are passed through, and all other types will 
-    * return the default value. The default value is also returned if
-    * the string is empty.
-    * 
-    * @param string $name
-    * @param string $default Used if the option does not exist, is invalid, or empty.
-    * @return string
-    */
+    /**
+     * Enforces that the option value is a string. Numbers are converted
+     * to string, strings are passed through, and all other types will 
+     * return the default value. The default value is also returned if
+     * the string is empty.
+     * 
+     * @param string $name
+     * @param string $default Used if the option does not exist, is invalid, or empty.
+     * @return string
+     */
     public function getStringOption(string $name, string $default='') : string
     {
         $value = $this->getOption($name, false);
@@ -126,15 +126,15 @@ 
         return $default;
     }
     
-   /**
-    * Treats the option value as an integer value: will return
-    * valid integer values (also from integer strings), or the
-    * default value otherwise.
-    * 
-    * @param string $name
-    * @param int $default
-    * @return int
-    */
+    /**
+     * Treats the option value as an integer value: will return
+     * valid integer values (also from integer strings), or the
+     * default value otherwise.
+     * 
+     * @param string $name
+     * @param int $default
+     * @return int
+     */
     public function getIntOption(string $name, int $default=0) : int
     {
         $value = $this->getOption($name);
@@ -145,14 +145,14 @@ 
         return $default;
     }
     
-   /**
-    * Treats an option as an array, and returns its value
-    * only if it contains an array - otherwise, an empty
-    * array is returned.
-    * 
-    * @param string $name
-    * @return array<int|string,mixed>
-    */
+    /**
+     * Treats an option as an array, and returns its value
+     * only if it contains an array - otherwise, an empty
+     * array is returned.
+     * 
+     * @param string $name
+     * @return array<int|string,mixed>
+     */
     public function getArrayOption(string $name) : array
     {
         $val = $this->getOption($name);
@@ -163,13 +163,13 @@ 
         return array();
     }
     
-   /**
-    * Checks whether the specified option exists - even
-    * if it has a NULL value.
-    * 
-    * @param string $name
-    * @return bool
-    */
+    /**
+     * Checks whether the specified option exists - even
+     * if it has a NULL value.
+     * 
+     * @param string $name
+     * @return bool
+     */
     public function hasOption(string $name) : bool
     {
         if(!isset($this->options)) {
@@ -179,11 +179,11 @@ 
         return array_key_exists($name, $this->options);
     }
     
-   /**
-    * Returns all options in one associative array.
-    *
-    * @return array<string,mixed>
-    */
+    /**
+     * Returns all options in one associative array.
+     *
+     * @return array<string,mixed>
+     */
     public function getOptions() : array
     {
         if(!isset($this->options)) {
@@ -193,13 +193,13 @@ 
         return $this->options;
     }
     
-   /**
-    * Checks whether the option's value is the one specified.
-    * 
-    * @param string $name
-    * @param mixed $value
-    * @return bool
-    */
+    /**
+     * Checks whether the option's value is the one specified.
+     * 
+     * @param string $name
+     * @param mixed $value
+     * @return bool
+     */
     public function isOption(string $name, $value) : bool
     {
         return $this->getOption($name) === $value;

Spacing +13 added lines, -13 removed lines

@@ -41,7 +41,7 @@ 
      */
     public function setOption(string $name, $value) : self
     {
-        if(!isset($this->options)) {
+        if (!isset($this->options)) {
             $this->options = $this->getDefaultOptions();
         }
         
@@ -58,7 +58,7 @@ 
     */
     public function setOptions(array $options) : self
     {
-        foreach($options as $name => $value) {
+        foreach ($options as $name => $value) {
             $this->setOption($name, $value);
         }
         
@@ -75,9 +75,9 @@ 
     * @param mixed $default The default value to return if the option does not exist.
     * @return mixed
     */
-    public function getOption(string $name, $default=null)
+    public function getOption(string $name, $default = null)
     {
-        if(!isset($this->options))
+        if (!isset($this->options))
         {
             $this->options = $this->getDefaultOptions();
         }
@@ -95,11 +95,11 @@ 
     * @param string $default Used if the option does not exist, is invalid, or empty.
     * @return string
     */
-    public function getStringOption(string $name, string $default='') : string
+    public function getStringOption(string $name, string $default = '') : string
     {
         $value = $this->getOption($name, false);
         
-        if((is_string($value) || is_numeric($value)) && !empty($value)) {
+        if ((is_string($value) || is_numeric($value)) && !empty($value)) {
             return (string)$value;
         }
         
@@ -116,9 +116,9 @@ 
      * @param bool $default
      * @return bool
      */
-    public function getBoolOption(string $name, bool $default=false) : bool
+    public function getBoolOption(string $name, bool $default = false) : bool
     {
-        if($this->getOption($name) === true)
+        if ($this->getOption($name) === true)
         {
             return true;
         }
@@ -135,10 +135,10 @@ 
     * @param int $default
     * @return int
     */
-    public function getIntOption(string $name, int $default=0) : int
+    public function getIntOption(string $name, int $default = 0) : int
     {
         $value = $this->getOption($name);
-        if(ConvertHelper::isInteger($value)) {
+        if (ConvertHelper::isInteger($value)) {
             return (int)$value;
         }
         
@@ -156,7 +156,7 @@ 
     public function getArrayOption(string $name) : array
     {
         $val = $this->getOption($name);
-        if(is_array($val)) {
+        if (is_array($val)) {
             return $val;
         }
         
@@ -172,7 +172,7 @@ 
     */
     public function hasOption(string $name) : bool
     {
-        if(!isset($this->options)) {
+        if (!isset($this->options)) {
             $this->options = $this->getDefaultOptions();
         }
         
@@ -186,7 +186,7 @@ 
     */
     public function getOptions() : array
     {
-        if(!isset($this->options)) {
+        if (!isset($this->options)) {
             $this->options = $this->getDefaultOptions();
         }
         

src/AttributeCollection/Filtering.php

Spacing +2 added lines, -2 removed lines

@@ -56,12 +56,12 @@
      */
     public static function value2string($value) : string
     {
-        if($value === true)
+        if ($value === true)
         {
             return 'true';
         }
 
-        if($value === false)
+        if ($value === false)
         {
             return 'false';
         }

src/Interfaces/AttributableInterface.php

Spacing +1 added lines, -1 removed lines

@@ -53,7 +53,7 @@
      * @param bool $enabled
      * @return $this
      */
-    public function prop(string $name, bool $enabled=true) : self;
+    public function prop(string $name, bool $enabled = true) : self;
 
     /**
      * @param string $name

src/Interfaces/Optionable.php

Spacing +4 added lines, -4 removed lines

@@ -45,7 +45,7 @@ 
      * @param mixed $default The default value to return if the option does not exist.
      * @return mixed
      */
-    public function getOption(string $name, $default=null);
+    public function getOption(string $name, $default = null);
 
     /**
      * @param string $name
@@ -53,11 +53,11 @@ 
      */
     public function getArrayOption(string $name) : array;
 
-    public function getIntOption(string $name, int $default=0) : int;
+    public function getIntOption(string $name, int $default = 0) : int;
 
-    public function getBoolOption(string $name, bool $default=false) : bool;
+    public function getBoolOption(string $name, bool $default = false) : bool;
 
-    public function getStringOption(string $name, string $default='') : string;
+    public function getStringOption(string $name, string $default = '') : string;
 
     /**
      * Sets a collection of options at once, from an

src/Request/URLComparer.php

Indentation +24 added lines, -24 removed lines

@@ -23,44 +23,44 @@
  */
 class Request_URLComparer
 {
-   /**
-    * @var Request
-    */
+    /**
+     * @var Request
+     */
     protected Request $request;
     
-   /**
-    * @var string
-    */
+    /**
+     * @var string
+     */
     protected string $sourceURL;
     
-   /**
-    * @var string
-    */
+    /**
+     * @var string
+     */
     protected string $targetURL;
     
-   /**
-    * @var string[]
-    */
+    /**
+     * @var string[]
+     */
     protected array $limitParams = array();
     
-   /**
-    * @var bool
-    */
+    /**
+     * @var bool
+     */
     protected bool $isMatch = false;
     
-   /**
-    * @var bool
-    */
+    /**
+     * @var bool
+     */
     protected bool $ignoreFragment = true;
 
-   /**
-    * @var URLInfo
-    */
+    /**
+     * @var URLInfo
+     */
     protected URLInfo $sourceInfo;
     
-   /**
-    * @var URLInfo
-    */
+    /**
+     * @var URLInfo
+     */
     protected URLInfo $targetInfo;
     
     public function __construct(Request $request, string $sourceURL, string $targetURL)

Spacing +12 added lines, -12 removed lines

@@ -81,7 +81,7 @@ 
     
     public function addLimitParam(string $name) : Request_URLComparer
     {
-        if(!in_array($name, $this->limitParams, true))
+        if (!in_array($name, $this->limitParams, true))
         {
             $this->limitParams[] = $name;
         }
@@ -95,7 +95,7 @@ 
      */
     public function addLimitParams(array $names) : Request_URLComparer
     {
-        foreach($names as $name)
+        foreach ($names as $name)
         {
             $this->addLimitParam($name);
         }
@@ -103,7 +103,7 @@ 
         return $this;
     }
     
-    public function setIgnoreFragment(bool $ignore=true) : Request_URLComparer
+    public function setIgnoreFragment(bool $ignore = true) : Request_URLComparer
     {
         $this->ignoreFragment = $ignore;
         return $this;
@@ -126,13 +126,13 @@ 
             'query' 
         );
         
-        if(!$this->ignoreFragment) {
+        if (!$this->ignoreFragment) {
             $keys[] = 'fragment';
         }
         
-        foreach($keys as $key)
+        foreach ($keys as $key)
         {
-            if(!$this->compareKey($key)) {
+            if (!$this->compareKey($key)) {
                 return false;
             }
         }
@@ -147,7 +147,7 @@ 
         
         $filter = 'filter_'.$key;
         
-        if(method_exists($this, $filter)) 
+        if (method_exists($this, $filter)) 
         {
             $sVal = $this->$filter($sVal);
             $tVal = $this->$filter($tVal);
@@ -159,7 +159,7 @@ 
     protected function filter_path(string $path) : string
     {
         // fix double slashes in URLs
-        while(strpos($path, '//') !== false)
+        while (strpos($path, '//') !== false)
         {
             $path = str_replace('//', '/', $path);
         }
@@ -169,7 +169,7 @@ 
     
     protected function filter_query(string $query) : string
     {
-        if(empty($query)) {
+        if (empty($query)) {
             return '';
         }
         
@@ -188,15 +188,15 @@ 
      */
     protected function limitParams(array $params) : array
     {
-        if(empty($this->limitParams)) {
+        if (empty($this->limitParams)) {
             return $params;
         }
         
         $keep = array();
         
-        foreach($this->limitParams as $name)
+        foreach ($this->limitParams as $name)
         {
-            if(isset($params[$name])) {
+            if (isset($params[$name])) {
                 $keep[$name] = $params[$name];
             }
         }

src/Traits/RenderableTrait.php

Braces +1 added lines, -2 removed lines

@@ -35,8 +35,7 @@
         try
         {
             return $this->render();
-        }
-        catch (Throwable $e)
+        } catch (Throwable $e)
         {
             return sprintf(
                 'Exception while rendering [%s]: %s',

src/Traits/RenderableBufferedTrait.php

Braces +1 added lines, -2 removed lines

@@ -35,8 +35,7 @@
         try
         {
             return $this->render();
-        }
-        catch (Throwable $e)
+        } catch (Throwable $e)
         {
             return sprintf(
                 'Exception while rendering [%s]: %s',

src/functions.php

Spacing +7 added lines, -7 removed lines

@@ -12,9 +12,9 @@ 
  * @param bool $forceNew
  * @return NumberInfo
  */
-function parseNumber($value, bool $forceNew=false)
+function parseNumber($value, bool $forceNew = false)
 {
-    if($value instanceof NumberInfo && $forceNew !== true) {
+    if ($value instanceof NumberInfo && $forceNew !== true) {
         return $value;
     }
     
@@ -109,7 +109,7 @@ 
     $args = func_get_args();
     
     // is the localization package installed?
-    if(function_exists('\AppLocalize\t'))
+    if (function_exists('\AppLocalize\t'))
     {
         return call_user_func_array('\AppLocalize\t', $args);
     }
@@ -124,7 +124,7 @@ 
  * @param bool $initial The initial boolean value to use.
  * @return Value_Bool
  */
-function valBool(bool $initial=false) : Value_Bool
+function valBool(bool $initial = false) : Value_Bool
 {
     return new Value_Bool($initial);
 }
@@ -137,7 +137,7 @@ 
  * @param bool $initial
  * @return Value_Bool_True
  */
-function valBoolTrue(bool $initial=false) : Value_Bool_True
+function valBoolTrue(bool $initial = false) : Value_Bool_True
 {
     return new Value_Bool_True($initial);
 }
@@ -150,7 +150,7 @@ 
  * @param bool $initial
  * @return Value_Bool_False
  */
-function valBoolFalse(bool $initial=true) : Value_Bool_False
+function valBoolFalse(bool $initial = true) : Value_Bool_False
 {
     return new Value_Bool_False($initial);
 }
@@ -181,7 +181,7 @@ 
  */
 function init() : void
 {
-    if(!class_exists('\AppLocalize\Localization')) {
+    if (!class_exists('\AppLocalize\Localization')) {
         return;
     }