FGFS-4.1/phpvms
4
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Cleanup Utils #467 (#547)

Browse Source 
* Remove Utils Facade
This commit is contained in:
Nabeel S
2020-02-11 12:32:41 -05:00
committed by GitHub
parent be6c164f03
commit b36a3009dd
27 changed files with 281 additions and 289 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
.travis.yml
View File

@@ -8,8 +8,8 @@ php:
# - '7.3'
- '7.4'
env:
- DB=mysql
#env:
# - DB=mysql
# - DB=mariadb
cache:
@@ -23,8 +23,8 @@ cache:
services:
- mysql
addons:
mariadb: '10.2'
#addons:
# mariadb: '10.2'
install:
- php --version

7
.travis/deploy_script.sh
View File

@@ -107,9 +107,12 @@ if [ "$TRAVIS" = "true" ]; then
make clean
cd /tmp
ls -al $TRAVIS_BUILD_DIR/../
tar -czf $TAR_NAME -C $TRAVIS_BUILD_DIR/../
sha256sum $TAR_NAME >"$TAR_NAME.sha256"
tar2zip $TAR_NAME
sha256sum $ZIP_NAME >"$ZIP_NAME.sha256"
ls -al /tmp
@@ -117,8 +120,8 @@ if [ "$TRAVIS" = "true" ]; then
mkdir -p $TRAVIS_BUILD_DIR/build
cd $TRAVIS_BUILD_DIR/build
mv "/tmp/$TAR_NAME" "/tmp/$ZIP_NAME" "/tmp/$TAR_NAME.sha256" .
artifacts upload --target-paths "/" $ZIP_NAME $TAR_NAME $TRAVIS_BUILD_DIR/VERSION $TAR_NAME.sha256
mv "/tmp/$TAR_NAME" "/tmp/$ZIP_NAME" "/tmp/$TAR_NAME.sha256" "/tmp/$ZIP_NAME.sha256".
artifacts upload --target-paths "/" $ZIP_NAME $TAR_NAME $TRAVIS_BUILD_DIR/VERSION $TAR_NAME.sha256 $ZIP_NAME.sha256
# Upload the version for a tagged release. Move to a version file in different
# tags. Within phpVMS, we have an option of which version to track in the admin

4
app/Console/Commands/AcarsReplay.php
View File

@@ -3,7 +3,7 @@
namespace App\Console\Commands;
use App\Contracts\Command;
use App\Facades\Utils;
use App\Support\Units\Time;
use GuzzleHttp\Client;
use Illuminate\Database\Eloquent\Collection;
@@ -64,7 +64,7 @@ class AcarsReplay extends Command
protected function startPirep($flight): string
{
// convert the planned flight time to be completely in minutes
$pft = Utils::hoursToMinutes(
$pft = Time::hoursToMinutes(
$flight->planned_hrsenroute,
$flight->planned_minenroute
);

2
app/Contracts/Award.php
View File

@@ -2,10 +2,10 @@
namespace App\Contracts;
use App\Facades\Utils;
use App\Models\Award as AwardModel;
use App\Models\User;
use App\Models\UserAward;
use App\Support\Utils;
use Exception;
use Illuminate\Support\Facades\Log;

222
app/Facades/Utils.php
View File

@@ -1,222 +0,0 @@
<?php
namespace App\Facades;
use GuzzleHttp\Client;
use Illuminate\Support\Facades\Facade;
class Utils extends Facade
{
/**
* @return string
*/
protected static function getFacadeAccessor(): string
{
return 'utils';
}
/**
* 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;
}
/**
* Download a URI. If a file is given, it will save the downloaded
* content into that file
*
* @param string $uri
* @param null $file
*
* @throws \RuntimeException
* @throws \GuzzleHttp\Exception\GuzzleException
*
* @return string
*/
public static function downloadUrl($uri, $file = null): string
{
$opts = [];
if ($file !== null) {
$opts['sink'] = $file;
}
$client = new Client();
$response = $client->request('GET', $uri, $opts);
$body = $response->getBody()->getContents();
if ($response->getHeader('content-type') === 'application/json') {
$body = \GuzzleHttp\json_decode($body);
}
return $body;
}
/**
* 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;
}
/**
* @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;
}
/**
* 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;
}
}

3
app/Http/Controllers/Admin/PirepController.php
View File

@@ -3,7 +3,6 @@
namespace App\Http\Controllers\Admin;
use App\Contracts\Controller;
use App\Facades\Utils;
use App\Http\Requests\CreatePirepRequest;
use App\Http\Requests\UpdatePirepRequest;
use App\Models\Enums\PirepSource;
@@ -260,7 +259,7 @@ class PirepController extends Controller
$hours = (int) $attrs['hours'];
$minutes = (int) $attrs['minutes'];
$pirep->flight_time = Utils::hoursToMinutes($hours) + $minutes;
$pirep->flight_time = Time::hoursToMinutes($hours) + $minutes;
$this->saveCustomFields($pirep, $request);
$this->saveFares($pirep, $request);

2
app/Http/Controllers/Admin/UserController.php
View File

@@ -3,7 +3,6 @@
namespace App\Http\Controllers\Admin;
use App\Contracts\Controller;
use App\Facades\Utils;
use App\Http\Requests\CreateUserRequest;
use App\Http\Requests\UpdateUserRequest;
use App\Models\Rank;
@@ -15,6 +14,7 @@ use App\Repositories\PirepRepository;
use App\Repositories\UserRepository;
use App\Services\UserService;
use App\Support\Timezonelist;
use App\Support\Utils;
use Illuminate\Http\Request;
use Illuminate\Support\Facades\DB;
use Illuminate\Support\Facades\Hash;

2
app/Http/Controllers/Auth/RegisterController.php
View File

@@ -3,7 +3,6 @@
namespace App\Http\Controllers\Auth;
use App\Contracts\Controller;
use App\Facades\Utils;
use App\Models\Enums\UserState;
use App\Models\User;
use App\Repositories\AirlineRepository;
@@ -11,6 +10,7 @@ use App\Repositories\AirportRepository;
use App\Services\UserService;
use App\Support\Countries;
use App\Support\Timezonelist;
use App\Support\Utils;
use Illuminate\Contracts\Validation\Validator;
use Illuminate\Foundation\Auth\RegistersUsers;
use Illuminate\Http\Request;

3
app/Http/Controllers/Frontend/PirepController.php
View File

@@ -3,7 +3,6 @@
namespace App\Http\Controllers\Frontend;
use App\Contracts\Controller;
use App\Facades\Utils;
use App\Http\Requests\CreatePirepRequest;
use App\Http\Requests\UpdatePirepRequest;
use App\Models\Enums\PirepSource;
@@ -324,7 +323,7 @@ class PirepController extends Controller
// Any special fields
$hours = (int) $request->input('hours', 0);
$minutes = (int) $request->input('minutes', 0);
$pirep->flight_time = Utils::hoursToMinutes($hours) + $minutes;
$pirep->flight_time = Time::hoursToMinutes($hours) + $minutes;
// Set the correct fuel units
$pirep->block_fuel = new Fuel((float) $request->input('block_fuel'), setting('units.fuel'));

2
app/Http/Controllers/Frontend/ProfileController.php
View File

@@ -3,13 +3,13 @@
namespace App\Http\Controllers\Frontend;
use App\Contracts\Controller;
use App\Facades\Utils;
use App\Models\User;
use App\Repositories\AirlineRepository;
use App\Repositories\AirportRepository;
use App\Repositories\UserRepository;
use App\Support\Countries;
use App\Support\Timezonelist;
use App\Support\Utils;
use Illuminate\Http\Request;
use Illuminate\Support\Facades\Auth;
use Illuminate\Support\Facades\Hash;

23
app/Providers/DirectiveServiceProvider.php Normal file
View File

@@ -0,0 +1,23 @@
<?php
namespace App\Providers;
use Illuminate\Support\Facades\Blade;
use Illuminate\Support\ServiceProvider;
/**
* Keep custom directives that can be used in templates
*/
class DirectiveServiceProvider extends ServiceProvider
{
public function boot(): void
{
Blade::directive('minutestotime', function ($expr) {
return "<?php echo \App\Support\Units\Time::minutesToTimeString($expr); ?>";
});
Blade::directive('minutestohours', function ($expr) {
return "<?php echo \App\Support\Units\Time::minutesToHours($expr); ?>";
});
}
}

30
app/Support/Dates.php
View File

@@ -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
*

16
app/Support/HttpClient.php
View File

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

117
app/Support/Units/Time.php
View File

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

31
app/Support/Utils.php
View File

@@ -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
*/

12
config/app.php
View File

@@ -74,13 +74,14 @@ return [
* Application Service Providers...
*/
App\Providers\AppServiceProvider::class,
App\Providers\CronServiceProvider::class,
App\Providers\BroadcastServiceProvider::class,
App\Providers\AuthServiceProvider::class,
App\Providers\EventServiceProvider::class,
App\Providers\RouteServiceProvider::class,
App\Providers\MeasurementsProvider::class,
App\Providers\BindServiceProviders::class,
App\Providers\BroadcastServiceProvider::class,
App\Providers\CronServiceProvider::class,
App\Providers\DirectiveServiceProvider::class,
App\Providers\EventServiceProvider::class,
App\Providers\MeasurementsProvider::class,
App\Providers\RouteServiceProvider::class,
],
'aliases' => [
@@ -120,7 +121,6 @@ return [
'Theme' => Igaster\LaravelTheme\Facades\Theme::class,
'Updater' => Codedge\Updater\UpdaterFacade::class,
'URL' => Illuminate\Support\Facades\URL::class,
'Utils' => App\Facades\Utils::class,
'Validator' => Illuminate\Support\Facades\Validator::class,
'Version' => PragmaRX\Version\Package\Facade::class,
'View' => Illuminate\Support\Facades\View::class,

5
modules/Importer/Services/Importers/UserImport.php
View File

@@ -2,10 +2,11 @@
namespace Modules\Importer\Services\Importers;
use App\Facades\Utils;
use App\Models\Enums\UserState;
use App\Models\User;
use App\Services\UserService;
use App\Support\Units\Time;
use App\Support\Utils;
use Illuminate\Support\Facades\Hash;
use Illuminate\Support\Facades\Log;
use Illuminate\Support\Str;
@@ -62,7 +63,7 @@ class UserImport extends BaseImporter
'home_airport_id' => $row->hub,
'curr_airport_id' => $row->hub,
'flights' => (int) $row->totalflights,
'flight_time' => Utils::hoursToMinutes($row->totalhours),
'flight_time' => Time::hoursToMinutes($row->totalhours),
'state' => $state,
'created_at' => $this->parseDate($row->joindate),
];

2
modules/Installer/Http/Controllers/InstallerController.php
View File

@@ -3,7 +3,6 @@
namespace Modules\Installer\Http\Controllers;
use App\Contracts\Controller;
use App\Facades\Utils;
use App\Models\User;
use App\Repositories\AirlineRepository;
use App\Services\AnalyticsService;
@@ -13,6 +12,7 @@ use App\Services\Installer\MigrationService;
use App\Services\Installer\SeederService;
use App\Services\UserService;
use App\Support\Countries;
use App\Support\Utils;
use Illuminate\Database\QueryException;
use Illuminate\Http\Request;
use Illuminate\Support\Facades\Hash;

2
resources/views/admin/aircraft/table.blade.php
View File

@@ -24,7 +24,7 @@
</td>
<td style="text-align: center;">{{ $ac->airport_id }}</td>
<td style="text-align: center;">
{{ Utils::minutesToTimeString($ac->flight_hours) }}
@minutestotime($ac->flight_hours)
</td>
<td style="text-align: center;">
@if($ac->status == \App\Models\Enums\AircraftStatus::ACTIVE)

2
resources/views/admin/pireps/pirep_card.blade.php
View File

@@ -35,7 +35,7 @@
</div>
<div>
<span class="description"><b>Flight Time</b>&nbsp;
{{ Utils::minutesToTimeString($pirep->flight_time) }}
@minutestotime($pirep->flight_time)
</span>
</div>
@if($pirep->aircraft)

2
resources/views/admin/pireps/show_fields.blade.php
View File

@@ -56,7 +56,7 @@
</tr>
<tr>
<td>Flight Time</td>
<td>{{ Utils::minutesToTimeString($pirep->flight_time) }}</td>
<td>@minutestotime($pirep->flight_time)</td>
</tr>
<tr>
<td>Flight Level</td>

2
resources/views/admin/users/fields.blade.php
View File

@@ -104,7 +104,7 @@
</tr>
<tr>
<td>Flight Time</td>
<td>{{ Utils::minutesToTimeString($user->flight_time) }}</td>
<td>@minutestotime($user->flight_time)</td>
</tr>
<tr>
<td>IP Address</td>

2
resources/views/layouts/default/dashboard/index.blade.php
View File

@@ -25,7 +25,7 @@
<div class="icon-background">
<i class="far fa-clock icon"></i>
</div>
<h3 class="header">{{ \App\Facades\Utils::minutesToTimeString($user->flight_time, false)}}</h3>
<h3 class="header">@minutestotime($user->flight_time), {{$user->flight_time}}</h3>
<h5 class="description">@lang('dashboard.totalhours')</h5>
</div>
</div>

20
resources/views/layouts/default/pireps/pirep_card.blade.php
View File

@@ -25,15 +25,15 @@
<div>
@if($pirep->state === PirepState::PENDING)
<div class="badge badge-warning">
@elseif($pirep->state === PirepState::ACCEPTED)
<div class="badge badge-success">
@elseif($pirep->state === PirepState::REJECTED)
<div class="badge badge-danger">
@else
<div class="badge badge-info">
@endif
{{ PirepState::label($pirep->state) }}</div>
</div>
@elseif($pirep->state === PirepState::ACCEPTED)
<div class="badge badge-success">
@elseif($pirep->state === PirepState::REJECTED)
<div class="badge badge-danger">
@else
<div class="badge badge-info">
@endif
{{ PirepState::label($pirep->state) }}</div>
</div>
</div>
<div class="col-sm-10">
<div class="row">
@@ -41,7 +41,7 @@
<table class="table-condensed" width="100%">
<tr>
<td nowrap><span class="title">@lang('pireps.flighttime')&nbsp;</span></td>
<td>{{ Utils::minutesToTimeString($pirep->flight_time) }}</td>
<td>@minutestotime($pirep->flight_time)</td>
</tr>
<tr>
<td nowrap><span class="title">@lang('common.aircraft')&nbsp;</span></td>

4
resources/views/layouts/default/profile/index.blade.php
View File

@@ -47,7 +47,7 @@
<div class="card text-center">
<div class="card-body">
<div class="social-description">
<h2>{{ \App\Facades\Utils::minutesToTimeString($user->flight_time, false) }}</h2>
<h2>@minutestotime($user->flight_time)</h2>
<p>@lang('flights.flighthours')</p>
</div>
</div>
@@ -74,7 +74,7 @@
<div class="card text-center">
<div class="card-body">
<div class="social-description">
<h2>{{ \App\Facades\Utils::minutesToHours($user->transfer_time) }}h</h2>
<h2>@minutestohours($user->transfer_time)h</h2>
<p>@lang('profile.transferhours')</p>
</div>
</div>

2
resources/views/layouts/default/users/table.blade.php
View File

@@ -41,7 +41,7 @@
@endif
</td>
<td align="center">{{ $user->flights }}</td>
<td align="center">{{ \App\Facades\Utils::minutesToTimeString($user->flight_time) }}</td>
<td align="center">@minutestotime($user->flight_time)</td>
</tr>
@endforeach
</tbody>

43
tests/UtilsTest.php
View File

@@ -1,12 +1,15 @@
<?php
use App\Facades\Utils;
use App\Support\ICAO;
use App\Support\Units\Time;
use App\Support\Utils;
use Carbon\Carbon;
class UtilsTest extends TestCase
{
public function testDates()
{
$carbon = new \Carbon\Carbon('2018-04-28T12:55:40Z');
$carbon = new Carbon('2018-04-28T12:55:40Z');
$this->assertNotNull($carbon);
}
@@ -15,46 +18,49 @@ class UtilsTest extends TestCase
*/
public function testSecondsToTimeParts()
{
$t = Utils::secondsToTimeParts(3600);
$t = Time::secondsToTimeParts(3600);
$this->assertEquals(['h' => 1, 'm' => 0, 's' => 0], $t);
$t = Utils::secondsToTimeParts(3720);
$t = Time::secondsToTimeParts(3720);
$this->assertEquals(['h' => 1, 'm' => 2, 's' => 0], $t);
$t = Utils::secondsToTimeParts(3722);
$t = Time::secondsToTimeParts(3722);
$this->assertEquals(['h' => 1, 'm' => 2, 's' => 2], $t);
$t = Utils::secondsToTimeParts(60);
$t = Time::secondsToTimeParts(60);
$this->assertEquals(['h' => 0, 'm' => 1, 's' => 0], $t);
$t = Utils::secondsToTimeParts(62);
$t = Time::secondsToTimeParts(62);
$this->assertEquals(['h' => 0, 'm' => 1, 's' => 2], $t);
}
/**
* @throws \Exception
*/
public function testSecondsToTime()
{
$t = Utils::secondsToTimeString(3600);
$t = Time::secondsToTimeString(3600);
$this->assertEquals('1h 0m', $t);
$t = Utils::secondsToTimeString(3720);
$t = Time::secondsToTimeString(3720);
$this->assertEquals('1h 2m', $t);
$t = Utils::secondsToTimeString(3722);
$t = Time::secondsToTimeString(3722);
$this->assertEquals('1h 2m', $t);
$t = Utils::secondsToTimeString(3722, true);
$t = Time::secondsToTimeString(3722, true);
$this->assertEquals('1h 2m 2s', $t);
}
public function testMinutesToTime()
{
$t = Utils::minutesToTimeParts(65);
$t = Time::minutesToTimeParts(65);
$this->assertEquals(['h' => 1, 'm' => 5], $t);
$t = Utils::minutesToTimeString(65);
$t = Time::minutesToTimeString(65);
$this->assertEquals('1h 5m', $t);
$t = Utils::minutesToTimeString(43200);
$t = Time::minutesToTimeString(43200);
$this->assertEquals('720h 0m', $t);
}
@@ -64,9 +70,12 @@ class UtilsTest extends TestCase
$this->assertNotNull($api_key);
}
/**
* @throws \Exception
*/
public function testHexCode()
{
$hex_code = \App\Support\ICAO::createHexCode();
$hex_code = ICAO::createHexCode();
$this->assertNotNull($hex_code);
}
@@ -82,9 +91,9 @@ class UtilsTest extends TestCase
];
foreach ($tests as $case) {
$this->assertEquals('phpvms.net', \App\Support\Utils::getRootDomain($case));
$this->assertEquals('phpvms.net', Utils::getRootDomain($case));
}
$this->assertEquals('phpvms', \App\Support\Utils::getRootDomain('http://phpvms'));
$this->assertEquals('phpvms', Utils::getRootDomain('http://phpvms'));
}
}