Skip to content

Commit

Permalink
Merge branch 'master' of github.com:hnhdigital-os/laravel-helper-coll…
Browse files Browse the repository at this point in the history
…ection
  • Loading branch information
RoccoHoward committed Jan 3, 2018
2 parents aab0135 + c400a5b commit 617e031
Show file tree
Hide file tree
Showing 3 changed files with 12 additions and 12 deletions.
4 changes: 2 additions & 2 deletions src/Aws.php
Original file line number Diff line number Diff line change
Expand Up @@ -12,8 +12,8 @@ class Aws
public static function client($override = [])
{
return [
'version' => array_get($override, 'version', env('AWS_VERSION')),
'region' => array_get($override, 'region', env('AWS_REGION')),
'version' => array_get($override, 'version', env('AWS_VERSION')),
'region' => array_get($override, 'region', env('AWS_REGION')),
'credentials' => [
'key' => array_get($override, 'key', env('AWS_ACCESS_KEY_ID')),
'secret' => array_get($override, 'secret', env('AWS_SECRET_ACCESS_KEY')),
Expand Down
6 changes: 3 additions & 3 deletions src/Human.php
Original file line number Diff line number Diff line change
Expand Up @@ -24,9 +24,9 @@ class Human
/**
* Convert bytes to a word.
*
* @param integer $bytes
* @param integer $decimals
* @param integer $mod
* @param int $bytes
* @param int $decimals
* @param int $mod
*
* @return string
*/
Expand Down
14 changes: 7 additions & 7 deletions src/Timezone.php
Original file line number Diff line number Diff line change
@@ -1,12 +1,12 @@
<?php

namespace HnhDigital\HelperCollection;
use \DateTime;
use \DateTimeZone;

use DateTime;
use DateTimeZone;

class Timezone
{

/**
* Region name and mask.
*
Expand All @@ -31,14 +31,14 @@ class Timezone
*/
public static function data()
{
$timezones = [];
$timezones = [];

foreach (self::$regions as $name => $mask) {
foreach (self::$regions as $name => $mask) {
$zones = DateTimeZone::listIdentifiers($mask);

foreach ($zones as $timezone) {
// Lets sample the time there right now
$time = new DateTime(NULL, new DateTimeZone($timezone));
$time = new DateTime(null, new DateTimeZone($timezone));

$offset = $time->getOffset() / 60 / 60;
$offset_whole = round($offset);
Expand All @@ -64,7 +64,7 @@ public static function optionsArray()
$result = [];

foreach ($data as $name => $zones) {
$result[] = ['BREAK', $name];
$result[] = ['BREAK', $name];
foreach ($zones as $timezone => $zone) {
$result[] = [$timezone, $zone];
}
Expand Down

0 comments on commit 617e031

Please sign in to comment.