Mistralys / application-utils

src/URLInfo/ConnectionTester.php

Indentation +19 added lines, -19 removed lines

@@ -22,9 +22,9 @@ 
 {
     use Traits_Optionable;
     
-   /**
-    * @var URLInfo
-    */
+    /**
+     * @var URLInfo
+     */
     private $url;
     
     public function __construct(URLInfo $url)
@@ -41,13 +41,13 @@ 
         );
     }
     
-   /**
-    * Whether to verify the host's SSL certificate, in
-    * case of an https connection.
-    * 
-    * @param bool $verifySSL
-    * @return URLInfo_ConnectionTester
-    */
+    /**
+     * Whether to verify the host's SSL certificate, in
+     * case of an https connection.
+     * 
+     * @param bool $verifySSL
+     * @return URLInfo_ConnectionTester
+     */
     public function setVerifySSL(bool $verifySSL=true) : URLInfo_ConnectionTester
     {
         $this->setOption('verify-ssl', $verifySSL);
@@ -81,12 +81,12 @@ 
         return $this->getIntOption('timeout');
     }
     
-   /**
-    * Initializes the CURL instance.
-    * 
-    * @throws BaseException
-    * @return resource
-    */
+    /**
+     * Initializes the CURL instance.
+     * 
+     * @throws BaseException
+     * @return resource
+     */
     private function initCURL()
     {
         $ch = curl_init();
@@ -103,9 +103,9 @@ 
         return $ch;
     }
     
-   /**
-    * @param resource $ch
-    */
+    /**
+     * @param resource $ch
+     */
     private function configureOptions($ch) : void
     {
         if($this->isVerboseModeEnabled())

Spacing +6 added lines, -6 removed lines

@@ -48,7 +48,7 @@ 
     * @param bool $verifySSL
     * @return URLInfo_ConnectionTester
     */
-    public function setVerifySSL(bool $verifySSL=true) : URLInfo_ConnectionTester
+    public function setVerifySSL(bool $verifySSL = true) : URLInfo_ConnectionTester
     {
         $this->setOption('verify-ssl', $verifySSL);
             return $this;
@@ -59,7 +59,7 @@ 
         return $this->getBoolOption('verify-ssl');
     }
     
-    public function setVerboseMode(bool $enabled=true) : URLInfo_ConnectionTester
+    public function setVerboseMode(bool $enabled = true) : URLInfo_ConnectionTester
     {
         $this->setOption('curl-verbose', $enabled);
         return $this;
@@ -91,7 +91,7 @@ 
     {
         $ch = curl_init();
         
-        if(!is_resource($ch))
+        if (!is_resource($ch))
         {
             throw new BaseException(
                 'Could not initialize a new cURL instance.',
@@ -108,7 +108,7 @@ 
     */
     private function configureOptions($ch) : void
     {
-        if($this->isVerboseModeEnabled())
+        if ($this->isVerboseModeEnabled())
         {
             curl_setopt($ch, CURLOPT_VERBOSE, true);
         }
@@ -118,13 +118,13 @@ 
         curl_setopt($ch, CURLOPT_TIMEOUT, $this->getTimeout());
         curl_setopt($ch, CURLOPT_FOLLOWLOCATION, true);
         
-        if(!$this->isVerifySSLEnabled())
+        if (!$this->isVerifySSLEnabled())
         {
             curl_setopt($ch, CURLOPT_SSL_VERIFYHOST, false);
             curl_setopt($ch, CURLOPT_SSL_VERIFYPEER, false);
         }
         
-        if($this->url->hasUsername())
+        if ($this->url->hasUsername())
         {
             curl_setopt($ch, CURLOPT_USERNAME, $this->url->getUsername());
             curl_setopt($ch, CURLOPT_PASSWORD, $this->url->getPassword());

src/FileHelper/MimeTypes.php

Spacing +2 added lines, -2 removed lines

@@ -288,9 +288,9 @@
      * @param string $extension
      * @return string|NULL
      */
-    public static function getMime(string $extension) :?string
+    public static function getMime(string $extension) : ?string
     {
-        if(isset(self::$mimeTypes[$extension])) {
+        if (isset(self::$mimeTypes[$extension])) {
             return self::$mimeTypes[$extension];
         }
 

src/VariableInfo/Renderer/String/Callable.php

Spacing +6 added lines, -6 removed lines

@@ -13,20 +13,20 @@ 
         $string = '';
 
         // Simple function call
-        if(is_string($this->value))
+        if (is_string($this->value))
         {
             return $this->value.'()';
         }
 
-        if(is_array($this->value)) {
+        if (is_array($this->value)) {
             return $this->renderArray();
         }
 
-        if($this->value instanceof NamedClosure) {
+        if ($this->value instanceof NamedClosure) {
             return 'Closure:'.$this->value->getOrigin();
         }
 
-        if($this->value instanceof Closure) {
+        if ($this->value instanceof Closure) {
             return 'Closure';
         }
 
@@ -38,9 +38,9 @@ 
         $string = '';
 
         if (is_string($this->value[0])) {
-            $string .= $this->value[0] . '::';
+            $string .= $this->value[0].'::';
         } else {
-            $string .= get_class($this->value[0]) . '->';
+            $string .= get_class($this->value[0]).'->';
         }
 
         $string .= $this->value[1].'()';

src/NamedClosure.php

Spacing +5 added lines, -5 removed lines

@@ -74,7 +74,7 @@ 
      */
     public static function fromClosure(Closure $closure, $origin) : NamedClosure
     {
-        if(is_object($origin)) {
+        if (is_object($origin)) {
             $origin = get_class($origin);
         }
 
@@ -87,7 +87,7 @@ 
      * @param string|object $origin Optional origin. If not specified, the object and method name are used instead.
      * @return NamedClosure
      */
-    public static function fromObject(object $object, string $method, $origin='') : NamedClosure
+    public static function fromObject(object $object, string $method, $origin = '') : NamedClosure
     {
         return self::fromArray(array($object, $method), $origin);
     }
@@ -97,11 +97,11 @@ 
      * @param string|object $origin
      * @return NamedClosure
      */
-    public static function fromArray(array $callback, $origin='') : NamedClosure
+    public static function fromArray(array $callback, $origin = '') : NamedClosure
     {
-        if(empty($origin)) {
+        if (empty($origin)) {
             $origin = ConvertHelper::callback2string($callback);
-        } else if(is_object($origin)) {
+        } else if (is_object($origin)) {
             $origin = get_class($origin);
         }
 

src/Traits/Optionable.php

Indentation +72 added lines, -72 removed lines

@@ -26,9 +26,9 @@ 
  */
 trait Traits_Optionable
 {
-   /**
-    * @var array
-    */
+    /**
+     * @var array
+     */
     protected $options;
 
     /**
@@ -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)
     {
         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)) {
@@ -88,16 +88,16 @@ 
         return $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);
@@ -128,15 +128,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);
@@ -147,14 +147,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
-    */
+    /**
+     * 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
+     */
     public function getArrayOption(string $name) : array
     {
         $val = $this->getOption($name);
@@ -165,13 +165,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)) {
@@ -181,11 +181,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)) {
@@ -195,23 +195,23 @@ 
         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;
     }
     
-   /**
-    * Retrieves the default available options as an
-    * associative array with option name => value pairs.
-    *
-    * @return array<string,mixed>
-    */
+    /**
+     * Retrieves the default available options as an
+     * associative array with option name => value pairs.
+     *
+     * @return array<string,mixed>
+     */
     abstract public function getDefaultOptions() : array;
 }

Spacing +14 added lines, -14 removed lines

@@ -41,7 +41,7 @@ 
      */
     public function setOption(string $name, $value)
     {
-        if(!isset($this->options)) {
+        if (!isset($this->options)) {
             $this->options = $this->getDefaultOptions();
         }
         
@@ -58,7 +58,7 @@ 
     */
     public function setOptions(array $options)
     {
-        foreach($options as $name => $value) {
+        foreach ($options as $name => $value) {
             $this->setOption($name, $value);
         }
         
@@ -75,13 +75,13 @@ 
     * @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();
         }
         
-        if(isset($this->options[$name])) {
+        if (isset($this->options[$name])) {
             return $this->options[$name];
         }
         
@@ -98,11 +98,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;
         }
         
@@ -119,9 +119,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;
         }
         
@@ -137,10 +137,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;
         }
         
@@ -158,7 +158,7 @@ 
     public function getArrayOption(string $name) : array
     {
         $val = $this->getOption($name);
-        if(is_array($val)) {
+        if (is_array($val)) {
             return $val;
         }
         
@@ -174,7 +174,7 @@ 
     */
     public function hasOption(string $name) : bool
     {
-        if(!isset($this->options)) {
+        if (!isset($this->options)) {
             $this->options = $this->getDefaultOptions();
         }
         
@@ -188,7 +188,7 @@ 
     */
     public function getOptions() : array
     {
-        if(!isset($this->options)) {
+        if (!isset($this->options)) {
             $this->options = $this->getDefaultOptions();
         }
         

src/StringBuilder.php

Indentation +147 added lines, -147 removed lines

@@ -33,24 +33,24 @@ 
  */
 class StringBuilder implements StringBuilder_Interface
 {
-   /**
-    * @var string
-    */
+    /**
+     * @var string
+     */
     protected $separator = ' ';
 
-   /**
-    * @var string[]
-    */
+    /**
+     * @var string[]
+     */
     protected $strings = array();
 
-   /**
-    * @var string
-    */
+    /**
+     * @var string
+     */
     protected $mode = 'html';
 
-   /**
-    * @var string
-    */
+    /**
+     * @var string
+     */
     protected $noSpace = '§!§';
     
     public function __construct()
@@ -58,12 +58,12 @@ 
         
     }
     
-   /**
-    * Adds a subject as a string. Is ignored if empty.
-    * 
-    * @param string|number|StringBuilder_Interface $string
-    * @return $this
-    */
+    /**
+     * Adds a subject as a string. Is ignored if empty.
+     * 
+     * @param string|number|StringBuilder_Interface $string
+     * @return $this
+     */
     public function add($string) : StringBuilder
     {
         $string = strval($string);
@@ -76,57 +76,57 @@ 
         return $this;
     }
     
-   /**
-    * Adds a string without appending an automatic space.
-    * 
-    * @param string|number|StringBuilder_Interface $string
-    * @return $this
-    */
+    /**
+     * Adds a string without appending an automatic space.
+     * 
+     * @param string|number|StringBuilder_Interface $string
+     * @return $this
+     */
     public function nospace($string) : StringBuilder
     {
         return $this->add($this->noSpace.strval($string));
     }
     
-   /**
-    * Adds raw HTML code. Does not add an automatic space.
-    * 
-    * @param string|number|StringBuilder_Interface $html
-    * @return $this
-    */
+    /**
+     * Adds raw HTML code. Does not add an automatic space.
+     * 
+     * @param string|number|StringBuilder_Interface $html
+     * @return $this
+     */
     public function html($html) : StringBuilder
     {
         return $this->nospace($html);
     }
     
-   /**
-    * Adds an unordered list with the specified items.
-    * 
-    * @param array<int,string|number|StringBuilder_Interface> $items
-    * @return $this
-    */
+    /**
+     * Adds an unordered list with the specified items.
+     * 
+     * @param array<int,string|number|StringBuilder_Interface> $items
+     * @return $this
+     */
     public function ul(array $items) : StringBuilder
     {
         return $this->list('ul', $items);
     }
     
-   /**
-    * Adds an ordered list with the specified items.
-    * 
-    * @param array<int,string|number|StringBuilder_Interface> $items
-    * @return $this
-    */
+    /**
+     * Adds an ordered list with the specified items.
+     * 
+     * @param array<int,string|number|StringBuilder_Interface> $items
+     * @return $this
+     */
     public function ol(array $items) : StringBuilder
     {
         return $this->list('ol', $items);
     }
     
-   /**
-    * Creates a list tag with the items list.
-    * 
-    * @param string $type The list type, `ol` or `ul`.
-    * @param array<int,string|number|StringBuilder_Interface> $items
-    * @return $this
-    */
+    /**
+     * Creates a list tag with the items list.
+     * 
+     * @param string $type The list type, `ol` or `ul`.
+     * @param array<int,string|number|StringBuilder_Interface> $items
+     * @return $this
+     */
     protected function list(string $type, array $items) : StringBuilder
     {
         return $this->html(sprintf(
@@ -136,13 +136,13 @@ 
         ));
     }
     
-   /**
-    * Add a translated string.
-    * 
-    * @param string $format The native string to translate.
-    * @param array<int,mixed> $arguments The variables to inject into the translated string, if any.
-    * @return $this
-    */
+    /**
+     * Add a translated string.
+     * 
+     * @param string $format The native string to translate.
+     * @param array<int,mixed> $arguments The variables to inject into the translated string, if any.
+     * @return $this
+     */
     public function t(string $format, ...$arguments) : StringBuilder
     {
         array_unshift($arguments, $format);
@@ -158,47 +158,47 @@ 
         ));
     }
     
-   /**
-    * Adds a "5 months ago" age since the specified date.
-    * 
-    * @param DateTime $since
-    * @return $this
-    */
+    /**
+     * Adds a "5 months ago" age since the specified date.
+     * 
+     * @param DateTime $since
+     * @return $this
+     */
     public function age(DateTime $since) : StringBuilder
     {
         return $this->add(ConvertHelper::duration2string($since));
     }
     
-   /**
-    * Adds HTML quotes around the string.
-    * 
-    * @param string|number|StringBuilder_Interface $string
-    * @return $this
-    */
+    /**
+     * Adds HTML quotes around the string.
+     * 
+     * @param string|number|StringBuilder_Interface $string
+     * @return $this
+     */
     public function quote($string)
     {
         return $this->sf('&quot;%s&quot;', strval($string));
     }
     
-   /**
-    * Adds a text that is meant as a reference to an UI element,
-    * like a menu item, button, etc.
-    * 
-    * @param string|number|StringBuilder_Interface $string 
-    * @return $this
-    */
+    /**
+     * Adds a text that is meant as a reference to an UI element,
+     * like a menu item, button, etc.
+     * 
+     * @param string|number|StringBuilder_Interface $string 
+     * @return $this
+     */
     public function reference($string) : StringBuilder
     {
         return $this->sf('"%s"', $string);
     }
 
-   /**
-    * Add a string using the `sprintf` method.
-    * 
-    * @param string $format The format string
-    * @param string|number|StringBuilder_Interface ...$arguments The variables to inject
-    * @return $this
-    */
+    /**
+     * Add a string using the `sprintf` method.
+     * 
+     * @param string $format The format string
+     * @param string|number|StringBuilder_Interface ...$arguments The variables to inject
+     * @return $this
+     */
     public function sf(string $format, ...$arguments) : StringBuilder
     {
         array_unshift($arguments, $format);
@@ -206,12 +206,12 @@ 
         return $this->add(call_user_func_array('sprintf', $arguments));
     }
     
-   /**
-    * Adds a bold string.
-    * 
-    * @param string|number|StringBuilder_Interface $string
-    * @return $this
-    */
+    /**
+     * Adds a bold string.
+     * 
+     * @param string|number|StringBuilder_Interface $string
+     * @return $this
+     */
     public function bold($string) : StringBuilder
     {
         return $this->sf(
@@ -220,12 +220,12 @@ 
         );
     }
     
-   /**
-    * Adds a HTML `br` tag.
-    * 
-    * @return $this
-    * @see StringBuilder::eol()
-    */
+    /**
+     * Adds a HTML `br` tag.
+     * 
+     * @return $this
+     * @see StringBuilder::eol()
+     */
     public function nl() : StringBuilder
     {
         return $this->html('<br>');
@@ -242,41 +242,41 @@ 
         return $this->nospace(PHP_EOL);
     }
     
-   /**
-    * Adds the current time, in the format <code>H:i:s</code>.
-    * 
-    * @return $this
-    */
+    /**
+     * Adds the current time, in the format <code>H:i:s</code>.
+     * 
+     * @return $this
+     */
     public function time() : StringBuilder
     {
         return $this->add(date('H:i:s'));
     }
     
-   /**
-    * Adds the "Note:" text.
-    * 
-    * @return $this
-    */
+    /**
+     * Adds the "Note:" text.
+     * 
+     * @return $this
+     */
     public function note() : StringBuilder
     {
         return $this->t('Note:');
     }
     
-   /**
-    * Like `note()`, but as bold text.
-    * 
-    * @return $this
-    */
+    /**
+     * Like `note()`, but as bold text.
+     * 
+     * @return $this
+     */
     public function noteBold() : StringBuilder
     {
         return $this->bold(sb()->note());
     }
     
-   /**
-    * Adds the "Hint:" text.
-    * 
-    * @return $this
-    */
+    /**
+     * Adds the "Hint:" text.
+     * 
+     * @return $this
+     */
     public function hint() : StringBuilder
     {
         return $this->t('Hint:');
@@ -287,12 +287,12 @@ 
         return $this->bold(sb()->hint());
     }
     
-   /**
-    * Adds two linebreaks.
-    *
-    * @param StringBuilder_Interface|string|NULL $content
-    * @return $this
-    */
+    /**
+     * Adds two linebreaks.
+     *
+     * @param StringBuilder_Interface|string|NULL $content
+     * @return $this
+     */
     public function para($content=null) : StringBuilder
     {
         if($content !== null) {
@@ -302,14 +302,14 @@ 
         return $this->nl()->nl();
     }
     
-   /**
-    * Adds an anchor HTML tag.
-    * 
-    * @param string $label
-    * @param string $url
-    * @param bool $newTab
-    * @return $this
-    */
+    /**
+     * Adds an anchor HTML tag.
+     * 
+     * @param string $label
+     * @param string $url
+     * @param bool $newTab
+     * @return $this
+     */
     public function link(string $label, string $url, bool $newTab=false) : StringBuilder
     {
         $target = '';
@@ -325,12 +325,12 @@ 
         );
     }
     
-   /**
-    * Wraps the string in a `code` tag.
-    * 
-    * @param string|number|StringBuilder_Interface $string
-    * @return $this
-    */
+    /**
+     * Wraps the string in a `code` tag.
+     * 
+     * @param string|number|StringBuilder_Interface $string
+     * @return $this
+     */
     public function code($string) : StringBuilder
     {
         return $this->sf(
@@ -339,24 +339,24 @@ 
         );
     }
     
-   /**
-    * Wraps the string in a `pre` tag.
-    * 
-    * @param string|number|StringBuilder_Interface $string
-    * @return $this
-    */
+    /**
+     * Wraps the string in a `pre` tag.
+     * 
+     * @param string|number|StringBuilder_Interface $string
+     * @return $this
+     */
     public function pre($string) : StringBuilder
     {
         return $this->sf('<pre>%s</pre>', strval($string));
     }
     
-   /**
-    * Wraps the text in a `span` tag with the specified classes.
-    * 
-    * @param string|number|StringBuilder_Interface $string
-    * @param string|string[] $classes
-    * @return $this
-    */
+    /**
+     * Wraps the text in a `span` tag with the specified classes.
+     * 
+     * @param string|number|StringBuilder_Interface $string
+     * @param string|string[] $classes
+     * @return $this
+     */
     public function spanned($string, $classes) : StringBuilder
     {
         if(!is_array($classes)) 

Spacing +7 added lines, -7 removed lines

@@ -68,7 +68,7 @@ 
     {
         $string = strval($string);
         
-        if(!empty($string)) 
+        if (!empty($string)) 
         {
             $this->strings[] = $string;
         }
@@ -147,7 +147,7 @@ 
     {
         array_unshift($arguments, $format);
         
-        if(!class_exists('\AppLocalize\Localization'))
+        if (!class_exists('\AppLocalize\Localization'))
         {
             return $this->sf(...$arguments);
         }
@@ -293,9 +293,9 @@ 
     * @param StringBuilder_Interface|string|NULL $content
     * @return $this
     */
-    public function para($content=null) : StringBuilder
+    public function para($content = null) : StringBuilder
     {
-        if($content !== null) {
+        if ($content !== null) {
             return $this->html('<p>')->nospace($content)->html('</p>');
         }
 
@@ -310,10 +310,10 @@ 
     * @param bool $newTab
     * @return $this
     */
-    public function link(string $label, string $url, bool $newTab=false) : StringBuilder
+    public function link(string $label, string $url, bool $newTab = false) : StringBuilder
     {
         $target = '';
-        if($newTab) {
+        if ($newTab) {
             $target = ' target="_blank"';
         }
        
@@ -359,7 +359,7 @@ 
     */
     public function spanned($string, $classes) : StringBuilder
     {
-        if(!is_array($classes)) 
+        if (!is_array($classes)) 
         {
             $classes = array(strval($classes));
         }

src/Interface/Optionable.php

Spacing +1 added lines, -1 removed lines

@@ -45,7 +45,7 @@
      * @param mixed $default The default value to return if the option does not exist.
      * @return mixed
      */
-    function getOption(string $name, $default=null);
+    function getOption(string $name, $default = null);
 
     /**
      * Sets a collection of options at once, from an

src/URLInfo.php

Indentation +199 added lines, -199 removed lines

@@ -34,42 +34,42 @@ 
     const TYPE_PHONE = 'phone';
     const TYPE_URL = 'url';
     
-   /**
-    * The original URL that was passed to the constructor.
-    * @var string
-    */
+    /**
+     * The original URL that was passed to the constructor.
+     * @var string
+     */
     protected $rawURL;
 
-   /**
-    * @var array
-    */
+    /**
+     * @var array
+     */
     protected $info;
     
-   /**
-    * @var string[]
-    */
+    /**
+     * @var string[]
+     */
     protected $excludedParams = array();
     
-   /**
-    * @var bool
-    * @see URLInfo::setParamExclusion()
-    */
+    /**
+     * @var bool
+     * @see URLInfo::setParamExclusion()
+     */
     protected $paramExclusion = false;
     
-   /**
-    * @var array
-    * @see URLInfo::getTypeLabel()
-    */
+    /**
+     * @var array
+     * @see URLInfo::getTypeLabel()
+     */
     protected static $typeLabels;
     
-   /**
-    * @var bool
-    */
+    /**
+     * @var bool
+     */
     protected $highlightExcluded = false;
     
-   /**
-    * @var array
-    */
+    /**
+     * @var array
+     */
     protected $infoKeys = array(
         'scheme',
         'host',
@@ -81,24 +81,24 @@ 
         'fragment'
     );
     
-   /**
-    * @var string
-    */
+    /**
+     * @var string
+     */
     protected $url;
     
-   /**
-    * @var URLInfo_Parser
-    */
+    /**
+     * @var URLInfo_Parser
+     */
     protected $parser;
     
-   /**
-    * @var URLInfo_Normalizer
-    */
+    /**
+     * @var URLInfo_Normalizer
+     */
     protected $normalizer;
     
-   /**
-    * @var bool
-    */
+    /**
+     * @var bool
+     */
     protected $encodeUTFChars = false;
     
     public function __construct(string $url)
@@ -115,14 +115,14 @@ 
         $this->info = $this->parser->getInfo();
     }
     
-   /**
-    * Whether to URL encode any non-encoded UTF8 characters in the URL.
-    * Default is to leave them as-is for better readability, since 
-    * browsers handle this well.
-    * 
-    * @param bool $enabled
-    * @return URLInfo
-    */
+    /**
+     * Whether to URL encode any non-encoded UTF8 characters in the URL.
+     * Default is to leave them as-is for better readability, since 
+     * browsers handle this well.
+     * 
+     * @param bool $enabled
+     * @return URLInfo
+     */
     public function setUTFEncoding(bool $enabled=true) : URLInfo
     {
         if($this->encodeUTFChars !== $enabled)
@@ -139,13 +139,13 @@ 
         return $this->encodeUTFChars;
     }
     
-   /**
-    * Filters an URL: removes control characters and the
-    * like to have a clean URL to work with.
-    * 
-    * @param string $url
-    * @return string
-    */
+    /**
+     * Filters an URL: removes control characters and the
+     * like to have a clean URL to work with.
+     * 
+     * @param string $url
+     * @return string
+     */
     public static function filterURL(string $url)
     {
         return URLInfo_Filter::filter($url);
@@ -175,12 +175,12 @@ 
         return $this->info['type'] === self::TYPE_PHONE;
     }
     
-   /**
-    * Whether the URL is a regular URL, not one of the 
-    * other types like a phone number or email address.
-    * 
-    * @return bool
-    */
+    /**
+     * Whether the URL is a regular URL, not one of the 
+     * other types like a phone number or email address.
+     * 
+     * @return bool
+     */
     public function isURL() : bool
     {
         $host = $this->getHost();
@@ -192,20 +192,20 @@ 
         return $this->parser->isValid();
     }
     
-   /**
-    * Retrieves the host name, or an empty string if none is present.
-    * 
-    * @return string
-    */
+    /**
+     * Retrieves the host name, or an empty string if none is present.
+     * 
+     * @return string
+     */
     public function getHost() : string
     {
         return $this->getInfoKey('host');
     }
     
-   /**
-    * Retrieves the path, or an empty string if none is present.
-    * @return string
-    */
+    /**
+     * Retrieves the path, or an empty string if none is present.
+     * @return string
+     */
     public function getPath() : string
     {
         return $this->getInfoKey('path');
@@ -221,10 +221,10 @@ 
         return $this->getInfoKey('scheme');
     }
     
-   /**
-    * Retrieves the port specified in the URL, or -1 if none is preseent.
-    * @return int
-    */
+    /**
+     * Retrieves the port specified in the URL, or -1 if none is preseent.
+     * @return int
+     */
     public function getPort() : int
     {
         $port = $this->getInfoKey('port');
@@ -236,13 +236,13 @@ 
         return -1;
     }
     
-   /**
-    * Retrieves the raw query string, or an empty string if none is present.
-    * 
-    * @return string
-    * 
-    * @see URLInfo::getParams()
-    */
+    /**
+     * Retrieves the raw query string, or an empty string if none is present.
+     * 
+     * @return string
+     * 
+     * @see URLInfo::getParams()
+     */
     public function getQuery() : string
     {
         return $this->getInfoKey('query');
@@ -258,20 +258,20 @@ 
         return $this->getInfoKey('pass');
     }
     
-   /**
-    * Whether the URL contains a port number.
-    * @return bool
-    */
+    /**
+     * Whether the URL contains a port number.
+     * @return bool
+     */
     public function hasPort() : bool
     {
         return $this->getPort() !== -1;
     }
     
-   /**
-    * Alias for the hasParams() method.
-    * @return bool
-    * @see URLInfo::hasParams()
-    */
+    /**
+     * Alias for the hasParams() method.
+     * @return bool
+     * @see URLInfo::hasParams()
+     */
     public function hasQuery() : bool
     {
         return $this->hasParams();
@@ -316,23 +316,23 @@ 
         return '';
     }
 
-   /**
-    * Retrieves a normalized URL: this ensures that all parameters
-    * in the URL are always in the same order.
-    * 
-    * @return string
-    */
+    /**
+     * Retrieves a normalized URL: this ensures that all parameters
+     * in the URL are always in the same order.
+     * 
+     * @return string
+     */
     public function getNormalized() : string
     {
         return $this->normalize(true);
     }
     
-   /**
-    * Like getNormalized(), but if a username and password are present
-    * in the URL, returns the URL without them.
-    * 
-    * @return string
-    */
+    /**
+     * Like getNormalized(), but if a username and password are present
+     * in the URL, returns the URL without them.
+     * 
+     * @return string
+     */
     public function getNormalizedWithoutAuth() : string
     {
         return $this->normalize(false);
@@ -353,25 +353,25 @@ 
         return $this->normalizer->normalize();
     }
     
-   /**
-    * Creates a hash of the URL, which can be used for comparisons.
-    * Since any parameters in the URL's query are sorted alphabetically,
-    * the same links with a different parameter order will have the 
-    * same hash.
-    * 
-    * @return string
-    */
+    /**
+     * Creates a hash of the URL, which can be used for comparisons.
+     * Since any parameters in the URL's query are sorted alphabetically,
+     * the same links with a different parameter order will have the 
+     * same hash.
+     * 
+     * @return string
+     */
     public function getHash()
     {
         return \AppUtils\ConvertHelper::string2shortHash($this->getNormalized());
     }
 
-   /**
-    * Highlights the URL using HTML tags with specific highlighting
-    * class names.
-    * 
-    * @return string Will return an empty string if the URL is not valid.
-    */
+    /**
+     * Highlights the URL using HTML tags with specific highlighting
+     * class names.
+     * 
+     * @return string Will return an empty string if the URL is not valid.
+     */
     public function getHighlighted() : string
     {
         if(!$this->isValid()) {
@@ -405,15 +405,15 @@ 
         return count($params);
     }
     
-   /**
-    * Retrieves all parameters specified in the url,
-    * if any, as an associative array. 
-    * 
-    * NOTE: Ignores parameters that have been added
-    * to the excluded parameters list.
-    *
-    * @return array
-    */
+    /**
+     * Retrieves all parameters specified in the url,
+     * if any, as an associative array. 
+     * 
+     * NOTE: Ignores parameters that have been added
+     * to the excluded parameters list.
+     *
+     * @return array
+     */
     public function getParams() : array
     {
         if(!$this->paramExclusion || empty($this->excludedParams)) {
@@ -431,22 +431,22 @@ 
         return $keep;
     }
     
-   /**
-    * Retrieves the names of all parameters present in the URL, if any.
-    * @return string[]
-    */
+    /**
+     * Retrieves the names of all parameters present in the URL, if any.
+     * @return string[]
+     */
     public function getParamNames() : array
     {
         $params = $this->getParams();
         return array_keys($params);
     }
     
-   /**
-    * Retrieves a specific parameter value from the URL.
-    * 
-    * @param string $name
-    * @return string The parameter value, or an empty string if it does not exist.
-    */
+    /**
+     * Retrieves a specific parameter value from the URL.
+     * 
+     * @param string $name
+     * @return string The parameter value, or an empty string if it does not exist.
+     */
     public function getParam(string $name) : string
     {
         if(isset($this->info['params'][$name])) {
@@ -456,16 +456,16 @@ 
         return '';
     }
     
-   /**
-    * Excludes an URL parameter entirely if present:
-    * the parser will act as if the parameter was not
-    * even present in the source URL, effectively
-    * stripping it.
-    *
-    * @param string $name
-    * @param string $reason A human readable explanation why this is excluded - used when highlighting links.
-    * @return URLInfo
-    */
+    /**
+     * Excludes an URL parameter entirely if present:
+     * the parser will act as if the parameter was not
+     * even present in the source URL, effectively
+     * stripping it.
+     *
+     * @param string $name
+     * @param string $reason A human readable explanation why this is excluded - used when highlighting links.
+     * @return URLInfo
+     */
     public function excludeParam(string $name, string $reason='') : URLInfo
     {
         if(!isset($this->excludedParams[$name]))
@@ -518,25 +518,25 @@ 
         return self::$typeLabels[$this->getType()];
     }
 
-   /**
-    * Whether excluded parameters should be highlighted in
-    * a different color in the URL when using the
-    * {@link URLInfo::getHighlighted()} method.
-    *
-    * @param bool $highlight
-    * @return URLInfo
-    */
+    /**
+     * Whether excluded parameters should be highlighted in
+     * a different color in the URL when using the
+     * {@link URLInfo::getHighlighted()} method.
+     *
+     * @param bool $highlight
+     * @return URLInfo
+     */
     public function setHighlightExcluded(bool $highlight=true) : URLInfo
     {
         $this->highlightExcluded = $highlight;
         return $this;
     }
     
-   /**
-    * Returns an array with all relevant URL information.
-    * 
-    * @return array
-    */
+    /**
+     * Returns an array with all relevant URL information.
+     * 
+     * @return array
+     */
     public function toArray() : array
     {
         return array(
@@ -580,24 +580,24 @@ 
         return $this;
     }
     
-   /**
-    * Whether the parameter exclusion mode is enabled:
-    * In this case, if any parameters have been added to the
-    * exclusion list, all relevant methods will exclude these.
-    *
-    * @return bool
-    */
+    /**
+     * Whether the parameter exclusion mode is enabled:
+     * In this case, if any parameters have been added to the
+     * exclusion list, all relevant methods will exclude these.
+     *
+     * @return bool
+     */
     public function isParamExclusionEnabled() : bool
     {
         return $this->paramExclusion;
     }
     
-   /**
-    * Checks whether the link contains any parameters that
-    * are on the list of excluded parameters.
-    *
-    * @return bool
-    */
+    /**
+     * Checks whether the link contains any parameters that
+     * are on the list of excluded parameters.
+     *
+     * @return bool
+     */
     public function containsExcludedParams() : bool
     {
         if(empty($this->excludedParams)) {
@@ -665,16 +665,16 @@ 
         return $this->highlightExcluded;
     }
     
-   /**
-    * Checks if the URL exists, i.e. can be connected to. Will return
-    * true if the returned HTTP status code is `200` or `302`.
-    * 
-    * NOTE: If the target URL requires HTTP authentication, the username
-    * and password should be integrated into the URL.
-    * 
-    * @return bool
-    * @throws BaseException
-    */
+    /**
+     * Checks if the URL exists, i.e. can be connected to. Will return
+     * true if the returned HTTP status code is `200` or `302`.
+     * 
+     * NOTE: If the target URL requires HTTP authentication, the username
+     * and password should be integrated into the URL.
+     * 
+     * @return bool
+     * @throws BaseException
+     */
     public function tryConnect(bool $verifySSL=true) : bool
     {
         return $this->createConnectionTester()
@@ -682,26 +682,26 @@ 
         ->canConnect();
     }
     
-   /**
-    * Creates the connection tester instance that is used
-    * to check if a URL can be connected to, and which is
-    * used in the {@see URLInfo::tryConnect()} method. It
-    * allows more settings to be used.
-    * 
-    * @return URLInfo_ConnectionTester
-    */
+    /**
+     * Creates the connection tester instance that is used
+     * to check if a URL can be connected to, and which is
+     * used in the {@see URLInfo::tryConnect()} method. It
+     * allows more settings to be used.
+     * 
+     * @return URLInfo_ConnectionTester
+     */
     public function createConnectionTester() : URLInfo_ConnectionTester
     {
         return new URLInfo_ConnectionTester($this);
     }
     
-   /**
-    * Adds/overwrites an URL parameter.
-    *  
-    * @param string $name
-    * @param string $val
-    * @return URLInfo
-    */
+    /**
+     * Adds/overwrites an URL parameter.
+     *  
+     * @param string $name
+     * @param string $val
+     * @return URLInfo
+     */
     public function setParam(string $name, string $val) : URLInfo
     {
         $this->info['params'][$name] = $val;
@@ -709,13 +709,13 @@ 
         return $this;
     }
     
-   /**
-    * Removes an URL parameter. Has no effect if the 
-    * parameter is not present to begin with.
-    * 
-    * @param string $param
-    * @return URLInfo
-    */
+    /**
+     * Removes an URL parameter. Has no effect if the 
+     * parameter is not present to begin with.
+     * 
+     * @param string $param
+     * @return URLInfo
+     */
     public function removeParam(string $param) : URLInfo
     {
         if(isset($this->info['params'][$param]))

Spacing +26 added lines, -26 removed lines

@@ -123,9 +123,9 @@ 
     * @param bool $enabled
     * @return URLInfo
     */
-    public function setUTFEncoding(bool $enabled=true) : URLInfo
+    public function setUTFEncoding(bool $enabled = true) : URLInfo
     {
-        if($this->encodeUTFChars !== $enabled)
+        if ($this->encodeUTFChars !== $enabled)
         {
             $this->encodeUTFChars = $enabled;
             $this->parse(); // re-parse the URL to apply the changes
@@ -229,7 +229,7 @@ 
     {
         $port = $this->getInfoKey('port');
         
-        if(!empty($port)) {
+        if (!empty($port)) {
             return (int)$port;
         }
         
@@ -309,7 +309,7 @@ 
     
     protected function getInfoKey(string $name) : string
     {
-        if(isset($this->info[$name])) {
+        if (isset($this->info[$name])) {
             return (string)$this->info[$name];
         }
         
@@ -338,13 +338,13 @@ 
         return $this->normalize(false);
     }
     
-    protected function normalize(bool $auth=true) : string
+    protected function normalize(bool $auth = true) : string
     {
-        if(!$this->isValid()) {
+        if (!$this->isValid()) {
             return '';
         }
         
-        if(!isset($this->normalizer)) {
+        if (!isset($this->normalizer)) {
             $this->normalizer = new URLInfo_Normalizer($this);
         }
         
@@ -374,7 +374,7 @@ 
     */
     public function getHighlighted() : string
     {
-        if(!$this->isValid()) {
+        if (!$this->isValid()) {
             return '';
         }
         
@@ -416,14 +416,14 @@ 
     */
     public function getParams() : array
     {
-        if(!$this->paramExclusion || empty($this->excludedParams)) {
+        if (!$this->paramExclusion || empty($this->excludedParams)) {
             return $this->info['params'];
         }
         
         $keep = array();
-        foreach($this->info['params'] as $name => $value) 
+        foreach ($this->info['params'] as $name => $value) 
         {
-            if(!isset($this->excludedParams[$name])) {
+            if (!isset($this->excludedParams[$name])) {
                 $keep[$name] = $value;
             }
         }
@@ -449,7 +449,7 @@ 
     */
     public function getParam(string $name) : string
     {
-        if(isset($this->info['params'][$name])) {
+        if (isset($this->info['params'][$name])) {
             return $this->info['params'][$name];
         }
         
@@ -466,9 +466,9 @@ 
     * @param string $reason A human readable explanation why this is excluded - used when highlighting links.
     * @return URLInfo
     */
-    public function excludeParam(string $name, string $reason='') : URLInfo
+    public function excludeParam(string $name, string $reason = '') : URLInfo
     {
-        if(!isset($this->excludedParams[$name]))
+        if (!isset($this->excludedParams[$name]))
         {
             $this->excludedParams[$name] = $reason;
             $this->setParamExclusion();
@@ -494,7 +494,7 @@ 
     
     public function getTypeLabel() : string
     {
-        if(!isset(self::$typeLabels))
+        if (!isset(self::$typeLabels))
         {
             self::$typeLabels = array(
                 self::TYPE_EMAIL => t('Email'),
@@ -506,7 +506,7 @@ 
         
         $type = $this->getType();
         
-        if(!isset(self::$typeLabels[$type]))
+        if (!isset(self::$typeLabels[$type]))
         {
             throw new BaseException(
                 sprintf('Unknown URL type label for type [%s].', $type),
@@ -526,7 +526,7 @@ 
     * @param bool $highlight
     * @return URLInfo
     */
-    public function setHighlightExcluded(bool $highlight=true) : URLInfo
+    public function setHighlightExcluded(bool $highlight = true) : URLInfo
     {
         $this->highlightExcluded = $highlight;
         return $this;
@@ -574,7 +574,7 @@ 
      * @see URLInfo::isParamExclusionEnabled()
      * @see URLInfo::setHighlightExcluded()
      */
-    public function setParamExclusion(bool $enabled=true) : URLInfo
+    public function setParamExclusion(bool $enabled = true) : URLInfo
     {
         $this->paramExclusion = $enabled;
         return $this;
@@ -600,13 +600,13 @@ 
     */
     public function containsExcludedParams() : bool
     {
-        if(empty($this->excludedParams)) {
+        if (empty($this->excludedParams)) {
             return false;
         }
         
         $names = array_keys($this->info['params']);
-        foreach($names as $name) {
-            if(isset($this->excludedParams[$name])) {
+        foreach ($names as $name) {
+            if (isset($this->excludedParams[$name])) {
                 return true;
             }
         }
@@ -622,7 +622,7 @@ 
 
     public function offsetSet($offset, $value) 
     {
-        if(in_array($offset, $this->infoKeys)) {
+        if (in_array($offset, $this->infoKeys)) {
             $this->info[$offset] = $value;
         }
     }
@@ -639,11 +639,11 @@ 
     
     public function offsetGet($offset) 
     {
-        if($offset === 'port') {
+        if ($offset === 'port') {
             return $this->getPort();
         }
         
-        if(in_array($offset, $this->infoKeys)) {
+        if (in_array($offset, $this->infoKeys)) {
             return $this->getInfoKey($offset);
         }
         
@@ -675,7 +675,7 @@ 
     * @return bool
     * @throws BaseException
     */
-    public function tryConnect(bool $verifySSL=true) : bool
+    public function tryConnect(bool $verifySSL = true) : bool
     {
         return $this->createConnectionTester()
         ->setVerifySSL($verifySSL)
@@ -718,7 +718,7 @@ 
     */
     public function removeParam(string $param) : URLInfo
     {
-        if(isset($this->info['params'][$param]))
+        if (isset($this->info['params'][$param]))
         {
             unset($this->info['params'][$param]);
         }