Cleanup Utils #467 (#547)

* Remove Utils Facade

app/Support/Dates.php

@@ -6,6 +6,36 @@ use Carbon\Carbon;
 
 class Dates
 {
+    /**
+     * Bitwise operator for setting days of week to integer field
+     *
+     * @param int   $datefield initial datefield
+     * @param array $day_enums Array of values from config("enum.days")
+     *
+     * @return int
+     */
+    public static function setDays(int $datefield, array $day_enums): int
+    {
+        foreach ($day_enums as $day) {
+            $datefield |= $day;
+        }
+
+        return $datefield;
+    }
+
+    /**
+     * Bit check if a day exists within a integer bitfield
+     *
+     * @param int $datefield datefield from database
+     * @param int $day_enum  Value from config("enum.days")
+     *
+     * @return bool
+     */
+    public static function hasDay(int $datefield, int $day_enum): bool
+    {
+        return ($datefield & $day_enum) === $datefield;
+    }
+
     /**
      * Get the list of months, given a start date
      *

app/Support/HttpClient.php

@@ -55,10 +55,18 @@ class HttpClient
      */
     public function download($uri, $local_path)
     {
-        $response = $this->httpClient->request('GET', $uri, [
-            'sink' => $local_path,
-        ]);
+        $opts = [];
+        if ($local_path !== null) {
+            $opts['sink'] = $local_path;
+        }
 
-        return $response;
+        $response = $this->httpClient->request('GET', $uri, $opts);
+
+        $body = $response->getBody()->getContents();
+        if ($response->getHeader('content-type') === 'application/json') {
+            $body = \GuzzleHttp\json_decode($body);
+        }
+
+        return $body;
     }
 }

app/Support/Units/Time.php

@@ -4,9 +4,6 @@ namespace App\Support\Units;
 
 use Illuminate\Contracts\Support\Arrayable;
 
-/**
- * Class Time
- */
 class Time implements Arrayable
 {
     public $hours;
@@ -90,4 +87,118 @@ class Time implements Arrayable
     {
         return $this->getMinutes();
     }
+
+    /**
+     * @param string $minutes
+     *
+     * @return array
+     */
+    public static function minutesToTimeParts($minutes): array
+    {
+        $hours = floor($minutes / 60);
+        $minutes %= 60;
+
+        return ['h' => $hours, 'm' => $minutes];
+    }
+
+    public static function minutesToTimeString($minutes): string
+    {
+        $hm = self::minutesToTimeParts($minutes);
+        return $hm['h'].'h '.$hm['m'].'m';
+    }
+
+    /**
+     * Convert seconds to an array of hours, minutes, seconds
+     *
+     * @param int $seconds
+     *
+     * @throws \Exception
+     *
+     * @return array['h', 'm', 's']
+     */
+    public static function secondsToTimeParts($seconds): array
+    {
+        $dtF = new \DateTimeImmutable('@0', new \DateTimeZone('UTC'));
+        $dtT = new \DateTimeImmutable("@$seconds", new \DateTimeZone('UTC'));
+
+        $t = $dtF->diff($dtT);
+
+        $retval = [];
+        $retval['h'] = (int) $t->format('%h');
+        $retval['m'] = (int) $t->format('%i');
+        $retval['s'] = (int) $t->format('%s');
+
+        return $retval;
+    }
+
+    /**
+     * Convert seconds to HH MM format
+     *
+     * @param int  $seconds
+     * @param bool $incl_sec
+     *
+     * @throws \Exception
+     *
+     * @return string
+     */
+    public static function secondsToTimeString($seconds, $incl_sec = false): string
+    {
+        $hms = self::secondsToTimeParts($seconds);
+        $format = $hms['h'].'h '.$hms['m'].'m';
+        if ($incl_sec) {
+            $format .= ' '.$hms['s'].'s';
+        }
+
+        return $format;
+    }
+
+    /**
+     * @param $minutes
+     *
+     * @return float|int
+     */
+    public static function minutesToSeconds($minutes)
+    {
+        return $minutes * 60;
+    }
+
+    /**
+     * Convert the seconds to minutes and then round it up
+     *
+     * @param $seconds
+     *
+     * @return float|int
+     */
+    public static function secondsToMinutes($seconds)
+    {
+        return ceil($seconds / 60);
+    }
+
+    /**
+     * Convert hours to minutes. Pretty complex
+     *
+     * @param $minutes
+     *
+     * @return float|int
+     */
+    public static function minutesToHours($minutes)
+    {
+        return $minutes / 60;
+    }
+
+    /**
+     * @param      $hours
+     * @param null $minutes
+     *
+     * @return float|int
+     */
+    public static function hoursToMinutes($hours, $minutes = null)
+    {
+        $total = (int) $hours * 60;
+        if ($minutes) {
+            $total += (int) $minutes;
+        }
+
+        return $total;
+    }
 }

app/Support/Utils.php

@@ -11,6 +11,37 @@ use Nwidart\Modules\Facades\Module;
  */
 class Utils
 {
+    /**
+     * Returns a 40 character API key that a user can use
+     *
+     * @return string
+     */
+    public static function generateApiKey(): string
+    {
+        $key = substr(sha1(time().mt_rand()), 0, 20);
+        return $key;
+    }
+
+    /**
+     * Simple check on the first character if it's an object or not
+     *
+     * @param $obj
+     *
+     * @return bool
+     */
+    public static function isObject($obj): bool
+    {
+        if (!$obj) {
+            return false;
+        }
+
+        if ($obj[0] === '{' || $obj[0] === '[') {
+            return true;
+        }
+
+        return false;
+    }
+
     /**
      * Enable the debug toolbar
      */