dedalozzo / tool-bag

src/ToolBag/Helper/TextHelper.php

Braces +37 added lines, -28 removed lines

@@ -45,10 +45,11 @@ 
    * @bug https://bugs.php.net/bug.php?id=64667
    */
   public static function convertCharset($text, $stripslashes = FALSE, $fromCharset = 'Windows-1252', $toCharset = 'UTF-8') {
-    if ($stripslashes)
-      return iconv($fromCharset, $toCharset, stripslashes($text));
-    else
-      return iconv($fromCharset, $toCharset, $text);
+    if ($stripslashes) {
+          return iconv($fromCharset, $toCharset, stripslashes($text));
+    } else {
+          return iconv($fromCharset, $toCharset, $text);
+    }
   }
 
 
@@ -64,22 +65,25 @@ 
    * @warning This function works with UTF-8 strings.
    */
   public static function truncate($text, $length = 200, $etc = ' ...', $charset='UTF-8', $breakWords = FALSE, $middle = FALSE) {
-    if ($length == 0)
-      return '';
+    if ($length == 0) {
+          return '';
+    }
 
     if (mb_strlen($text) > $length) {
       $length -= min($length, mb_strlen($etc, $charset));
 
-      if (!$breakWords && !$middle)
-        $text = preg_replace('/\s+?(\S+)?$/u', '', mb_substr($text, 0, $length+1, $charset));
-
-      if(!$middle)
-        return mb_substr($text, 0, $length, $charset) . $etc;
-      else
-        return mb_substr($text, 0, $length/2, $charset) . $etc . mb_substr($text, -$length/2, (mb_strlen($text, $charset) - $length/2), $charset);
+      if (!$breakWords && !$middle) {
+              $text = preg_replace('/\s+?(\S+)?$/u', '', mb_substr($text, 0, $length+1, $charset));
+      }
+
+      if(!$middle) {
+              return mb_substr($text, 0, $length, $charset) . $etc;
+      } else {
+              return mb_substr($text, 0, $length/2, $charset) . $etc . mb_substr($text, -$length/2, (mb_strlen($text, $charset) - $length/2), $charset);
+      }
+    } else {
+          return $text;
     }
-    else
-      return $text;
   }
 
 
@@ -105,8 +109,9 @@ 
     // Removes the content of <pre></pre>.
     $temp = preg_replace('/<(pre)(?:(?!<\/\1).)*?<\/\1>/su', '', $text);
 
-    if (is_null($temp))
-      throw new \RuntimeException(array_flip(get_defined_constants(TRUE)['pcre'])[preg_last_error()]);
+    if (is_null($temp)) {
+          throw new \RuntimeException(array_flip(get_defined_constants(TRUE)['pcre'])[preg_last_error()]);
+    }
 
     // Removes all the HTML tags.
     $temp = strip_tags($temp);
@@ -137,9 +142,12 @@ 
     $length = mb_strlen($str, $charset);
 
     $subs = [];
-    for ($i = 0; $i < $length; $i++)
-      for ($j = 1; $j <= $length; $j++)
-        $subs[] = mb_substr($str, $i, $j, $charset);
+    for ($i = 0; $i < $length; $i++) {
+          for ($j = 1;
+    }
+    $j <= $length; $j++) {
+              $subs[] = mb_substr($str, $i, $j, $charset);
+      }
 
     return array_unique($subs);
   }
@@ -236,25 +244,26 @@ 
     if (mb_strpos($r[0], '.') === FALSE) {
       $result['salutation'] = '';
       $result['first'] = $r[0];
-    }
-    else {
+    } else {
       $result['salutation'] = $r[0];
       $result['first'] = $r[1];
     }
 
     // Checks last for period, assume suffix if so
-    if (mb_strpos($r[$size - 1], '.') === FALSE)
-      $result['suffix'] = '';
-    else
-      $result['suffix'] = $r[$size - 1];
+    if (mb_strpos($r[$size - 1], '.') === FALSE) {
+          $result['suffix'] = '';
+    } else {
+          $result['suffix'] = $r[$size - 1];
+    }
 
     // Combines remains into last.
     $start = ($result['salutation']) ? 2 : 1;
     $end = ($result['suffix']) ? $size - 2 : $size - 1;
 
     $last = '';
-    for ($i = $start; $i <= $end; $i++)
-      $last .= ' '.$r[$i];
+    for ($i = $start; $i <= $end; $i++) {
+          $last .= ' '.$r[$i];
+    }
 
     $result['last'] = trim($last);
 

Spacing +6 added lines, -6 removed lines

@@ -63,7 +63,7 @@ 
    * @return string
    * @warning This function works with UTF-8 strings.
    */
-  public static function truncate($text, $length = 200, $etc = ' ...', $charset='UTF-8', $breakWords = FALSE, $middle = FALSE) {
+  public static function truncate($text, $length = 200, $etc = ' ...', $charset = 'UTF-8', $breakWords = FALSE, $middle = FALSE) {
     if ($length == 0)
       return '';
 
@@ -71,12 +71,12 @@ 
       $length -= min($length, mb_strlen($etc, $charset));
 
       if (!$breakWords && !$middle)
-        $text = preg_replace('/\s+?(\S+)?$/u', '', mb_substr($text, 0, $length+1, $charset));
+        $text = preg_replace('/\s+?(\S+)?$/u', '', mb_substr($text, 0, $length + 1, $charset));
 
-      if(!$middle)
-        return mb_substr($text, 0, $length, $charset) . $etc;
+      if (!$middle)
+        return mb_substr($text, 0, $length, $charset).$etc;
       else
-        return mb_substr($text, 0, $length/2, $charset) . $etc . mb_substr($text, -$length/2, (mb_strlen($text, $charset) - $length/2), $charset);
+        return mb_substr($text, 0, $length / 2, $charset).$etc.mb_substr($text, -$length / 2, (mb_strlen($text, $charset) - $length / 2), $charset);
     }
     else
       return $text;
@@ -91,7 +91,7 @@ 
    * @warning This function works with UTF-8 strings.
    */
   public static function capitalize($text, $charset = 'UTF-8') {
-    return mb_strtoupper(mb_substr($text, 0, 1, $charset), $charset) . mb_strtolower(mb_substr($text, 1, mb_strlen($text, $charset), $charset), $charset);
+    return mb_strtoupper(mb_substr($text, 0, 1, $charset), $charset).mb_strtolower(mb_substr($text, 1, mb_strlen($text, $charset), $charset), $charset);
   }
 
 

src/ToolBag/Helper/ArrayHelper.php

Braces +13 added lines, -10 removed lines

@@ -50,10 +50,11 @@ 
   public static function fromJson($json, $assoc) {
     $data = json_decode((string)$json, $assoc);
 
-    if (is_null($data))
-      switch (json_last_error()) {
+    if (is_null($data)) {
+          switch (json_last_error()) {
         case JSON_ERROR_DEPTH:
           throw new JSONErrorException("Unable to parse the given JSON, the maximum stack depth has been exceeded.");
+    }
           break;
         case JSON_ERROR_STATE_MISMATCH:
           throw new JSONErrorException("Unable to parse the given JSON, invalid or malformed JSON.");
@@ -92,10 +93,11 @@ 
    */
   public static function value($key, array $array) {
 
-    if (array_key_exists($key, $array))
-      return $array[$key];
-    else
-      return FALSE;
+    if (array_key_exists($key, $array)) {
+          return $array[$key];
+    } else {
+          return FALSE;
+    }
   }
 
 
@@ -107,10 +109,11 @@ 
    */
   public static function key($key, array $array) {
 
-    if (array_key_exists($key, $array))
-      return $key;
-    else
-      return FALSE;
+    if (array_key_exists($key, $array)) {
+          return $key;
+    } else {
+          return FALSE;
+    }
   }
 
 

Spacing +1 added lines, -1 removed lines

@@ -155,7 +155,7 @@
     // An array with the used keys.
     $keys = [];
 
-    foreach($array as $value) {
+    foreach ($array as $value) {
 
       if (!in_array($value[$key], $keys)) {
         $keys[$i] = $value[$key];

src/ToolBag/Helper/TimeHelper.php

Braces +27 added lines, -23 removed lines

@@ -69,8 +69,7 @@ 
 
       // Converts microseconds in seconds.
       $seconds = floor($microseconds / $microsecondsInASecond);
-    }
-    else {
+    } else {
       // Calculates difference in seconds.
       $seconds = time() - $timestamp;
     }
@@ -125,25 +124,29 @@ 
     if ($today == date('Ymd', $timestamp)) {
       $time = self::since($timestamp);
 
-      if ($time['hours'] > 1)
-        return sprintf('%d hours ago', $time['hours']);
-      elseif ($time['hours'] == 1)
-        return "one hour ago";
-      elseif ($time['minutes'] > 1)
-        return sprintf('%d minutes ago', $time['minutes']);
-      elseif ($time['minutes'] == 1)
-        return "one minute ago";
-      elseif ($time['seconds'] > 1)
-        return sprintf('%d seconds ago', $time['seconds']);
-      else // $time['seconds'] == 1
+      if ($time['hours'] > 1) {
+              return sprintf('%d hours ago', $time['hours']);
+      } elseif ($time['hours'] == 1) {
+              return "one hour ago";
+      } elseif ($time['minutes'] > 1) {
+              return sprintf('%d minutes ago', $time['minutes']);
+      } elseif ($time['minutes'] == 1) {
+              return "one minute ago";
+      } elseif ($time['seconds'] > 1) {
+              return sprintf('%d seconds ago', $time['seconds']);
+      } else {
+        // $time['seconds'] == 1
         return "one second ago";
+      }
     }
     // Yesterday.
-    elseif (strtotime('-1 day', $today) == date('Ymd', $timestamp))
-      return "yesterday";
+    elseif (strtotime('-1 day', $today) == date('Ymd', $timestamp)) {
+          return "yesterday";
+    }
     // In the past.
-    else
-      return $showTime ? date('d/m/Y H:i', $timestamp) : date('d/m/Y', $timestamp);
+    else {
+          return $showTime ? date('d/m/Y H:i', $timestamp) : date('d/m/Y', $timestamp);
+    }
   }
 
 
@@ -257,12 +260,13 @@ 
     $minDate = (new \DateTime())->setDate($aYear, $aMonth, $aDay)->modify('midnight');
     $maxDate = clone($minDate);
 
-    if (isset($day))
-      $maxDate->modify('tomorrow')->modify('last second');
-    elseif (isset($month))
-      $maxDate->modify('last day of this month')->modify('last second');
-    else
-      $maxDate->setDate($aYear, 12, 31)->modify('last second');
+    if (isset($day)) {
+          $maxDate->modify('tomorrow')->modify('last second');
+    } elseif (isset($month)) {
+          $maxDate->modify('last day of this month')->modify('last second');
+    } else {
+          $maxDate->setDate($aYear, 12, 31)->modify('last second');
+    }
   }
 
 }
\ No newline at end of file

src/ToolBag/Helper/ClassHelper.php

Braces +5 added lines, -4 removed lines

@@ -44,10 +44,11 @@
    * @return string The namespace's root.
    */
   public static function getClassRoot($namespace) {
-    if (preg_match('/^(.*[\\\\])/', $namespace, $matches))
-      return $matches[0];
-    else
-      return "";
+    if (preg_match('/^(.*[\\\\])/', $namespace, $matches)) {
+          return $matches[0];
+    } else {
+          return "";
+    }
   }
 
 }
\ No newline at end of file