Skip to content

Commit

Permalink
Laravel 11 upgrade (#12)
Browse files Browse the repository at this point in the history
  • Loading branch information
a21ns1g4ts authored Jun 28, 2024
1 parent 20e8104 commit 13a7248
Show file tree
Hide file tree
Showing 3 changed files with 22 additions and 11 deletions.
16 changes: 8 additions & 8 deletions composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -22,10 +22,10 @@
"php": "^8.1",
"ext-json": "*",
"bezhansalleh/filament-exceptions": "^2.0",
"bezhansalleh/filament-shield": "^3.0",
"bezhansalleh/filament-shield": "^3.2",
"blade-ui-kit/blade-heroicons": "^2.1",
"blade-ui-kit/blade-icons": "^1.5",
"blade-ui-kit/blade-ui-kit": "^0.4.0",
"blade-ui-kit/blade-icons": "^1.6",
"blade-ui-kit/blade-ui-kit": "^0.6.2",
"blade-ui-kit/blade-zondicons": "^1.4",
"brickx/maintenance-switch": "^1.0",
"cms-multi/filament-clear-cache": "^2.0",
Expand All @@ -37,13 +37,13 @@
"filament/tables": "^3.2",
"hasnayeen/themes": "^3.0",
"husam-tariq/filament-database-schedule": "^2.0",
"illuminate/support": "^10.0",
"illuminate/support": "^10.0|^11.0",
"jeffgreco13/filament-breezy": "^2.1",
"malzariey/filament-daterangepicker-filter": "^2.2",
"marjose123/filament-webhook-server": "^2.0",
"opcodesio/log-viewer": "^2.4",
"marjose123/filament-webhook-server": "^2.1",
"opcodesio/log-viewer": "^3.10",
"pxlrbt/filament-environment-indicator": "^2.0",
"solution-forest/filament-firewall": "^2.0",
"solution-forest/filament-firewall": "^2.0.1",
"spatie/laravel-data": "^3.6",
"spatie/laravel-enum": "^3.0",
"spatie/laravel-stats": "^2.1",
Expand All @@ -52,7 +52,7 @@
"widiu7omo/filament-bandel": "^2.0",
"xlite-dev/filament-impersonate": "^2.0",
"ysfkaya/filament-phone-input": "^2.1",
"z3d0x/filament-logger": "^0.6"
"z3d0x/filament-logger": "^0.7"
},
"require-dev": {
"laravel/pint": "dev-main",
Expand Down
4 changes: 1 addition & 3 deletions src/Console/OctoInstallCommand.php
Original file line number Diff line number Diff line change
Expand Up @@ -140,7 +140,5 @@ private function setUpUserAccount()
return $user;
}

public function factoryData()
{
}
public function factoryData() {}
}
13 changes: 13 additions & 0 deletions src/Settings/SettingsServiceProvider.php
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,7 @@ public function packageBooted(): void
{
parent::packageBooted();

// TODO: In logger not will be set. Implement it
// return if running in the console
if (App::runningInConsole()) {
return;
Expand All @@ -40,6 +41,7 @@ public function packageBooted(): void

$this->syncName();
$this->syncTimezone();
// $this->syncLocale(); // See locale middlewareS
}

private function syncTimezone(): void
Expand All @@ -62,4 +64,15 @@ private function syncName(): void
Config::set('app.name', $name);
}
}

// private function syncLocale(): void
// {
// $locale = $this->settings->locale;

// if ($locale) {
// Config::set('app.locale', $locale);
// App::setLocale($locale);
// \Locale::setDefault($locale);
// }
// }
}

0 comments on commit 13a7248

Please sign in to comment.