Mistralys / application-utils

src/URLInfo/Parser.php

Indentation +73 added lines, -73 removed lines

@@ -23,24 +23,24 @@ 
  */
 class URLInfo_Parser
 {
-   /**
-    * @var string
-    */
+    /**
+     * @var string
+     */
     protected $url;
     
-   /**
-    * @var bool
-    */
+    /**
+     * @var bool
+     */
     protected $isValid = false;
     
-   /**
-    * @var array
-    */
+    /**
+     * @var array
+     */
     protected $info;
     
-   /**
-    * @var array|NULL
-    */
+    /**
+     * @var array|NULL
+     */
     protected $error;
     
     /**
@@ -57,25 +57,25 @@ 
         'git'
     );
     
-   /**
-    * Stores a list of all unicode characters in the URL
-    * that have been filtered out before parsing it with
-    * parse_url.
-    * 
-    * @var string[]string
-    */
+    /**
+     * Stores a list of all unicode characters in the URL
+     * that have been filtered out before parsing it with
+     * parse_url.
+     * 
+     * @var string[]string
+     */
     protected $unicodeChars = array();
     
-   /**
-    * @var bool
-    */
+    /**
+     * @var bool
+     */
     protected $encodeUTF = false;
     
-   /**
-    * 
-    * @param string $url The target URL.
-    * @param bool $encodeUTF Whether to URL encode any plain text unicode characters.
-    */
+    /**
+     * 
+     * @param string $url The target URL.
+     * @param bool $encodeUTF Whether to URL encode any plain text unicode characters.
+     */
     public function __construct(string $url, bool $encodeUTF)
     {
         $this->url = $url;
@@ -88,12 +88,12 @@ 
         }
     }
 
-   /**
-    * Retrieves the array as parsed by PHP's parse_url,
-    * filtered and adjusted as necessary.
-    * 
-    * @return array
-    */
+    /**
+     * Retrieves the array as parsed by PHP's parse_url,
+     * filtered and adjusted as necessary.
+     * 
+     * @return array
+     */
     public function getInfo() : array
     {
         return $this->info;
@@ -115,11 +115,11 @@ 
         }
     }
 
-   /**
-    * Finds any non-url encoded unicode characters in 
-    * the URL, and encodes them before the URL is 
-    * passed to parse_url.
-    */
+    /**
+     * Finds any non-url encoded unicode characters in 
+     * the URL, and encodes them before the URL is 
+     * passed to parse_url.
+     */
     protected function filterUnicodeChars() : void
     {
         $chars = ConvertHelper::string2array($this->url);
@@ -238,11 +238,11 @@ 
         return false;
     }
 
-   /**
-    * Goes through all information in the parse_url result
-    * array, and attempts to fix any user errors in formatting
-    * that can be recovered from, mostly regarding stray spaces.
-    */
+    /**
+     * Goes through all information in the parse_url result
+     * array, and attempts to fix any user errors in formatting
+     * that can be recovered from, mostly regarding stray spaces.
+     */
     protected function filterParsed() : void
     {
         $this->info['params'] = array();
@@ -284,13 +284,13 @@ 
         }
     }
     
-   /**
-    * Recursively goes through the array, and converts all previously
-    * URL encoded characters with their unicode character counterparts.
-    * 
-    * @param array $subject
-    * @return array
-    */
+    /**
+     * Recursively goes through the array, and converts all previously
+     * URL encoded characters with their unicode character counterparts.
+     * 
+     * @param array $subject
+     * @return array
+     */
     protected function restoreUnicodeChars(array $subject) : array
     {
         $result = array();
@@ -314,13 +314,13 @@ 
         return $result;
     }
     
-   /**
-    * Replaces all URL encoded unicode characters
-    * in the string with the unicode character.
-    * 
-    * @param string $string
-    * @return string
-    */
+    /**
+     * Replaces all URL encoded unicode characters
+     * in the string with the unicode character.
+     * 
+     * @param string $string
+     * @return string
+     */
     protected function restoreUnicodeChar(string $string) : string
     {
         if(strstr($string, '%'))
@@ -404,21 +404,21 @@ 
         );
     }
    
-   /**
-    * Checks whether the URL that was parsed is valid.
-    * @return bool
-    */
+    /**
+     * Checks whether the URL that was parsed is valid.
+     * @return bool
+     */
     public function isValid() : bool
     {
         return $this->isValid;
     }
 
-   /**
-    * If the validation failed, retrieves the validation
-    * error message.
-    * 
-    * @return string
-    */
+    /**
+     * If the validation failed, retrieves the validation
+     * error message.
+     * 
+     * @return string
+     */
     public function getErrorMessage() : string
     {
         if(isset($this->error)) {
@@ -428,12 +428,12 @@ 
         return '';
     }
     
-   /**
-    * If the validation failed, retrieves the validation
-    * error code.
-    * 
-    * @return int
-    */
+    /**
+     * If the validation failed, retrieves the validation
+     * error code.
+     * 
+     * @return int
+     */
     public function getErrorCode() : int
     {
         if(isset($this->error)) {

Spacing +33 added lines, -33 removed lines

@@ -83,7 +83,7 @@ 
         
         $this->parse();
         
-        if(!$this->detectType()) {
+        if (!$this->detectType()) {
             $this->validate();
         }
     }
@@ -109,7 +109,7 @@ 
         
         // if the URL contains any URL characters, and we
         // do not want them URL encoded, restore them.
-        if(!$this->encodeUTF && !empty($this->unicodeChars))
+        if (!$this->encodeUTF && !empty($this->unicodeChars))
         {
             $this->info = $this->restoreUnicodeChars($this->info);
         }
@@ -126,13 +126,13 @@ 
         
         $keep = array();
         
-        foreach($chars as $char)
+        foreach ($chars as $char)
         {
-            if(preg_match('/\p{L}/usix', $char))
+            if (preg_match('/\p{L}/usix', $char))
             {
                 $encoded = rawurlencode($char);
                 
-                if($encoded != $char)
+                if ($encoded != $char)
                 {
                     $this->unicodeChars[$encoded] = $char;
                     $char = $encoded;
@@ -154,11 +154,11 @@ 
             'ipAddress'
         );
         
-        foreach($types as $type)
+        foreach ($types as $type)
         {
             $method = 'detectType_'.$type;
             
-            if($this->$method() === true) 
+            if ($this->$method() === true) 
             {
                 $this->isValid = true;
                 return true;
@@ -176,11 +176,11 @@ 
             'hostIsPresent'
         );
         
-        foreach($validations as $validation) 
+        foreach ($validations as $validation) 
         {
             $method = 'validate_'.$validation;
             
-            if($this->$method() !== true) {
+            if ($this->$method() !== true) {
                 return;
             }
         }
@@ -193,13 +193,13 @@ 
         // every link needs a host. This case can happen for ex, if
         // the link starts with a typo with only one slash, like:
         // "http:/hostname"
-        if(isset($this->info['host'])) {
+        if (isset($this->info['host'])) {
             return true;
         }
         
         $this->setError(
             URLInfo::ERROR_MISSING_HOST,
-            t('Cannot determine the link\'s host name.') . ' ' .
+            t('Cannot determine the link\'s host name.').' '.
             t('This usually happens when there\'s a typo somewhere.')
         );
 
@@ -208,7 +208,7 @@ 
     
     protected function validate_schemeIsSet() : bool
     {
-        if(isset($this->info['scheme'])) {
+        if (isset($this->info['scheme'])) {
             return true;
         }
         
@@ -225,13 +225,13 @@ 
     
     protected function validate_schemeIsKnown() : bool
     {
-        if(in_array($this->info['scheme'], $this->knownSchemes)) {
+        if (in_array($this->info['scheme'], $this->knownSchemes)) {
             return true;
         }
         
         $this->setError(
             URLInfo::ERROR_INVALID_SCHEME,
-            t('The scheme %1$s is not supported for links.', $this->info['scheme']) . ' ' .
+            t('The scheme %1$s is not supported for links.', $this->info['scheme']).' '.
             t('Valid schemes are: %1$s.', implode(', ', $this->knownSchemes))
         );
 
@@ -248,36 +248,36 @@ 
         $this->info['params'] = array();
         $this->info['type'] = URLInfo::TYPE_URL;
 
-        if(isset($this->info['scheme']))
+        if (isset($this->info['scheme']))
         {
             $this->info['scheme'] = strtolower($this->info['scheme']);
         }
         else
         {
             $scheme = URLInfo_Schemes::detectScheme($this->url);
-            if(!empty($scheme)) {
-                $this->info['scheme'] = substr($scheme,0, strpos($scheme, ':'));
+            if (!empty($scheme)) {
+                $this->info['scheme'] = substr($scheme, 0, strpos($scheme, ':'));
             }
         }
 
-        if(isset($this->info['user'])) {
+        if (isset($this->info['user'])) {
             $this->info['user'] = urldecode($this->info['user']);
         }
 
-        if(isset($this->info['pass'])) {
+        if (isset($this->info['pass'])) {
             $this->info['pass'] = urldecode($this->info['pass']);
         }
         
-        if(isset($this->info['host'])) {
+        if (isset($this->info['host'])) {
             $this->info['host'] = strtolower($this->info['host']);
             $this->info['host'] = str_replace(' ', '', $this->info['host']);
         }
         
-        if(isset($this->info['path'])) {
+        if (isset($this->info['path'])) {
             $this->info['path'] = str_replace(' ', '', $this->info['path']);
         }
         
-        if(isset($this->info['query']) && !empty($this->info['query']))
+        if (isset($this->info['query']) && !empty($this->info['query']))
         {
             $this->info['params'] = ConvertHelper::parseQueryString($this->info['query']);
             ksort($this->info['params']);
@@ -295,9 +295,9 @@ 
     {
         $result = array();
         
-        foreach($subject as $key => $val)
+        foreach ($subject as $key => $val)
         {
-            if(is_array($val))
+            if (is_array($val))
             {
                 $val = $this->restoreUnicodeChars($val);
             }
@@ -323,7 +323,7 @@ 
     */
     protected function restoreUnicodeChar(string $string) : string
     {
-        if(strstr($string, '%'))
+        if (strstr($string, '%'))
         {
             return str_replace(array_keys($this->unicodeChars), array_values($this->unicodeChars), $string);
         }
@@ -333,12 +333,12 @@ 
     
     protected function detectType_email() : bool
     {
-        if(isset($this->info['scheme']) && $this->info['scheme'] == 'mailto') {
+        if (isset($this->info['scheme']) && $this->info['scheme'] == 'mailto') {
             $this->info['type'] = URLInfo::TYPE_EMAIL;
             return true;
         }
         
-        if(isset($this->info['path']) && preg_match(RegexHelper::REGEX_EMAIL, $this->info['path']))
+        if (isset($this->info['path']) && preg_match(RegexHelper::REGEX_EMAIL, $this->info['path']))
         {
             $this->info['scheme'] = 'mailto';
             $this->info['type'] = URLInfo::TYPE_EMAIL;
@@ -350,13 +350,13 @@ 
 
     protected function detectType_ipAddress() : bool
     {
-        if($this->isPathOnly() && preg_match(RegexHelper::REGEX_IPV4, $this->info['path'])) {
+        if ($this->isPathOnly() && preg_match(RegexHelper::REGEX_IPV4, $this->info['path'])) {
             $this->info['host'] = $this->info['path'];
             $this->info['scheme'] = 'https';
             unset($this->info['path']);
         }
 
-        if($this->isHostOnly() && preg_match(RegexHelper::REGEX_IPV4, $this->info['host'])) {
+        if ($this->isHostOnly() && preg_match(RegexHelper::REGEX_IPV4, $this->info['host'])) {
             $this->info['ip'] = $this->info['host'];
             return true;
         }
@@ -376,7 +376,7 @@ 
 
     protected function detectType_fragmentLink() : bool
     {
-        if(isset($this->info['fragment']) && !isset($this->info['scheme'])) {
+        if (isset($this->info['fragment']) && !isset($this->info['scheme'])) {
             $this->info['type'] = URLInfo::TYPE_FRAGMENT;
             return true;
         }
@@ -386,7 +386,7 @@ 
     
     protected function detectType_phoneLink() : bool
     {
-        if(isset($this->info['scheme']) && $this->info['scheme'] == 'tel') {
+        if (isset($this->info['scheme']) && $this->info['scheme'] == 'tel') {
             $this->info['type'] = URLInfo::TYPE_PHONE;
             return true;
         }
@@ -421,7 +421,7 @@ 
     */
     public function getErrorMessage() : string
     {
-        if(isset($this->error)) {
+        if (isset($this->error)) {
             return $this->error['message'];
         }
         
@@ -436,7 +436,7 @@ 
     */
     public function getErrorCode() : int
     {
-        if(isset($this->error)) {
+        if (isset($this->error)) {
             return $this->error['code'];
         }
         

Braces +2 added lines, -4 removed lines

@@ -251,8 +251,7 @@ 
         if(isset($this->info['scheme']))
         {
             $this->info['scheme'] = strtolower($this->info['scheme']);
-        }
-        else
+        } else
         {
             $scheme = URLInfo_Schemes::detectScheme($this->url);
             if(!empty($scheme)) {
@@ -300,8 +299,7 @@ 
             if(is_array($val))
             {
                 $val = $this->restoreUnicodeChars($val);
-            }
-            else
+            } else
             {
                 $val = $this->restoreUnicodeChar($val);
             }

src/URLInfo/Schemes.php

Spacing +4 added lines, -4 removed lines

@@ -72,8 +72,8 @@ 
     {
         self::buildCache();
 
-        foreach(self::$cache as $scheme => $length) {
-            if(strtolower(substr($url, 0, $length)) === $scheme) {
+        foreach (self::$cache as $scheme => $length) {
+            if (strtolower(substr($url, 0, $length)) === $scheme) {
                 return $scheme;
             }
         }
@@ -88,11 +88,11 @@ 
      */
     private static function buildCache() : void
     {
-        if(!empty(self::$cache)) {
+        if (!empty(self::$cache)) {
             return;
         }
 
-        foreach(self::$schemes as $scheme) {
+        foreach (self::$schemes as $scheme) {
             self::$cache[$scheme] = strlen($scheme);
         }
     }

src/RegexHelper.php

Indentation +12 added lines, -12 removed lines

@@ -42,10 +42,10 @@ 
     
     const REGEX_MD5 = '/^[a-f0-9]{32}$/i';
 
-   /**
-    * @var string
-    * @see https://en.wikipedia.org/wiki/Email_address#Local-part
-    */
+    /**
+     * @var string
+     * @see https://en.wikipedia.org/wiki/Email_address#Local-part
+     */
     const REGEX_EMAIL = '/[a-z0-9!#$%&\'*+\/=?^_`{|}~-]+(?:\.[a-z0-9!#$%&\'*+\/=?^_`{|}~-]+)*@(?:[a-z0-9](?:[a-z0-9-]*[a-z0-9])?\.)+[a-z0-9](?:[a-z0-9-]*[a-z0-9])?/i';
     
     const REGEX_PHONE = '/\A[+0-9][0-9 +\-()]+\z/m';
@@ -97,14 +97,14 @@ 
      */
     const REGEX_IS_HTML = '%<{0,1}[a-z\/][\s\S]*>|<[a-z\/][\s\S]*>{0,1}%i';
     
-   /**
-    * Hexadecimal color codes. Allows the following formats:
-    * 
-    * FFFFFF
-    * FFF
-    * 
-    * @var string
-    */
+    /**
+     * Hexadecimal color codes. Allows the following formats:
+     * 
+     * FFFFFF
+     * FFF
+     * 
+     * @var string
+     */
     const REGEX_HEX_COLOR_CODE = '/\A(?:[0-9a-fA-F]{6}|[0-9a-fA-F]{3})\z/iU';
 
     /**

src/HTMLHelper.php

Spacing +2 added lines, -2 removed lines

@@ -33,14 +33,14 @@
     {
         preg_match_all('%<([A-Z][A-Z0-9]*)\b[^>]*>(.*?)</\1>%si', $html, $result, PREG_PATTERN_ORDER);
 
-        if(empty($result[1])) {
+        if (empty($result[1])) {
             return '<p>'.$text.'</p>';
         }
 
         $tagName = array_pop($result[1]);
         $pos = strrpos($html, '</'.$tagName.'>');
 
-        if(in_array(strtolower($tagName), self::$newParaTags)) {
+        if (in_array(strtolower($tagName), self::$newParaTags)) {
             $replace = '</'.$tagName.'><p>'.$text.'</p>';
         } else {
             $replace = $text.'</'.$tagName.'>';

src/StringBuilder/Interface.php

Indentation +2 added lines, -2 removed lines

@@ -25,10 +25,10 @@
      * 
      * @return string
      */
-     function render() : string;
+        function render() : string;
      
     /**
      * Renders the string and echos it.
      */
-     function display() : void;
+        function display() : void;
 }

src/Microtime.php

Spacing +4 added lines, -4 removed lines

@@ -23,18 +23,18 @@
      * @see Microtime::ERROR_FAILED_CREATING_DATE_OBJECT
      * @see Microtime::ERROR_FAILED_CONVERTING_STRING
      */
-    public function __construct($datetime='now', DateTimeZone $timeZone=null)
+    public function __construct($datetime = 'now', DateTimeZone $timeZone = null)
     {
-        if($timeZone === null)
+        if ($timeZone === null)
         {
             $timeZone = new DateTimeZone(date_default_timezone_get());
         }
 
-        if(empty($datetime) || $datetime === 'now')
+        if (empty($datetime) || $datetime === 'now')
         {
             $dateObj = DateTime::createFromFormat('0.u00 U', microtime(), new DateTimeZone('America/Denver'));
 
-            if($dateObj === false) {
+            if ($dateObj === false) {
                 throw new ConvertHelper_Exception(
                     'Failed to create microseconds date.',
                     '',

Braces +1 added lines, -2 removed lines

@@ -49,8 +49,7 @@
         try
         {
             parent::__construct($datetime, $timeZone);
-        }
-        catch (Exception $e)
+        } catch (Exception $e)
         {
             throw new ConvertHelper_Exception(
                 'Failed to create date from string.',

src/ConvertHelper/DateInterval.php

Indentation +37 added lines, -37 removed lines

@@ -41,14 +41,14 @@ 
     const TOKEN_MONTHS = 'm';
     const TOKEN_YEARS = 'y';
     
-   /**
-    * @var DateInterval
-    */
+    /**
+     * @var DateInterval
+     */
     protected $interval;
     
-   /**
-    * @var int
-    */
+    /**
+     * @var int
+     */
     protected $seconds;
 
     /**
@@ -92,22 +92,22 @@ 
         return new ConvertHelper_DateInterval($seconds);
     }
     
-   /**
-    * Creates the interval from an existing regular interval instance.
-    * 
-    * @param DateInterval $interval
-    * @return ConvertHelper_DateInterval
-    */
+    /**
+     * Creates the interval from an existing regular interval instance.
+     * 
+     * @param DateInterval $interval
+     * @return ConvertHelper_DateInterval
+     */
     public static function fromInterval(DateInterval $interval)
     {
         return self::fromSeconds(ConvertHelper::interval2seconds($interval));
     }
     
-   /**
-    * Retrieves the PHP native date interval.
-    * 
-    * @return DateInterval
-    */
+    /**
+     * Retrieves the PHP native date interval.
+     * 
+     * @return DateInterval
+     */
     public function getInterval() : DateInterval
     {
         return $this->interval;
@@ -143,31 +143,31 @@ 
         return $this->getToken(self::TOKEN_YEARS);
     }
     
-   /**
-    * Retrieves a specific time token, e.g. "h" (for hours).
-    * Using the constants to specifiy the tokens is recommended.
-    * 
-    * @param string $token
-    * @return int
-    * 
-    * @see ConvertHelper_DateInterval::TOKEN_SECONDS
-    * @see ConvertHelper_DateInterval::TOKEN_MINUTES
-    * @see ConvertHelper_DateInterval::TOKEN_HOURS
-    * @see ConvertHelper_DateInterval::TOKEN_DAYS
-    * @see ConvertHelper_DateInterval::TOKEN_MONTHS
-    * @see ConvertHelper_DateInterval::TOKEN_YEARS
-    */
+    /**
+     * Retrieves a specific time token, e.g. "h" (for hours).
+     * Using the constants to specifiy the tokens is recommended.
+     * 
+     * @param string $token
+     * @return int
+     * 
+     * @see ConvertHelper_DateInterval::TOKEN_SECONDS
+     * @see ConvertHelper_DateInterval::TOKEN_MINUTES
+     * @see ConvertHelper_DateInterval::TOKEN_HOURS
+     * @see ConvertHelper_DateInterval::TOKEN_DAYS
+     * @see ConvertHelper_DateInterval::TOKEN_MONTHS
+     * @see ConvertHelper_DateInterval::TOKEN_YEARS
+     */
     public function getToken(string $token) : int
     {
         return (int)$this->interval->$token;
     }
     
-   /**
-    * The total amount of seconds in the interval (including
-    * everything, from seconds to days, months, years...).
-    * 
-    * @return int
-    */
+    /**
+     * The total amount of seconds in the interval (including
+     * everything, from seconds to days, months, years...).
+     * 
+     * @return int
+     */
     public function getTotalSeconds() : int
     {
         return $this->seconds;

Spacing +5 added lines, -5 removed lines

@@ -68,7 +68,7 @@ 
         
         $interval = $d2->diff($d1);
         
-        if(!$interval instanceof DateInterval)
+        if (!$interval instanceof DateInterval)
         {
             throw new ConvertHelper_Exception(
                 'Cannot create interval',
@@ -187,24 +187,24 @@ 
      * @see ConvertHelper::INTERVAL_HOURS
      * @see ConvertHelper::INTERVAL_DAYS
      */
-    public static function toTotal(DateInterval $interval, string $unit=ConvertHelper::INTERVAL_SECONDS) : int
+    public static function toTotal(DateInterval $interval, string $unit = ConvertHelper::INTERVAL_SECONDS) : int
     {
         $total = (int)$interval->format('%a');
         if ($unit == ConvertHelper::INTERVAL_DAYS) {
             return $total;
         }
 
-        $total = ($total * 24) + ((int)$interval->h );
+        $total = ($total * 24) + ((int)$interval->h);
         if ($unit == ConvertHelper::INTERVAL_HOURS) {
             return $total;
         }
 
-        $total = ($total * 60) + ((int)$interval->i );
+        $total = ($total * 60) + ((int)$interval->i);
         if ($unit == ConvertHelper::INTERVAL_MINUTES) {
             return $total;
         }
 
-        $total = ($total * 60) + ((int)$interval->s );
+        $total = ($total * 60) + ((int)$interval->s);
         if ($unit == ConvertHelper::INTERVAL_SECONDS) {
             return $total;
         }

src/ConvertHelper/DurationConverter.php

Indentation +47 added lines, -47 removed lines

@@ -34,39 +34,39 @@ 
     const SECONDS_PER_MONTH_APPROX = 2505600; // imprecise - for 29 days, only for approximations. 
     const SECONDS_PER_YEAR = 31536000;
     
-   /**
-    * @var int
-    */
+    /**
+     * @var int
+     */
     protected $dateFrom;
     
-   /**
-    * @var int
-    */
+    /**
+     * @var int
+     */
     protected $dateTo;
     
-   /**
-    * @var bool
-    */
+    /**
+     * @var bool
+     */
     protected $future = false;
     
-   /**
-    * @var string
-    */
+    /**
+     * @var string
+     */
     protected $interval = '';
     
-   /**
-    * @var int
-    */
+    /**
+     * @var int
+     */
     protected $difference = 0;
     
-   /**
-    * @var int
-    */
+    /**
+     * @var int
+     */
     protected $dateDiff = 0;
     
-   /**
-    * @var array|NULL
-    */
+    /**
+     * @var array|NULL
+     */
     protected static $texts = null;
     
     public function __construct()
@@ -86,17 +86,17 @@ 
         self::$texts = null;
     }
     
-   /**
-    * Sets the origin date to calculate from.
-    * 
-    * NOTE: if this is further in the future than
-    * the to: date, it will be considered as a 
-    * calculation for something to come, i.e. 
-    * "In two days".
-    *  
-    * @param \DateTime $date
-    * @return ConvertHelper_DurationConverter
-    */
+    /**
+     * Sets the origin date to calculate from.
+     * 
+     * NOTE: if this is further in the future than
+     * the to: date, it will be considered as a 
+     * calculation for something to come, i.e. 
+     * "In two days".
+     *  
+     * @param \DateTime $date
+     * @return ConvertHelper_DurationConverter
+     */
     public function setDateFrom(\DateTime $date) : ConvertHelper_DurationConverter
     {
         $this->dateFrom = ConvertHelper::date2timestamp($date);
@@ -104,13 +104,13 @@ 
         return $this;
     }
     
-   /**
-    * Sets the date to calculate to. Defaults to 
-    * the current time if not set.
-    * 
-    * @param \DateTime $date
-    * @return ConvertHelper_DurationConverter
-    */
+    /**
+     * Sets the date to calculate to. Defaults to 
+     * the current time if not set.
+     * 
+     * @param \DateTime $date
+     * @return ConvertHelper_DurationConverter
+     */
     public function setDateTo(\DateTime $date) : ConvertHelper_DurationConverter
     {
         $this->dateTo = ConvertHelper::date2timestamp($date);
@@ -118,14 +118,14 @@ 
         return $this;
     }
     
-   /**
-    * Converts the specified dates to a human-readable string.
-    * 
-    * @throws ConvertHelper_Exception
-    * @return string
-    * 
-    * @see ConvertHelper_DurationConverter::ERROR_NO_DATE_FROM_SET
-    */
+    /**
+     * Converts the specified dates to a human-readable string.
+     * 
+     * @throws ConvertHelper_Exception
+     * @return string
+     * 
+     * @see ConvertHelper_DurationConverter::ERROR_NO_DATE_FROM_SET
+     */
     public function convert() : string
     {
         $this->initTexts();

Spacing +11 added lines, -11 removed lines

@@ -71,7 +71,7 @@ 
     
     public function __construct()
     {
-        if(class_exists('\AppLocalize\Localization')) {
+        if (class_exists('\AppLocalize\Localization')) {
             \AppLocalize\Localization::onLocaleChanged(array($this, 'handle_localeChanged'));
         }
     }
@@ -133,11 +133,11 @@ 
         
         $epoch = 'past';
         $key = 'singular';
-        if($this->dateDiff > 1) {
+        if ($this->dateDiff > 1) {
             $key = 'plural';
         }
         
-        if($this->future) {
+        if ($this->future) {
             $epoch = 'future'; 
         }
         
@@ -150,7 +150,7 @@ 
     
     protected function initTexts()
     {
-        if(isset(self::$texts)) {
+        if (isset(self::$texts)) {
             return;
         }
         
@@ -236,7 +236,7 @@ 
         $day = (int)date("j", $this->dateTo);
         $year = (int)date("Y", $this->dateFrom);
         
-        while(mktime($hour, $min, $sec, $month + ($months_difference), $day, $year) < $this->dateTo)
+        while (mktime($hour, $min, $sec, $month + ($months_difference), $day, $year) < $this->dateTo)
         {
             $months_difference++;
         }
@@ -256,7 +256,7 @@ 
     
     protected function resolveCalculations() : void
     {
-        if(!isset($this->dateFrom))
+        if (!isset($this->dateFrom))
         {
             throw new ConvertHelper_Exception(
                 'No date from has been specified.',
@@ -266,7 +266,7 @@ 
         }
         
         // no date to set? Assume we want to use today.
-        if(!isset($this->dateTo))
+        if (!isset($this->dateTo))
         {
             $this->dateTo = time();
         }
@@ -333,7 +333,7 @@ 
         
         $difference = $this->dateTo - $this->dateFrom;
         
-        if($difference < 0)
+        if ($difference < 0)
         {
             $difference = $difference * -1;
             $this->future = true;
@@ -395,7 +395,7 @@ 
     {
         $converter = new ConvertHelper_DurationConverter();
 
-        if($datefrom instanceof DateTime)
+        if ($datefrom instanceof DateTime)
         {
             $converter->setDateFrom($datefrom);
         }
@@ -404,11 +404,11 @@ 
             $converter->setDateFrom(ConvertHelper_Date::fromTimestamp($datefrom));
         }
 
-        if($dateto instanceof DateTime)
+        if ($dateto instanceof DateTime)
         {
             $converter->setDateTo($dateto);
         }
-        else if($dateto > 0)
+        else if ($dateto > 0)
         {
             $converter->setDateTo(ConvertHelper_Date::fromTimestamp($dateto));
         }

Braces +2 added lines, -4 removed lines

@@ -398,8 +398,7 @@ 
         if($datefrom instanceof DateTime)
         {
             $converter->setDateFrom($datefrom);
-        }
-        else
+        } else
         {
             $converter->setDateFrom(ConvertHelper_Date::fromTimestamp($datefrom));
         }
@@ -407,8 +406,7 @@ 
         if($dateto instanceof DateTime)
         {
             $converter->setDateTo($dateto);
-        }
-        else if($dateto > 0)
+        } else if($dateto > 0)
         {
             $converter->setDateTo(ConvertHelper_Date::fromTimestamp($dateto));
         }

src/ConvertHelper/Date.php

Spacing +7 added lines, -7 removed lines

@@ -43,13 +43,13 @@ 
      * @param bool $short
      * @return string|NULL
      */
-    public static function toDayName(DateTime $date, bool $short=false) : ?string
+    public static function toDayName(DateTime $date, bool $short = false) : ?string
     {
         $day = $date->format('l');
         $invariant = self::getDayNamesInvariant();
 
         $idx = array_search($day, $invariant);
-        if($idx !== false) {
+        if ($idx !== false) {
             $localized = self::getDayNames($short);
             return $localized[$idx];
         }
@@ -72,11 +72,11 @@ 
      * @param bool $short
      * @return string[]
      */
-    public static function getDayNames(bool $short=false) : array
+    public static function getDayNames(bool $short = false) : array
     {
         self::initDays();
 
-        if($short) {
+        if ($short) {
             return self::$daysShort;
         }
 
@@ -102,13 +102,13 @@ 
     public static function toListLabel(DateTime $date, bool $includeTime = false, bool $shortMonth = false) : string
     {
         $today = new DateTime();
-        if($date->format('d.m.Y') === $today->format('d.m.Y'))
+        if ($date->format('d.m.Y') === $today->format('d.m.Y'))
         {
             $label = t('Today');
         }
         else
         {
-            $label = $date->format('d') . '. ' . self::month2string((int)$date->format('m'), $shortMonth) . ' ';
+            $label = $date->format('d').'. '.self::month2string((int)$date->format('m'), $shortMonth).' ';
 
             if ($date->format('Y') != date('Y'))
             {
@@ -213,7 +213,7 @@ 
 
     private static function initDays() : void
     {
-        if(!empty(self::$daysShort))
+        if (!empty(self::$daysShort))
         {
             return;
         }

Braces +1 added lines, -2 removed lines

@@ -105,8 +105,7 @@
         if($date->format('d.m.Y') === $today->format('d.m.Y'))
         {
             $label = t('Today');
-        }
-        else
+        } else
         {
             $label = $date->format('d') . '. ' . self::month2string((int)$date->format('m'), $shortMonth) . ' ';