Merge pull request #289 from OpenAdministration/shift-163100

Laravel 12.x Shift

Author: lukas-staab

.env.example

@@ -4,12 +4,13 @@ APP_KEY=
 APP_DEBUG=true
 APP_URL=http://localhost
 
-APP_TIMEZONE=Europe/Berlin
 APP_LOCALE=de
 APP_FALLBACK_LOCALE=en
 APP_FAKER_LOCALE=de_DE
 APP_MAINTENANCE_DRIVER=file
 APP_MAINTENANCE_STORE=database
+# PHP_CLI_SERVER_WORKERS=4
+
 BCRYPT_ROUNDS=12
 
 LOG_CHANNEL=stack
@@ -45,7 +46,7 @@ SESSION_DOMAIN=null
 #MAIL_PORT=1025
 #MAIL_USERNAME=null
 #MAIL_PASSWORD=null
-#MAIL_ENCRYPTION=null
+MAIL_SCHEME=null
 #MAIL_FROM_ADDRESS="hello@example.com"
 #MAIL_FROM_NAME="${APP_NAME}"
 

.gitignore

@@ -3,6 +3,7 @@
 /public/build
 /public/storage
 /storage/*.key
+/storage/pail
 /vendor
 .env
 .env.testing
@@ -15,6 +16,7 @@ Homestead.yaml
 npm-debug.log
 yarn-error.log
 /.idea
+/.nova
 /.vscode
 /public/css/app.css
 /public/js/app.js

app/Console/Commands/LegacyDeleteBudgetPlan.php

@@ -25,7 +25,7 @@ class LegacyDeleteBudgetPlan extends Command
     /**
      * Execute the console command.
      */
-    public function handle()
+    public function handle(): void
     {
         $hhp = LegacyBudgetPlan::findOrFail($this->argument('id'));
         $groups = $hhp->budgetGroups();

app/Console/Commands/LegacyMigrateEncryption.php

@@ -9,6 +9,7 @@
 use forms\projekte\auslagen\AuslagenHandler2;
 use Illuminate\Console\Command;
 use Illuminate\Contracts\Encryption\DecryptException;
+use Illuminate\Support\Env;
 use Illuminate\Support\Facades\DB;
 
 class LegacyMigrateEncryption extends Command
@@ -32,7 +33,7 @@ class LegacyMigrateEncryption extends Command
      */
     public function handle(): int
     {
-        if (! isset($_ENV['CHAT_PRIVATE_KEY'], $_ENV['CHAT_PUBLIC_KEY'], $_ENV['IBAN_SECRET_KEY'])) {
+        if (! Env::get('CHAT_PRIVATE_KEY') !== null && Env::get('CHAT_PUBLIC_KEY') !== null && Env::get('IBAN_SECRET_KEY') !== null) {
             $this->error('Please set chat private key and public key / IBAN_SECRET_KEY');
 
             return self::FAILURE;
@@ -49,13 +50,13 @@ public function handle(): int
                         if (str_starts_with($message->text, '$enc$')) {
                             // old prefix
                             $text = substr($text, strlen('$enc$'));
-                            $text = ChatHandler::legacyDecryptMessage($text, $_ENV['CHAT_PRIVATE_KEY']);
+                            $text = ChatHandler::legacyDecryptMessage($text, Env::get('CHAT_PRIVATE_KEY'));
                             $message->text = \Crypt::encryptString($text);
                             $message->save();
                             $count++;
                         } elseif ($message->type === -1) {
                             // not used productive anymore, was "private message"
-                            $text = ChatHandler::legacyDecryptMessage($text, $_ENV['CHAT_PRIVATE_KEY']);
+                            $text = ChatHandler::legacyDecryptMessage($text, Env::get('CHAT_PRIVATE_KEY'));
                             $message->text = \Crypt::encryptString($text);
                             $message->save();
                             $count++;

app/Console/Commands/StuFisHealth.php

@@ -23,7 +23,7 @@ class StuFisHealth extends Command
     /**
      * Execute the console command.
      */
-    public function handle()
+    public function handle(): void
     {
         $output = collect([
             'version' => config('stufis.version', ''),

app/Http/Controllers/BudgetPlanController.php

@@ -6,12 +6,13 @@
 use App\Models\Enums\BudgetType;
 use App\Models\FiscalYear;
 use Illuminate\Http\RedirectResponse;
+use Illuminate\Support\Facades\Gate;
 
 class BudgetPlanController extends Controller
 {
     public function index()
     {
-        $this->authorize('viewAny', BudgetPlan::class);
+        Gate::authorize('viewAny', BudgetPlan::class);
 
         $years = FiscalYear::orderByDesc('start_date')->get();
 
@@ -23,7 +24,7 @@ public function index()
     public function show(int $plan_id)
     {
         $plan = BudgetPlan::findOrFail($plan_id);
-        $this->authorize('view', $plan);
+        Gate::authorize('view', $plan);
         $items = [
             BudgetType::INCOME->slug() => $plan->budgetItemsTree(BudgetType::INCOME),
             BudgetType::EXPENSE->slug() => $plan->budgetItemsTree(BudgetType::EXPENSE),
@@ -34,7 +35,7 @@ public function show(int $plan_id)
 
     public function create(): RedirectResponse
     {
-        $this->authorize('create', BudgetPlan::class);
+        Gate::authorize('create', BudgetPlan::class);
         $plan = BudgetPlan::create(['state' => 'draft']);
         $groups = $plan->budgetItems()->createMany([
             ['is_group' => 1, 'budget_type' => BudgetType::INCOME, 'position' => 0, 'short_name' => 'E1'],
@@ -51,8 +52,6 @@ public function create(): RedirectResponse
             ]);
         });
 
-        return redirect()->route('budget-plan.edit', ['plan_id' => $plan->id]);
+        return to_route('budget-plan.edit', ['plan_id' => $plan->id]);
     }
 }
-
-

app/Http/Controllers/Controller.php

@@ -2,12 +2,4 @@
 
 namespace App\Http\Controllers;
 
-use Illuminate\Foundation\Auth\Access\AuthorizesRequests;
-use Illuminate\Foundation\Bus\DispatchesJobs;
-use Illuminate\Foundation\Validation\ValidatesRequests;
-use Illuminate\Routing\Controller as BaseController;
-
-abstract class Controller extends BaseController
-{
-    use AuthorizesRequests, DispatchesJobs, ValidatesRequests;
-}
+abstract class Controller {}

app/Http/Controllers/Legacy/DeleteExpenses.php

@@ -20,9 +20,9 @@ public function __invoke(int $expense_id)
         $userPerm =
             AuthHandler::getInstance()->hasGroup('ref-finanzen-hv')
             || $project->creator->id === \Auth::user()->id
-            || explode(';', $expense->created)[1] === \Auth::user()->username;
+            || explode(';', (string) $expense->created)[1] === \Auth::user()->username;
         // authorize state
-        $deletableState = ! in_array(explode(';', $expense->state)[0], ['instructed', 'booked'], true);
+        $deletableState = ! in_array(explode(';', (string) $expense->state)[0], ['instructed', 'booked'], true);
 
         if ($userPerm === false || $deletableState === false) {
             abort(403);
@@ -53,6 +53,6 @@ public function __invoke(int $expense_id)
         });
         \DB::commit();
 
-        return redirect()->route('legacy.dashboard', ['sub' => 'mygremium']);
+        return to_route('legacy.dashboard', ['sub' => 'mygremium']);
     }
 }

app/Http/Controllers/Legacy/DeleteProject.php

@@ -25,6 +25,6 @@ public function __invoke(int $project_id)
         $project->posts()->delete();
         $project->delete();
 
-        return redirect()->route('legacy.dashboard', ['sub' => 'mygremium']);
+        return to_route('legacy.dashboard', ['sub' => 'mygremium']);
     }
 }

app/Http/Controllers/Legacy/ExportController.php

@@ -5,7 +5,7 @@
 use App\Exports\LegacyBudgetExport;
 use App\Http\Controllers\Controller;
 use App\Models\Legacy\LegacyBudgetPlan;
-use Carbon\Carbon;
+use Illuminate\Support\Facades\Date;
 use Maatwebsite\Excel\Excel;
 
 class ExportController extends Controller
@@ -18,10 +18,10 @@ public function budgetPlan(int $id, string $filetype)
         };
         $plan = LegacyBudgetPlan::findOrFail($id);
         $today = today()->format('Y-m-d');
-        $start = Carbon::make($plan->von)?->format('y-m');
-        $end = Carbon::make($plan->bis)?->format('y-m');
+        $start = Date::make($plan->von)?->format('y-m');
+        $end = Date::make($plan->bis)?->format('y-m');
         $fileName = "$today HHP $start".($end ? " bis $end" : '').".$filetype";
 
-        return (new LegacyBudgetExport($plan))->download($fileName, $writerType);
+        return new LegacyBudgetExport($plan)->download($fileName, $writerType);
     }
 }