Mistralys / application-utils

src/ConvertHelper/DurationConverter.php

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

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() : void
     {
-        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));
         }

Indentation +47 added lines, -47 removed lines

@@ -34,39 +34,39 @@ 
     public const SECONDS_PER_MONTH_APPROX = 2505600; // imprecise - for 29 days, only for approximations. 
     public const SECONDS_PER_YEAR = 31536000;
     
-   /**
-    * @var int|NULL
-    */
+    /**
+     * @var int|NULL
+     */
     protected $dateFrom;
     
-   /**
-    * @var int|NULL
-    */
+    /**
+     * @var int|NULL
+     */
     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<string,array<string,string>>|NULL
-    */
+    /**
+     * @var array<string,array<string,string>>|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();

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) . ' ';
 

src/ConvertHelper/Array.php

Spacing +14 added lines, -14 removed lines

@@ -15,9 +15,9 @@ 
      */
     public static function removeKeys(array &$sourceArray, array $keys) : void
     {
-        foreach($keys as $key)
+        foreach ($keys as $key)
         {
-            if(array_key_exists($key, $sourceArray)) {
+            if (array_key_exists($key, $sourceArray)) {
                 unset($sourceArray[$key]);
             }
         }
@@ -31,18 +31,18 @@ 
      * @param bool $keepKeys Whether to maintain index association
      * @return array<number|string,mixed>
      */
-    public static function removeValues(array $sourceArray, array $values, bool $keepKeys=false) : array
+    public static function removeValues(array $sourceArray, array $values, bool $keepKeys = false) : array
     {
         $result = array();
         $values = array_values($values);
 
-        foreach($sourceArray as $key => $value)
+        foreach ($sourceArray as $key => $value)
         {
-            if(in_array($value, $values, true)) {
+            if (in_array($value, $values, true)) {
                 continue;
             }
 
-            if($keepKeys) {
+            if ($keepKeys) {
                 $result[$key] = $value;
                 continue;
             }
@@ -75,7 +75,7 @@ 
     public static function toStyleString(array $subject) : string
     {
         $tokens = array();
-        foreach($subject as $name => $value) {
+        foreach ($subject as $name => $value) {
             $tokens[] = $name.':'.strval($value);
         }
 
@@ -104,18 +104,18 @@ 
     public static function toAttributeString(array $array) : string
     {
         $tokens = array();
-        foreach($array as $attr => $value)
+        foreach ($array as $attr => $value)
         {
             $value = strval($value);
 
-            if($value === '') {
+            if ($value === '') {
                 continue;
             }
 
             $tokens[] = $attr.'="'.htmlspecialchars($value, ENT_QUOTES, 'UTF-8').'"';
         }
 
-        if(empty($tokens)) {
+        if (empty($tokens)) {
             return '';
         }
 
@@ -136,17 +136,17 @@ 
      */
     public static function implodeWithAnd(array $list, string $sep = ', ', string $conjunction = '') : string
     {
-        if(empty($list)) {
+        if (empty($list)) {
             return '';
         }
 
-        if(empty($conjunction)) {
+        if (empty($conjunction)) {
             $conjunction = ' '.t('and').' ';
         }
 
         $last = array_pop($list);
-        if($list) {
-            return implode($sep, $list) . $conjunction . $last;
+        if ($list) {
+            return implode($sep, $list).$conjunction.$last;
         }
 
         return $last;

src/OutputBuffering.php

Spacing +5 added lines, -5 removed lines

@@ -68,7 +68,7 @@ 
     {
         self::$stack[] = 1;
 
-        if(ob_start() === true) {
+        if (ob_start() === true) {
             return;
         }
 
@@ -90,7 +90,7 @@ 
     {
         self::_stop();
 
-        if(ob_end_clean() !== false)
+        if (ob_end_clean() !== false)
         {
             return;
         }
@@ -107,7 +107,7 @@ 
      */
     private static function _stop() : void
     {
-        if(empty(self::$stack))
+        if (empty(self::$stack))
         {
             throw new OutputBuffering_Exception(
                 'Output buffering is not active',
@@ -130,7 +130,7 @@ 
     {
         self::_stop();
 
-        if(ob_end_flush() !== false)
+        if (ob_end_flush() !== false)
         {
             return;
         }
@@ -158,7 +158,7 @@ 
 
         $content = ob_get_clean();
 
-        if($content !== false)
+        if ($content !== false)
         {
             return $content;
         }

src/ConvertHelper/TextComparer.php

Spacing +2 added lines, -2 removed lines

@@ -87,14 +87,14 @@
     public function match(string $source, string $target) : float
     {
         // avoid doing this via levenshtein
-        if($source === $target) {
+        if ($source === $target) {
             return 100;
         }
 
         $maxL = $this->getMaxDistance();
 
         $diff = levenshtein($source, $target);
-        if($diff > $maxL) {
+        if ($diff > $maxL) {
             return 0;
         }
 

src/ConvertHelper/Comparator.php

Spacing +4 added lines, -4 removed lines

@@ -49,19 +49,19 @@
      */
     protected static function convertScalarForComparison($scalar) : ?string
     {
-        if($scalar === '' || is_null($scalar)) {
+        if ($scalar === '' || is_null($scalar)) {
             return null;
         }
 
-        if(is_bool($scalar)) {
+        if (is_bool($scalar)) {
             return ConvertHelper_Bool::toStringStrict($scalar);
         }
 
-        if(is_array($scalar)) {
+        if (is_array($scalar)) {
             $scalar = md5(serialize($scalar));
         }
 
-        if($scalar !== null && !is_scalar($scalar)) {
+        if ($scalar !== null && !is_scalar($scalar)) {
             throw new ConvertHelper_Exception(
                 'Not a scalar value in comparison',
                 null,

src/ConvertHelper/String.php

Spacing +16 added lines, -16 removed lines

@@ -33,14 +33,14 @@ 
      * @param bool $caseInsensitive
      * @return ConvertHelper_StringMatch[]
      */
-    public static function findString(string $needle, string $haystack, bool $caseInsensitive=false): array
+    public static function findString(string $needle, string $haystack, bool $caseInsensitive = false): array
     {
-        if($needle === '') {
+        if ($needle === '') {
             return array();
         }
 
         $function = 'mb_strpos';
-        if($caseInsensitive) {
+        if ($caseInsensitive) {
             $function = 'mb_stripos';
         }
 
@@ -48,7 +48,7 @@ 
         $positions = array();
         $length = mb_strlen($needle);
 
-        while( ($pos = $function($haystack, $needle, $pos)) !== false)
+        while (($pos = $function($haystack, $needle, $pos)) !== false)
         {
             $match = mb_substr($haystack, $pos, $length);
             $positions[] = new ConvertHelper_StringMatch($pos, $match);
@@ -71,7 +71,7 @@ 
     public static function toArray(string $string) : array
     {
         $result = preg_split('//u', $string, 0, PREG_SPLIT_NO_EMPTY);
-        if($result !== false) {
+        if ($result !== false) {
             return $result;
         }
 
@@ -124,7 +124,7 @@ 
      */
     public static function toUtf8(string $string) : string
     {
-        if(!self::isASCII($string)) {
+        if (!self::isASCII($string)) {
             return Encoding::toUTF8($string);
         }
 
@@ -142,11 +142,11 @@ 
      */
     public static function isASCII($string) : bool
     {
-        if($string === '' || $string === NULL) {
+        if ($string === '' || $string === NULL) {
             return true;
         }
 
-        if(!is_string($string)) {
+        if (!is_string($string)) {
             return false;
         }
 
@@ -161,12 +161,12 @@ 
      */
     public static function isHTML(string $string) : bool
     {
-        if(preg_match('%<[a-z/][\s\S]*>%siU', $string)) {
+        if (preg_match('%<[a-z/][\s\S]*>%siU', $string)) {
             return true;
         }
 
         $decoded = html_entity_decode($string);
-        if($decoded !== $string) {
+        if ($decoded !== $string) {
             return true;
         }
 
@@ -198,7 +198,7 @@ 
      * @param int $tabSize The amount of spaces per tab.
      * @return string
      */
-    public static function tabs2spaces(string $string, int $tabSize=4) : string
+    public static function tabs2spaces(string $string, int $tabSize = 4) : string
     {
         return str_replace("\t", str_repeat(' ', $tabSize), $string);
     }
@@ -210,7 +210,7 @@ 
      * @param int $tabSize The amount of spaces per tab in the source string.
      * @return string
      */
-    public static function spaces2tabs(string $string, int $tabSize=4) : string
+    public static function spaces2tabs(string $string, int $tabSize = 4) : string
     {
         return str_replace(str_repeat(' ', $tabSize), "\t", $string);
     }
@@ -289,7 +289,7 @@ 
             return $text;
         }
 
-        return trim(mb_substr($text, 0, $targetLength)) . $append;
+        return trim(mb_substr($text, 0, $targetLength)).$append;
     }
 
     /**
@@ -302,7 +302,7 @@ 
      */
     public static function explodeTrim(string $delimiter, string $string) : array
     {
-        if(empty($string) || empty($delimiter)) {
+        if (empty($string) || empty($delimiter)) {
             return array();
         }
 
@@ -310,8 +310,8 @@ 
         $tokens = array_map('trim', $tokens);
 
         $keep = array();
-        foreach($tokens as $token) {
-            if($token !== '') {
+        foreach ($tokens as $token) {
+            if ($token !== '') {
                 $keep[] = $token;
             }
         }

src/RequestHelper/Exception.php

Indentation +8 added lines, -8 removed lines

@@ -22,9 +22,9 @@ 
  */
 class RequestHelper_Exception extends BaseException
 {
-   /**
-    * @var RequestHelper_Response|NULL
-    */
+    /**
+     * @var RequestHelper_Response|NULL
+     */
     protected $response = null;
 
     /**
@@ -37,11 +37,11 @@ 
         return $this;
     }
     
-   /**
-    * Retrieves the related response instance, if available.
-    * 
-    * @return RequestHelper_Response|NULL
-    */
+    /**
+     * Retrieves the related response instance, if available.
+     * 
+     * @return RequestHelper_Response|NULL
+     */
     public function getResponse() : ?RequestHelper_Response
     {
         return $this->response;

src/NumberInfo/Comparer.php

Spacing +7 added lines, -7 removed lines

@@ -55,12 +55,12 @@ 
      */
     private function validate() : bool
     {
-        if($this->a->getUnits() !== $this->b->getUnits())
+        if ($this->a->getUnits() !== $this->b->getUnits())
         {
             return false;
         }
 
-        if($this->a->isEmpty() || $this->b->isEmpty())
+        if ($this->a->isEmpty() || $this->b->isEmpty())
         {
             return false;
         }
@@ -70,7 +70,7 @@ 
 
     public function isBiggerThan() : bool
     {
-        if($this->valid === false)
+        if ($this->valid === false)
         {
             return false;
         }
@@ -80,7 +80,7 @@ 
 
     public function isBiggerEqual() : bool
     {
-        if($this->valid === false)
+        if ($this->valid === false)
         {
             return false;
         }
@@ -90,7 +90,7 @@ 
 
     public function isSmallerThan() : bool
     {
-        if($this->valid === false)
+        if ($this->valid === false)
         {
             return false;
         }
@@ -100,7 +100,7 @@ 
 
     public function isSmallerEqual() : bool
     {
-        if($this->valid === false)
+        if ($this->valid === false)
         {
             return false;
         }
@@ -110,7 +110,7 @@ 
 
     public function isEqual() : bool
     {
-        if($this->valid === false)
+        if ($this->valid === false)
         {
             return false;
         }