Skip to content

[Feature] Use php's internal time zone list #966

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
alexjustesen merged 6 commits into from
Dec 8, 2023
Merged

[Feature] Use php's internal time zone list #966

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
dbb7103
use php's internal time zone list
alexjustesen Dec 8, 2023
d4dba06
removed squirephp/timezones-en
alexjustesen Dec 8, 2023
a86ce02
code quality
alexjustesen Dec 8, 2023
ed3227f
doc block
alexjustesen Dec 8, 2023
fdcfaa1
added helper to autoload file list
alexjustesen Dec 8, 2023
bd5bc38
removed toArray(), not needed
alexjustesen Dec 8, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 0 additions & 11 deletions .phpstorm.meta.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -189,7 +189,6 @@
'Spatie\LaravelSettings\SettingsMapper' => \Spatie\LaravelSettings\SettingsMapper::class,
'Spatie\LaravelSettings\SettingsRepositories\SettingsRepository' => \Spatie\LaravelSettings\SettingsRepositories\DatabaseSettingsRepository::class,
'Spatie\LaravelSettings\Support\SettingsCacheFactory' => \Spatie\LaravelSettings\Support\SettingsCacheFactory::class,
'Squire\RepositoryManager' => \Squire\RepositoryManager::class,
'Symfony\Component\HtmlSanitizer\HtmlSanitizerInterface' => \Symfony\Component\HtmlSanitizer\HtmlSanitizer::class,
'auth' => \Illuminate\Auth\AuthManager::class,
'auth.driver' => \Illuminate\Auth\SessionGuard::class,
Expand Down Expand Up @@ -427,7 +426,6 @@
'Spatie\LaravelSettings\SettingsMapper' => \Spatie\LaravelSettings\SettingsMapper::class,
'Spatie\LaravelSettings\SettingsRepositories\SettingsRepository' => \Spatie\LaravelSettings\SettingsRepositories\DatabaseSettingsRepository::class,
'Spatie\LaravelSettings\Support\SettingsCacheFactory' => \Spatie\LaravelSettings\Support\SettingsCacheFactory::class,
'Squire\RepositoryManager' => \Squire\RepositoryManager::class,
'Symfony\Component\HtmlSanitizer\HtmlSanitizerInterface' => \Symfony\Component\HtmlSanitizer\HtmlSanitizer::class,
'auth' => \Illuminate\Auth\AuthManager::class,
'auth.driver' => \Illuminate\Auth\SessionGuard::class,
Expand Down Expand Up @@ -665,7 +663,6 @@
'Spatie\LaravelSettings\SettingsMapper' => \Spatie\LaravelSettings\SettingsMapper::class,
'Spatie\LaravelSettings\SettingsRepositories\SettingsRepository' => \Spatie\LaravelSettings\SettingsRepositories\DatabaseSettingsRepository::class,
'Spatie\LaravelSettings\Support\SettingsCacheFactory' => \Spatie\LaravelSettings\Support\SettingsCacheFactory::class,
'Squire\RepositoryManager' => \Squire\RepositoryManager::class,
'Symfony\Component\HtmlSanitizer\HtmlSanitizerInterface' => \Symfony\Component\HtmlSanitizer\HtmlSanitizer::class,
'auth' => \Illuminate\Auth\AuthManager::class,
'auth.driver' => \Illuminate\Auth\SessionGuard::class,
Expand Down Expand Up @@ -903,7 +900,6 @@
'Spatie\LaravelSettings\SettingsMapper' => \Spatie\LaravelSettings\SettingsMapper::class,
'Spatie\LaravelSettings\SettingsRepositories\SettingsRepository' => \Spatie\LaravelSettings\SettingsRepositories\DatabaseSettingsRepository::class,
'Spatie\LaravelSettings\Support\SettingsCacheFactory' => \Spatie\LaravelSettings\Support\SettingsCacheFactory::class,
'Squire\RepositoryManager' => \Squire\RepositoryManager::class,
'Symfony\Component\HtmlSanitizer\HtmlSanitizerInterface' => \Symfony\Component\HtmlSanitizer\HtmlSanitizer::class,
'auth' => \Illuminate\Auth\AuthManager::class,
'auth.driver' => \Illuminate\Auth\SessionGuard::class,
Expand Down Expand Up @@ -1141,7 +1137,6 @@
'Spatie\LaravelSettings\SettingsMapper' => \Spatie\LaravelSettings\SettingsMapper::class,
'Spatie\LaravelSettings\SettingsRepositories\SettingsRepository' => \Spatie\LaravelSettings\SettingsRepositories\DatabaseSettingsRepository::class,
'Spatie\LaravelSettings\Support\SettingsCacheFactory' => \Spatie\LaravelSettings\Support\SettingsCacheFactory::class,
'Squire\RepositoryManager' => \Squire\RepositoryManager::class,
'Symfony\Component\HtmlSanitizer\HtmlSanitizerInterface' => \Symfony\Component\HtmlSanitizer\HtmlSanitizer::class,
'auth' => \Illuminate\Auth\AuthManager::class,
'auth.driver' => \Illuminate\Auth\SessionGuard::class,
Expand Down Expand Up @@ -1379,7 +1374,6 @@
'Spatie\LaravelSettings\SettingsMapper' => \Spatie\LaravelSettings\SettingsMapper::class,
'Spatie\LaravelSettings\SettingsRepositories\SettingsRepository' => \Spatie\LaravelSettings\SettingsRepositories\DatabaseSettingsRepository::class,
'Spatie\LaravelSettings\Support\SettingsCacheFactory' => \Spatie\LaravelSettings\Support\SettingsCacheFactory::class,
'Squire\RepositoryManager' => \Squire\RepositoryManager::class,
'Symfony\Component\HtmlSanitizer\HtmlSanitizerInterface' => \Symfony\Component\HtmlSanitizer\HtmlSanitizer::class,
'auth' => \Illuminate\Auth\AuthManager::class,
'auth.driver' => \Illuminate\Auth\SessionGuard::class,
Expand Down Expand Up @@ -1617,7 +1611,6 @@
'Spatie\LaravelSettings\SettingsMapper' => \Spatie\LaravelSettings\SettingsMapper::class,
'Spatie\LaravelSettings\SettingsRepositories\SettingsRepository' => \Spatie\LaravelSettings\SettingsRepositories\DatabaseSettingsRepository::class,
'Spatie\LaravelSettings\Support\SettingsCacheFactory' => \Spatie\LaravelSettings\Support\SettingsCacheFactory::class,
'Squire\RepositoryManager' => \Squire\RepositoryManager::class,
'Symfony\Component\HtmlSanitizer\HtmlSanitizerInterface' => \Symfony\Component\HtmlSanitizer\HtmlSanitizer::class,
'auth' => \Illuminate\Auth\AuthManager::class,
'auth.driver' => \Illuminate\Auth\SessionGuard::class,
Expand Down Expand Up @@ -1855,7 +1848,6 @@
'Spatie\LaravelSettings\SettingsMapper' => \Spatie\LaravelSettings\SettingsMapper::class,
'Spatie\LaravelSettings\SettingsRepositories\SettingsRepository' => \Spatie\LaravelSettings\SettingsRepositories\DatabaseSettingsRepository::class,
'Spatie\LaravelSettings\Support\SettingsCacheFactory' => \Spatie\LaravelSettings\Support\SettingsCacheFactory::class,
'Squire\RepositoryManager' => \Squire\RepositoryManager::class,
'Symfony\Component\HtmlSanitizer\HtmlSanitizerInterface' => \Symfony\Component\HtmlSanitizer\HtmlSanitizer::class,
'auth' => \Illuminate\Auth\AuthManager::class,
'auth.driver' => \Illuminate\Auth\SessionGuard::class,
Expand Down Expand Up @@ -2093,7 +2085,6 @@
'Spatie\LaravelSettings\SettingsMapper' => \Spatie\LaravelSettings\SettingsMapper::class,
'Spatie\LaravelSettings\SettingsRepositories\SettingsRepository' => \Spatie\LaravelSettings\SettingsRepositories\DatabaseSettingsRepository::class,
'Spatie\LaravelSettings\Support\SettingsCacheFactory' => \Spatie\LaravelSettings\Support\SettingsCacheFactory::class,
'Squire\RepositoryManager' => \Squire\RepositoryManager::class,
'Symfony\Component\HtmlSanitizer\HtmlSanitizerInterface' => \Symfony\Component\HtmlSanitizer\HtmlSanitizer::class,
'auth' => \Illuminate\Auth\AuthManager::class,
'auth.driver' => \Illuminate\Auth\SessionGuard::class,
Expand Down Expand Up @@ -2331,7 +2322,6 @@
'Spatie\LaravelSettings\SettingsMapper' => \Spatie\LaravelSettings\SettingsMapper::class,
'Spatie\LaravelSettings\SettingsRepositories\SettingsRepository' => \Spatie\LaravelSettings\SettingsRepositories\DatabaseSettingsRepository::class,
'Spatie\LaravelSettings\Support\SettingsCacheFactory' => \Spatie\LaravelSettings\Support\SettingsCacheFactory::class,
'Squire\RepositoryManager' => \Squire\RepositoryManager::class,
'Symfony\Component\HtmlSanitizer\HtmlSanitizerInterface' => \Symfony\Component\HtmlSanitizer\HtmlSanitizer::class,
'auth' => \Illuminate\Auth\AuthManager::class,
'auth.driver' => \Illuminate\Auth\SessionGuard::class,
Expand Down Expand Up @@ -2569,7 +2559,6 @@
'Spatie\LaravelSettings\SettingsMapper' => \Spatie\LaravelSettings\SettingsMapper::class,
'Spatie\LaravelSettings\SettingsRepositories\SettingsRepository' => \Spatie\LaravelSettings\SettingsRepositories\DatabaseSettingsRepository::class,
'Spatie\LaravelSettings\Support\SettingsCacheFactory' => \Spatie\LaravelSettings\Support\SettingsCacheFactory::class,
'Squire\RepositoryManager' => \Squire\RepositoryManager::class,
'Symfony\Component\HtmlSanitizer\HtmlSanitizerInterface' => \Symfony\Component\HtmlSanitizer\HtmlSanitizer::class,
'auth' => \Illuminate\Auth\AuthManager::class,
'auth.driver' => \Illuminate\Auth\SessionGuard::class,
Expand Down
14 changes: 13 additions & 1 deletion _ide_helper.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18665,7 +18665,18 @@ public static function sanitizeHtml()

}

namespace Livewire {
namespace App\Helpers {
/**
*
*
*/
class TimeZoneHelper {

}

}

namespace Livewire {
/**
*
*
Expand Down Expand Up @@ -26312,6 +26323,7 @@ class URL extends \Illuminate\Support\Facades\URL {}
class Validator extends \Illuminate\Support\Facades\Validator {}
class View extends \Illuminate\Support\Facades\View {}
class Vite extends \Illuminate\Support\Facades\Vite {}
class TimeZoneHelper extends \App\Helpers\TimeZoneHelper {}
class Livewire extends \Livewire\Livewire {}
class Excel extends \Maatwebsite\Excel\Facades\Excel {}
class Flare extends \Spatie\LaravelIgnition\Facades\Flare {}
Expand Down
4 changes: 2 additions & 2 deletions app/Filament/Pages/Settings/GeneralPage.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,14 +2,14 @@

namespace App\Filament\Pages\Settings;

use App\Helpers\TimeZoneHelper;
use App\Rules\Cron;
use App\Settings\GeneralSettings;
use Filament\Forms;
use Filament\Forms\Form;
use Filament\Pages\SettingsPage;
use Illuminate\Support\Facades\Http;
use Illuminate\Support\HtmlString;
use Squire\Models\Timezone;

class GeneralPage extends SettingsPage
{
Expand Down Expand Up @@ -53,7 +53,7 @@ public function form(Form $form): Form
->columnSpan(['md' => 2]),
Forms\Components\Select::make('timezone')
->label('Time zone')
->options(Timezone::all()->pluck('code', 'code'))
->options(TimeZoneHelper::list())
->searchable()
->required(),
Forms\Components\TextInput::make('time_format')
Expand Down
28 changes: 28 additions & 0 deletions app/Helpers/TimeZoneHelper.php
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,28 @@
<?php

namespace App\Helpers;

use Illuminate\Support\Facades\Cache;

class TimeZoneHelper
{
/**
* Returns a collection of time zones with their offset from UTC.
*/
public static function list()
{
$seconds = 3600; // 1hr

return Cache::remember('timezones_list_collection', $seconds, function () {
$timestamp = time();

foreach (timezone_identifiers_list() as $key => $value) {
date_default_timezone_set($value);

$timezone[$value] = $value.' (UTC '.date('P', $timestamp).')';
}

return collect($timezone)->sortKeys();
});
}
}
6 changes: 3 additions & 3 deletions composer.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,8 +25,7 @@
"livewire/livewire": "^3.2.6",
"maatwebsite/excel": "^3.1.50",
"maennchen/zipstream-php": "^2.4",
"spatie/laravel-settings": "^2.8.3",
"squirephp/timezones-en": "^3.4.4"
"spatie/laravel-settings": "^2.8.3"
},
"require-dev": {
"barryvdh/laravel-ide-helper": "^2.13",
Expand All @@ -41,7 +40,8 @@
},
"autoload": {
"files": [
"app/helpers.php"
"app/helpers.php",
"app/Helpers/TimeZoneHelper.php"
],
"psr-4": {
"App\\": "app/",
Expand Down
Loading