Merge pull request #999 from portabilis/portabilis-patch-2025-02-12

Portábilis patch 12/02/2025
portabilis · Feb 12, 2025 · b6cea39 · b6cea39
2 parents e8a18d9 + 3c05532
commit b6cea39
Show file tree

Hide file tree

Showing 957 changed files with 4,826 additions and 3,415 deletions.
diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml
@@ -54,7 +54,7 @@ jobs:
 
       - uses: shivammathur/setup-php@v2
         with:
-          php-version: '8.2'
+          php-version: '8.3'
           extensions: bcmath, gd, pdo, pcntl, pdo_pgsql, pgsql, zip
         env:
           update: true

diff --git a/app/Console/Commands/ImportDisciplineAcademicYearCommand.php b/app/Console/Commands/ImportDisciplineAcademicYearCommand.php
@@ -28,7 +28,7 @@ class ImportDisciplineAcademicYearCommand extends Command
      */
     public function handle()
     {
-        $importer = new DisciplineAcademicImport();
+        $importer = new DisciplineAcademicImport;
 
         $importer->withOutput($this->output)->import($this->argument('filename'));
     }

diff --git a/app/Console/Commands/ImportDisciplineCommand.php b/app/Console/Commands/ImportDisciplineCommand.php
@@ -33,7 +33,7 @@ public function handle(Filesystem $filesystem)
     {
         $filename = $this->argument('filename');
 
-        $importer = new DisciplineImport();
+        $importer = new DisciplineImport;
 
         $importer->withOutput($this->output)->import($filename);
 

diff --git a/app/Console/Commands/LegacyCreateTestsCommand.php b/app/Console/Commands/LegacyCreateTestsCommand.php
@@ -211,6 +211,8 @@ private function excludeRoutersList(): array
             'index.php',
             'copia_vinculos_servidores_cad.php',
             'educar_configuracoes_gerais.php',
+            'educar_comunicados_escolares_det.php',
+            'educar_comunicados_escolares_lst.php',
         ];
     }
 

diff --git a/app/Console/Commands/QueryAllCsvCommand.php b/app/Console/Commands/QueryAllCsvCommand.php
@@ -47,7 +47,7 @@ public function handle()
                 $connectionData = DB::connection($connection)->select($file);
 
                 if (!empty($connectionData) && empty($header)) {
-                    $header = array_merge(['conexao'], array_keys((array)$connectionData[0]));
+                    $header = array_merge(['conexao'], array_keys((array) $connectionData[0]));
                 }
                 $data[$connection] = $connectionData;
             } catch (Exception) {

diff --git a/app/Console/Commands/ResetPasswordCommand.php b/app/Console/Commands/ResetPasswordCommand.php
@@ -39,7 +39,7 @@ public function handle()
     {
         $username = $this->argument('username');
 
-        $output = new NullOutput();
+        $output = new NullOutput;
         $service = new ImportUsersService($output);
 
         $newPassword = Str::random(8);

diff --git a/app/Console/Commands/UpdateDisciplinesCommand.php b/app/Console/Commands/UpdateDisciplinesCommand.php
@@ -54,7 +54,7 @@ private function setCopiers(MoveDisciplineDataService $service)
         }
 
         foreach ($copiers as $copier) {
-            $service->setMoveDataService(new $copier());
+            $service->setMoveDataService(new $copier);
         }
     }
 }
diff --git a/app/Console/Commands/UpdateSchoolClassPeriod.php b/app/Console/Commands/UpdateSchoolClassPeriod.php
@@ -46,7 +46,7 @@ public function handle()
             ->where('ano', '>=', 2019)
             ->get();
 
-        $service = new PeriodService();
+        $service = new PeriodService;
 
         DB::beginTransaction();
 

diff --git a/app/Contracts/AssetServiceContract.php b/app/Contracts/AssetServiceContract.php
@@ -11,8 +11,6 @@ public function __construct(string $version, ?bool $secure = null, bool $automat
 
     /**
      * Get assets version number.
-     *
-     * @return ?string
      */
     public function getVersion(): ?string;
 

diff --git a/app/Events/EmployeeCreated.php b/app/Events/EmployeeCreated.php
@@ -3,7 +3,6 @@
 namespace App\Events;
 
 use App\Models\Employee;
-use App\Models\LegacyRegistration;
 use Illuminate\Broadcasting\InteractsWithSockets;
 use Illuminate\Foundation\Events\Dispatchable;
 use Illuminate\Queue\SerializesModels;

diff --git a/app/Http/Controllers/AccessLevelController.php b/app/Http/Controllers/AccessLevelController.php
@@ -63,7 +63,7 @@ private function store(Request $request, LegacyUserType $userType)
      */
     public function new(Request $request)
     {
-        $view = $this->show($request, new LegacyUserType());
+        $view = $this->show($request, new LegacyUserType);
 
         $this->breadcrumb('Cadastrar tipo de usuário');
 

diff --git a/app/Http/Controllers/AnnouncementPublishController.php b/app/Http/Controllers/AnnouncementPublishController.php
@@ -73,7 +73,7 @@ public function create()
         ]);
 
         return view('announcement.publish.create', [
-            'announcement' => new Announcement(),
+            'announcement' => new Announcement,
             'userTypes' => null,
         ]);
     }

diff --git a/app/Http/Controllers/Api/CityController.php b/app/Http/Controllers/Api/CityController.php
@@ -56,8 +56,8 @@ protected function deleteRules(Model $model, Request $request)
 
         return [
             new CityRestrictOperationRule($accessLevel),
-            new AddressingCityDistrictRule(),
-            new AddressingCityPlaceRule(),
+            new AddressingCityDistrictRule,
+            new AddressingCityPlaceRule,
         ];
     }
 }
diff --git a/app/Http/Controllers/Api/CountryController.php b/app/Http/Controllers/Api/CountryController.php
@@ -55,7 +55,7 @@ protected function deleteRules(Model $model, Request $request)
 
         return [
             new CountryRestrictOperationRule($accessLevel),
-            new AddressingCountryRule(),
+            new AddressingCountryRule,
         ];
     }
 }
diff --git a/app/Http/Controllers/Api/Resource/Discipline/ResourceDisciplineController.php b/app/Http/Controllers/Api/Resource/Discipline/ResourceDisciplineController.php
@@ -12,7 +12,7 @@ class ResourceDisciplineController extends Controller
 {
     public function index(ResourceDisciplineRequest $request): JsonResource
     {
-        //altera o model se school e grade
+        // altera o model se school e grade
         if ($request->has(['school', 'grade'])) {
             $resource = LegacySchoolGradeDiscipline::query()->getResource($request->all());
         } else {

diff --git a/app/Http/Controllers/Api/StateController.php b/app/Http/Controllers/Api/StateController.php
@@ -55,7 +55,7 @@ protected function deleteRules(Model $model, Request $request)
 
         return [
             new StateRestrictOperationRule($accessLevel),
-            new AddressingStateRule(),
+            new AddressingStateRule,
         ];
     }
 }
diff --git a/app/Http/Controllers/Auth/LoginController.php b/app/Http/Controllers/Auth/LoginController.php
@@ -70,7 +70,7 @@ public function validateLogin(Request $request)
         $request->validate([
             $this->username() => 'required|string',
             'password' => 'required|string',
-            'grecaptcha' => [new ReCaptchaV3()],
+            'grecaptcha' => [new ReCaptchaV3],
         ], [
             $this->username() . '.required' => 'O campo matrícula é obrigatório.',
             $this->username() . '.string' => 'O campo matrícula é obrigatório.',

diff --git a/app/Http/Controllers/BatchEnrollmentController.php b/app/Http/Controllers/BatchEnrollmentController.php
@@ -39,8 +39,8 @@ public function viewCancelEnrollments(
         return view('enrollments.batch.cancel', [
             'schoolClass' => $schoolClass,
             'enrollments' => $enrollments,
-            'fails' => $fails ?? new MessageBag(),
-            'success' => $success ?? new MessageBag(),
+            'fails' => $fails ?? new MessageBag,
+            'success' => $success ?? new MessageBag,
         ]);
     }
 
@@ -66,8 +66,8 @@ public function viewEnroll(
         return view('enrollments.batch.enroll', [
             'schoolClass' => $schoolClass,
             'registrations' => $registrations,
-            'fails' => $fails ?? new MessageBag(),
-            'success' => $success ?? new MessageBag(),
+            'fails' => $fails ?? new MessageBag,
+            'success' => $success ?? new MessageBag,
         ]);
     }
 
@@ -97,8 +97,8 @@ public function cancelEnrollments(
         $date = Carbon::createFromFormat('d/m/Y', $request->input('date'));
         $enrollmentsIds = $request->input('enrollments', []);
 
-        $fails = new MessageBag();
-        $success = new MessageBag();
+        $fails = new MessageBag;
+        $success = new MessageBag;
 
         $enrollments = $schoolClass->getActiveEnrollments();
 
@@ -142,8 +142,8 @@ public function enroll(
         $date = Carbon::createFromFormat('d/m/Y', $request->input('date'));
         $registrationsIds = $request->input('registrations', []);
 
-        $fails = new MessageBag();
-        $success = new MessageBag();
+        $fails = new MessageBag;
+        $success = new MessageBag;
 
         $registrations = $registrationService->getRegistrationsNotEnrolled($schoolClass);
 
@@ -174,8 +174,8 @@ protected function setMessages(
         ?MessageBag $success,
         string $type = 'enroll'
     ) {
-        $fail = $fail ?? new MessageBag();
-        $success = $success ?? new MessageBag();
+        $fail = $fail ?? new MessageBag;
+        $success = $success ?? new MessageBag;
 
         switch ($type) {
             case 'enroll':

diff --git a/app/Http/Controllers/BlockEnrollmentController.php b/app/Http/Controllers/BlockEnrollmentController.php
@@ -18,7 +18,7 @@ public function update(BlockEnrollmentRequest $request)
             ->when($request->get('ref_cod_curso'), function ($q, $course) {
                 $q->whereHas('grade', fn ($q) => $q->whereCourse($course));
             })
-            ->whereRaw("anos_letivos @> ?", ["{" . $request->get('ano') . "}"])
+            ->whereRaw('anos_letivos @> ?', ['{' . $request->get('ano') . '}'])
             ->where('ativo', 1);
 
         $gradesCount = $query->count();
@@ -35,7 +35,7 @@ public function update(BlockEnrollmentRequest $request)
             DB::beginTransaction();
             $query->update([
                 'bloquear_enturmacao_sem_vagas' => $request->get('bloquear_enturmacao_sem_vagas'),
-                'updated_at' => now()
+                'updated_at' => now(),
             ]);
             DB::commit();
             session()->flash('success', 'Atualização em lote efetuada com sucesso.');

diff --git a/app/Http/Controllers/EnrollmentInepController.php b/app/Http/Controllers/EnrollmentInepController.php
@@ -14,7 +14,7 @@ public function edit(LegacyEnrollment $enrollment)
             url('intranet/educar_index.php') => 'Escola',
         ]);
 
-        $this->menu(578); //dd($enrollment->toArray());
+        $this->menu(578); // dd($enrollment->toArray());
 
         return view('enrollments.enrollmentInep', compact('enrollment'));
     }

diff --git a/app/Http/Controllers/EnrollmentsPromotionController.php b/app/Http/Controllers/EnrollmentsPromotionController.php
@@ -39,7 +39,7 @@ public function processEnrollmentsPromotionJobs(Request $request)
         Bus::batch($jobs)
             ->finally(function (Batch $batch) use ($userId, $message) {
                 $message .= $batch->totalJobs . ' matrícula(s)';
-                (new NotificationService())->createByUser($userId, $message, '', NotificationType::OTHER);
+                (new NotificationService)->createByUser($userId, $message, '', NotificationType::OTHER);
             })
             ->dispatch();
 

diff --git a/app/Http/Controllers/FileController.php b/app/Http/Controllers/FileController.php
@@ -12,7 +12,7 @@ class FileController extends Controller
 {
     public function show(File $file)
     {
-        $url = (new UrlPresigner())->getPresignedUrl(
+        $url = (new UrlPresigner)->getPresignedUrl(
             $file->url
         );
 

diff --git a/app/Http/Controllers/LegacyController.php b/app/Http/Controllers/LegacyController.php
@@ -150,7 +150,7 @@ private function loadFileOrAbort($filename)
 
     private function processProperty(object $viewToRender): clsBase
     {
-        $class = new clsBase();
+        $class = new clsBase;
 
         if (method_exists($viewToRender, 'Formular')) {
             $viewToRender->Formular();

diff --git a/app/Http/Controllers/ReleasePeriodController.php b/app/Http/Controllers/ReleasePeriodController.php
@@ -43,7 +43,7 @@ public function index(Request $request)
             'release-period.form',
             [
                 'stageTypes' => LegacyStageType::active()->get()->keyBy('cod_modulo')->toJson(),
-                'releasePeriod' => new ReleasePeriod(),
+                'releasePeriod' => new ReleasePeriod,
                 'data' => $this->applyFilters($request),
                 'canView' => $request->user()->can('view', Process::RELEASE_PERIOD),
                 'canModify' => $request->user()->can('modify', Process::RELEASE_PERIOD),

diff --git a/app/Http/Controllers/ResourceController.php b/app/Http/Controllers/ResourceController.php
@@ -157,7 +157,7 @@ public function get(Model|int $model, Request $request, ?string $class = null):
             $query = $model->newQuery();
         } else {
             $id = $model;
-            $query = (new $class())->newQuery();
+            $query = (new $class)->newQuery();
         }
 
         $this->columns($request, $query);

diff --git a/app/Http/Controllers/SchoolClassController.php b/app/Http/Controllers/SchoolClassController.php
@@ -22,9 +22,9 @@ class SchoolClassController extends Controller
     public function store(Request $request)
     {
         $response = ['msg' => 'Edição efetuada com sucesso.'];
-        $schoolClassService = new SchoolClassService();
-        $schoolClassInepService = new SchoolClassInepService();
-        $schoolClassStageService = new SchoolClassStageService();
+        $schoolClassService = new SchoolClassService;
+        $schoolClassInepService = new SchoolClassInepService;
+        $schoolClassStageService = new SchoolClassStageService;
 
         $codModulo = $request->get('ref_cod_modulo');
         $diasLetivos = $request->get('dias_letivos');
@@ -72,7 +72,7 @@ public function store(Request $request)
                         'boletim_diferenciado_id' => $multBoletimDiferenciadoId[$key],
                     ];
                 }
-                $multiGradesService = new MultiGradesService();
+                $multiGradesService = new MultiGradesService;
                 $multiGradesService->storeSchoolClassGrade($schoolClass, $schoolClassGrades);
                 $this->deleteDisciplineSchoolClass($codTurma);
             } else {
@@ -87,7 +87,7 @@ public function store(Request $request)
                     $etapasUtilizadas,
                     $etapasEspecificas
                 );
-                $multiGradesService = new MultiGradesService();
+                $multiGradesService = new MultiGradesService;
                 $multiGradesService->deleteAllGradesOfSchoolClass($schoolClass);
             }
 
@@ -149,7 +149,7 @@ public function store(Request $request)
     public function delete(Request $request)
     {
         $response = ['msg' => 'Exclusão efetuada com sucesso.'];
-        $schoolClassService = new SchoolClassService();
+        $schoolClassService = new SchoolClassService;
 
         try {
             DB::beginTransaction();
@@ -174,7 +174,7 @@ public function delete(Request $request)
     private function prepareSchoolClassDataToStore(Request $request)
     {
         $params = $request->all();
-        $legacySchoolClass = new LegacySchoolClass();
+        $legacySchoolClass = new LegacySchoolClass;
 
         if (!empty($params['cod_turma'])) {
             $legacySchoolClass = LegacySchoolClass::find($params['cod_turma']);
@@ -269,7 +269,7 @@ private function atualizaComponentesCurriculares(
         $this->deleteDisciplineSchoolClass($codTurma);
 
         if ($componentes) {
-            $mapper = new ComponenteCurricular_Model_TurmaDataMapper();
+            $mapper = new ComponenteCurricular_Model_TurmaDataMapper;
 
             $componentesTurma = [];
-Original file line number
+Diff line change
@@ Expand Up @@
         /**
          * Get assets version number.
-         *
-         * @return ?string
          */
         public function getVersion(): ?string;
@@ Expand Down @@