academico-sis / academico

app/Models/Attendance.php

Spacing +1 added lines, -1 removed lines

@@ -21,7 +21,7 @@
         parent::boot();
 
         // when an attendance record is added, we check if this is an absence
-        static::saved(function (self $attendance) {
+        static::saved(function(self $attendance) {
             if (config('app.send_emails_for_absences') && $attendance->attendance_type_id == 4) { // todo move to configurable settings
                 // Log::info('Absence marked for student '.$attendance->student->name);
                 // will check the record again and send a notification if it hasn't changed

app/Models/Teacher.php

Spacing +7 added lines, -7 removed lines

@@ -36,22 +36,22 @@ 
     /** attributes */
     public function getFirstnameAttribute() : ?string
     {
-        return $this?->user?->firstname;
+        return $this ? ->user ? ->firstname;
     }
 
     public function getLastnameAttribute() : ?string
     {
-        return $this?->user?->lastname;
+        return $this ? ->user ? ->lastname;
     }
 
     public function getEmailAttribute() : ?string
     {
-        return $this?->user?->email;
+        return $this ? ->user ? ->email;
     }
 
     public function getNameAttribute() : ?string
     {
-        return $this?->user?->firstname.' '.$this?->user?->lastname;
+        return $this ? ->user ? ->firstname.' '.$this ? ->user ? ->lastname;
     }
 
     public function period_courses(Period $period)
@@ -175,14 +175,14 @@ 
         $eventsWithMissingAttendance = [];
 
         $eventsWithExpectedAttendance = $this->events()
-        ->where(function ($query) {
+        ->where(function($query) {
             $query->where('exempt_attendance', '!=', true);
             $query->where('exempt_attendance', '!=', 1);
             $query->orWhereNull('exempt_attendance');
         })
         ->where('course_id', '!=', null)
-        ->whereHas('course', fn (Builder $query) => $query->where('period_id', $period->id)
-            ->where(function ($query) {
+        ->whereHas('course', fn(Builder $query) => $query->where('period_id', $period->id)
+            ->where(function($query) {
                 $query->where('exempt_attendance', '!=', true);
                 $query->where('exempt_attendance', '!=', 1);
                 $query->orWhereNull('exempt_attendance');

app/Models/Policies/CommentPolicy.php

Spacing +1 added lines, -1 removed lines

@@ -26,6 +26,6 @@
      */
     public function store_student_comment(User $user, Student $student)
     {
-        return ($student->enrollments()->whereHas('course', fn ($q) => $q->where('teacher_id', $user->id))->count() > 0) || $user->can('comments.edit');
+        return ($student->enrollments()->whereHas('course', fn($q) => $q->where('teacher_id', $user->id))->count() > 0) || $user->can('comments.edit');
     }
 }

app/Providers/AuthServiceProvider.php

Spacing +11 added lines, -11 removed lines

@@ -30,69 +30,69 @@
          * a user is allowed to edit the course grades if they are the teacher for this course,
          * or if they have explicit permission to do so
          */
-        Gate::define('edit-course-grades', fn ($user, $course) => $user->isTeacher() && $user->id == $course->teacher_id || $user->can('evaluation.edit'));
+        Gate::define('edit-course-grades', fn($user, $course) => $user->isTeacher() && $user->id == $course->teacher_id || $user->can('evaluation.edit'));
 
         /*
          * a user is allowed to view the course attendance sheet if they are the teacher for this course,
          * or if they have explicit permission to view all course attendance sheets
          */
-        Gate::define('view-course-attendance', fn ($user, $course) => $user->isTeacher() && $user->id == $course->teacher_id || $user->can('attendance.view'));
+        Gate::define('view-course-attendance', fn($user, $course) => $user->isTeacher() && $user->id == $course->teacher_id || $user->can('attendance.view'));
 
         /*
          * a user is allowed to view the event attendance sheet if they are the teacher for this event,
          * if they are the teacher for this course,
          * or if they have explicit permission to view all event attendance sheets
          */
-        Gate::define('view-event-attendance', fn ($user, $event) => ($event->teacher_id == $user->id) || ($event->course->teacher_id == $user->id) || $user->can('attendance.view'));
+        Gate::define('view-event-attendance', fn($user, $event) => ($event->teacher_id == $user->id) || ($event->course->teacher_id == $user->id) || $user->can('attendance.view'));
 
         /*
          * a user is allowed to edit an attendance sheet if they are the teacher for the event,
          * if they are the teacher for the course,
          * or if they have explicit permission to edit any attendance sheets
          */
-        Gate::define('edit-attendance', fn ($user, $event) => ($event->teacher_id == $user->id) || ($event->course->teacher_id == $user->id) || $user->can('attendance.edit'));
+        Gate::define('edit-attendance', fn($user, $event) => ($event->teacher_id == $user->id) || ($event->course->teacher_id == $user->id) || $user->can('attendance.edit'));
 
         /*
          * teachers are allowed to view their own calendar,
          * and users with explicit permission can view all calendars
          */
-        Gate::define('view-teacher-calendar', fn ($user, $teacher) => ($user->isTeacher() && $user->id == $teacher->id) || $user->can('calendars.view'));
+        Gate::define('view-teacher-calendar', fn($user, $teacher) => ($user->isTeacher() && $user->id == $teacher->id) || $user->can('calendars.view'));
 
         /*
          * teachers are allowed to view their own courses,
          * and users with explicit permission can view all courses
          */
-        Gate::define('view-course', fn ($user, Course $course) => ($user->isTeacher() && $user->id == $course->teacher_id) || $user->can('courses.view'));
+        Gate::define('view-course', fn($user, Course $course) => ($user->isTeacher() && $user->id == $course->teacher_id) || $user->can('courses.view'));
 
         /*
          * the user is allowed to view the result if they are the student,
          * if they are a teacher
          * of if they have explicit permission to view any result
          */
-        Gate::define('view-enrollment', fn ($user, $enrollment) => ($user->isStudent() && $user->id == $enrollment->student_id) || $user->isTeacher() || $user->can('evaluation.view'));
+        Gate::define('view-enrollment', fn($user, $enrollment) => ($user->isStudent() && $user->id == $enrollment->student_id) || $user->isTeacher() || $user->can('evaluation.view'));
 
         /*
          * if the user is the teacher of the course
          * of if they have explicit permission to enroll students
          */
-        Gate::define('enroll-in-course', fn ($user, $course) => $course->teacher_id == $user->id || $user->can('enrollments.edit'));
+        Gate::define('enroll-in-course', fn($user, $course) => $course->teacher_id == $user->id || $user->can('enrollments.edit'));
 
         /*
          * if the user is a teacher
          * of if they have explicit permission to enroll students
          */
-        Gate::define('enroll-students', fn ($user) => $user->isTeacher() || $user->can('enrollments.edit'));
+        Gate::define('enroll-students', fn($user) => $user->isTeacher() || $user->can('enrollments.edit'));
 
         /*
          * teachers are allowed to view their own hours,
          * and users with explicit permission can view all hours
          */
-        Gate::define('view-teacher-hours', fn ($user, $teacher) => ($user->isTeacher() && $user->id == $teacher->id) || $user->can('hr.view'));
+        Gate::define('view-teacher-hours', fn($user, $teacher) => ($user->isTeacher() && $user->id == $teacher->id) || $user->can('hr.view'));
 
         /*
          * teachers are allowed to edit results for their own students
          * as well as users with explicit permission to edit any result
          */
-        Gate::define('edit-result', fn ($user, $enrollment) => ($user->isTeacher() && $user->id == $enrollment->course->teacher_id) || $user->can('evaluation.edit'));
+        Gate::define('edit-result', fn($user, $enrollment) => ($user->isTeacher() && $user->id == $enrollment->course->teacher_id) || $user->can('evaluation.edit'));
     }
 }

app/Http/Controllers/EnrollmentController.php

Spacing +1 added lines, -1 removed lines

@@ -172,7 +172,7 @@
                         'price_b' => $enrollment->course->price_b,
                         'price_c' => $enrollment->course->price_c,
                     ]),
-                    'studentPriceCategory' => $enrollment->student?->price_category,
+                    'studentPriceCategory' => $enrollment->student ? ->price_category,
                 ]
             );
         }

app/Http/Controllers/ScheduledPaymentController.php

Spacing +1 added lines, -1 removed lines

@@ -172,7 +172,7 @@
                         'price_b' => $enrollment->course->price_b,
                         'price_c' => $enrollment->course->price_c,
                     ]),
-                    'studentPriceCategory' => $enrollment->student?->price_category,
+                    'studentPriceCategory' => $enrollment->student ? ->price_category,
                 ]
             );
         }

app/Console/Commands/genderizeStudents.php

Indentation +177 added lines, -177 removed lines

@@ -15,184 +15,184 @@
     // wordpress implementation, from https://github.com/WordPress/WordPress/blob/a2693fd8602e3263b5925b9d799ddd577202167d/wp-includes/formatting.php#L1528
     private function remove_accents( $string ) {
 
-		$chars = array(
-		// Decompositions for Latin-1 Supplement
-		'ª' => 'a', 'º' => 'o',
-		'À' => 'A', 'Á' => 'A',
-		'Â' => 'A', 'Ã' => 'A',
-		'Ä' => 'A', 'Å' => 'A',
-		'Æ' => 'AE','Ç' => 'C',
-		'È' => 'E', 'É' => 'E',
-		'Ê' => 'E', 'Ë' => 'E',
-		'Ì' => 'I', 'Í' => 'I',
-		'Î' => 'I', 'Ï' => 'I',
-		'Ð' => 'D', 'Ñ' => 'N',
-		'Ò' => 'O', 'Ó' => 'O',
-		'Ô' => 'O', 'Õ' => 'O',
-		'Ö' => 'O', 'Ù' => 'U',
-		'Ú' => 'U', 'Û' => 'U',
-		'Ü' => 'U', 'Ý' => 'Y',
-		'Þ' => 'TH','ß' => 's',
-		'à' => 'a', 'á' => 'a',
-		'â' => 'a', 'ã' => 'a',
-		'ä' => 'a', 'å' => 'a',
-		'æ' => 'ae','ç' => 'c',
-		'è' => 'e', 'é' => 'e',
-		'ê' => 'e', 'ë' => 'e',
-		'ì' => 'i', 'í' => 'i',
-		'î' => 'i', 'ï' => 'i',
-		'ð' => 'd', 'ñ' => 'n',
-		'ò' => 'o', 'ó' => 'o',
-		'ô' => 'o', 'õ' => 'o',
-		'ö' => 'o', 'ø' => 'o',
-		'ù' => 'u', 'ú' => 'u',
-		'û' => 'u', 'ü' => 'u',
-		'ý' => 'y', 'þ' => 'th',
-		'ÿ' => 'y', 'Ø' => 'O',
-		// Decompositions for Latin Extended-A
-		'Ā' => 'A', 'ā' => 'a',
-		'Ă' => 'A', 'ă' => 'a',
-		'Ą' => 'A', 'ą' => 'a',
-		'Ć' => 'C', 'ć' => 'c',
-		'Ĉ' => 'C', 'ĉ' => 'c',
-		'Ċ' => 'C', 'ċ' => 'c',
-		'Č' => 'C', 'č' => 'c',
-		'Ď' => 'D', 'ď' => 'd',
-		'Đ' => 'D', 'đ' => 'd',
-		'Ē' => 'E', 'ē' => 'e',
-		'Ĕ' => 'E', 'ĕ' => 'e',
-		'Ė' => 'E', 'ė' => 'e',
-		'Ę' => 'E', 'ę' => 'e',
-		'Ě' => 'E', 'ě' => 'e',
-		'Ĝ' => 'G', 'ĝ' => 'g',
-		'Ğ' => 'G', 'ğ' => 'g',
-		'Ġ' => 'G', 'ġ' => 'g',
-		'Ģ' => 'G', 'ģ' => 'g',
-		'Ĥ' => 'H', 'ĥ' => 'h',
-		'Ħ' => 'H', 'ħ' => 'h',
-		'Ĩ' => 'I', 'ĩ' => 'i',
-		'Ī' => 'I', 'ī' => 'i',
-		'Ĭ' => 'I', 'ĭ' => 'i',
-		'Į' => 'I', 'į' => 'i',
-		'İ' => 'I', 'ı' => 'i',
-		'IJ' => 'IJ','ij' => 'ij',
-		'Ĵ' => 'J', 'ĵ' => 'j',
-		'Ķ' => 'K', 'ķ' => 'k',
-		'ĸ' => 'k', 'Ĺ' => 'L',
-		'ĺ' => 'l', 'Ļ' => 'L',
-		'ļ' => 'l', 'Ľ' => 'L',
-		'ľ' => 'l', 'Ŀ' => 'L',
-		'ŀ' => 'l', 'Ł' => 'L',
-		'ł' => 'l', 'Ń' => 'N',
-		'ń' => 'n', 'Ņ' => 'N',
-		'ņ' => 'n', 'Ň' => 'N',
-		'ň' => 'n', 'ʼn' => 'n',
-		'Ŋ' => 'N', 'ŋ' => 'n',
-		'Ō' => 'O', 'ō' => 'o',
-		'Ŏ' => 'O', 'ŏ' => 'o',
-		'Ő' => 'O', 'ő' => 'o',
-		'Œ' => 'OE','œ' => 'oe',
-		'Ŕ' => 'R','ŕ' => 'r',
-		'Ŗ' => 'R','ŗ' => 'r',
-		'Ř' => 'R','ř' => 'r',
-		'Ś' => 'S','ś' => 's',
-		'Ŝ' => 'S','ŝ' => 's',
-		'Ş' => 'S','ş' => 's',
-		'Š' => 'S', 'š' => 's',
-		'Ţ' => 'T', 'ţ' => 't',
-		'Ť' => 'T', 'ť' => 't',
-		'Ŧ' => 'T', 'ŧ' => 't',
-		'Ũ' => 'U', 'ũ' => 'u',
-		'Ū' => 'U', 'ū' => 'u',
-		'Ŭ' => 'U', 'ŭ' => 'u',
-		'Ů' => 'U', 'ů' => 'u',
-		'Ű' => 'U', 'ű' => 'u',
-		'Ų' => 'U', 'ų' => 'u',
-		'Ŵ' => 'W', 'ŵ' => 'w',
-		'Ŷ' => 'Y', 'ŷ' => 'y',
-		'Ÿ' => 'Y', 'Ź' => 'Z',
-		'ź' => 'z', 'Ż' => 'Z',
-		'ż' => 'z', 'Ž' => 'Z',
-		'ž' => 'z', 'ſ' => 's',
-		// Decompositions for Latin Extended-B
-		'Ș' => 'S', 'ș' => 's',
-		'Ț' => 'T', 'ț' => 't',
-		// Euro Sign
-		'€' => 'E',
-		// GBP (Pound) Sign
-		'£' => '',
-		// Vowels with diacritic (Vietnamese)
-		// unmarked
-		'Ơ' => 'O', 'ơ' => 'o',
-		'Ư' => 'U', 'ư' => 'u',
-		// grave accent
-		'Ầ' => 'A', 'ầ' => 'a',
-		'Ằ' => 'A', 'ằ' => 'a',
-		'Ề' => 'E', 'ề' => 'e',
-		'Ồ' => 'O', 'ồ' => 'o',
-		'Ờ' => 'O', 'ờ' => 'o',
-		'Ừ' => 'U', 'ừ' => 'u',
-		'Ỳ' => 'Y', 'ỳ' => 'y',
-		// hook
-		'Ả' => 'A', 'ả' => 'a',
-		'Ẩ' => 'A', 'ẩ' => 'a',
-		'Ẳ' => 'A', 'ẳ' => 'a',
-		'Ẻ' => 'E', 'ẻ' => 'e',
-		'Ể' => 'E', 'ể' => 'e',
-		'Ỉ' => 'I', 'ỉ' => 'i',
-		'Ỏ' => 'O', 'ỏ' => 'o',
-		'Ổ' => 'O', 'ổ' => 'o',
-		'Ở' => 'O', 'ở' => 'o',
-		'Ủ' => 'U', 'ủ' => 'u',
-		'Ử' => 'U', 'ử' => 'u',
-		'Ỷ' => 'Y', 'ỷ' => 'y',
-		// tilde
-		'Ẫ' => 'A', 'ẫ' => 'a',
-		'Ẵ' => 'A', 'ẵ' => 'a',
-		'Ẽ' => 'E', 'ẽ' => 'e',
-		'Ễ' => 'E', 'ễ' => 'e',
-		'Ỗ' => 'O', 'ỗ' => 'o',
-		'Ỡ' => 'O', 'ỡ' => 'o',
-		'Ữ' => 'U', 'ữ' => 'u',
-		'Ỹ' => 'Y', 'ỹ' => 'y',
-		// acute accent
-		'Ấ' => 'A', 'ấ' => 'a',
-		'Ắ' => 'A', 'ắ' => 'a',
-		'Ế' => 'E', 'ế' => 'e',
-		'Ố' => 'O', 'ố' => 'o',
-		'Ớ' => 'O', 'ớ' => 'o',
-		'Ứ' => 'U', 'ứ' => 'u',
-		// dot below
-		'Ạ' => 'A', 'ạ' => 'a',
-		'Ậ' => 'A', 'ậ' => 'a',
-		'Ặ' => 'A', 'ặ' => 'a',
-		'Ẹ' => 'E', 'ẹ' => 'e',
-		'Ệ' => 'E', 'ệ' => 'e',
-		'Ị' => 'I', 'ị' => 'i',
-		'Ọ' => 'O', 'ọ' => 'o',
-		'Ộ' => 'O', 'ộ' => 'o',
-		'Ợ' => 'O', 'ợ' => 'o',
-		'Ụ' => 'U', 'ụ' => 'u',
-		'Ự' => 'U', 'ự' => 'u',
-		'Ỵ' => 'Y', 'ỵ' => 'y',
-		// Vowels with diacritic (Chinese, Hanyu Pinyin)
-		'ɑ' => 'a',
-		// macron
-		'Ǖ' => 'U', 'ǖ' => 'u',
-		// acute accent
-		'Ǘ' => 'U', 'ǘ' => 'u',
-		// caron
-		'Ǎ' => 'A', 'ǎ' => 'a',
-		'Ǐ' => 'I', 'ǐ' => 'i',
-		'Ǒ' => 'O', 'ǒ' => 'o',
-		'Ǔ' => 'U', 'ǔ' => 'u',
-		'Ǚ' => 'U', 'ǚ' => 'u',
-		// grave accent
-		'Ǜ' => 'U', 'ǜ' => 'u',
-		);
+        $chars = array(
+        // Decompositions for Latin-1 Supplement
+        'ª' => 'a', 'º' => 'o',
+        'À' => 'A', 'Á' => 'A',
+        'Â' => 'A', 'Ã' => 'A',
+        'Ä' => 'A', 'Å' => 'A',
+        'Æ' => 'AE','Ç' => 'C',
+        'È' => 'E', 'É' => 'E',
+        'Ê' => 'E', 'Ë' => 'E',
+        'Ì' => 'I', 'Í' => 'I',
+        'Î' => 'I', 'Ï' => 'I',
+        'Ð' => 'D', 'Ñ' => 'N',
+        'Ò' => 'O', 'Ó' => 'O',
+        'Ô' => 'O', 'Õ' => 'O',
+        'Ö' => 'O', 'Ù' => 'U',
+        'Ú' => 'U', 'Û' => 'U',
+        'Ü' => 'U', 'Ý' => 'Y',
+        'Þ' => 'TH','ß' => 's',
+        'à' => 'a', 'á' => 'a',
+        'â' => 'a', 'ã' => 'a',
+        'ä' => 'a', 'å' => 'a',
+        'æ' => 'ae','ç' => 'c',
+        'è' => 'e', 'é' => 'e',
+        'ê' => 'e', 'ë' => 'e',
+        'ì' => 'i', 'í' => 'i',
+        'î' => 'i', 'ï' => 'i',
+        'ð' => 'd', 'ñ' => 'n',
+        'ò' => 'o', 'ó' => 'o',
+        'ô' => 'o', 'õ' => 'o',
+        'ö' => 'o', 'ø' => 'o',
+        'ù' => 'u', 'ú' => 'u',
+        'û' => 'u', 'ü' => 'u',
+        'ý' => 'y', 'þ' => 'th',
+        'ÿ' => 'y', 'Ø' => 'O',
+        // Decompositions for Latin Extended-A
+        'Ā' => 'A', 'ā' => 'a',
+        'Ă' => 'A', 'ă' => 'a',
+        'Ą' => 'A', 'ą' => 'a',
+        'Ć' => 'C', 'ć' => 'c',
+        'Ĉ' => 'C', 'ĉ' => 'c',
+        'Ċ' => 'C', 'ċ' => 'c',
+        'Č' => 'C', 'č' => 'c',
+        'Ď' => 'D', 'ď' => 'd',
+        'Đ' => 'D', 'đ' => 'd',
+        'Ē' => 'E', 'ē' => 'e',
+        'Ĕ' => 'E', 'ĕ' => 'e',
+        'Ė' => 'E', 'ė' => 'e',
+        'Ę' => 'E', 'ę' => 'e',
+        'Ě' => 'E', 'ě' => 'e',
+        'Ĝ' => 'G', 'ĝ' => 'g',
+        'Ğ' => 'G', 'ğ' => 'g',
+        'Ġ' => 'G', 'ġ' => 'g',
+        'Ģ' => 'G', 'ģ' => 'g',
+        'Ĥ' => 'H', 'ĥ' => 'h',
+        'Ħ' => 'H', 'ħ' => 'h',
+        'Ĩ' => 'I', 'ĩ' => 'i',
+        'Ī' => 'I', 'ī' => 'i',
+        'Ĭ' => 'I', 'ĭ' => 'i',
+        'Į' => 'I', 'į' => 'i',
+        'İ' => 'I', 'ı' => 'i',
+        'IJ' => 'IJ','ij' => 'ij',
+        'Ĵ' => 'J', 'ĵ' => 'j',
+        'Ķ' => 'K', 'ķ' => 'k',
+        'ĸ' => 'k', 'Ĺ' => 'L',
+        'ĺ' => 'l', 'Ļ' => 'L',
+        'ļ' => 'l', 'Ľ' => 'L',
+        'ľ' => 'l', 'Ŀ' => 'L',
+        'ŀ' => 'l', 'Ł' => 'L',
+        'ł' => 'l', 'Ń' => 'N',
+        'ń' => 'n', 'Ņ' => 'N',
+        'ņ' => 'n', 'Ň' => 'N',
+        'ň' => 'n', 'ʼn' => 'n',
+        'Ŋ' => 'N', 'ŋ' => 'n',
+        'Ō' => 'O', 'ō' => 'o',
+        'Ŏ' => 'O', 'ŏ' => 'o',
+        'Ő' => 'O', 'ő' => 'o',
+        'Œ' => 'OE','œ' => 'oe',
+        'Ŕ' => 'R','ŕ' => 'r',
+        'Ŗ' => 'R','ŗ' => 'r',
+        'Ř' => 'R','ř' => 'r',
+        'Ś' => 'S','ś' => 's',
+        'Ŝ' => 'S','ŝ' => 's',
+        'Ş' => 'S','ş' => 's',
+        'Š' => 'S', 'š' => 's',
+        'Ţ' => 'T', 'ţ' => 't',
+        'Ť' => 'T', 'ť' => 't',
+        'Ŧ' => 'T', 'ŧ' => 't',
+        'Ũ' => 'U', 'ũ' => 'u',
+        'Ū' => 'U', 'ū' => 'u',
+        'Ŭ' => 'U', 'ŭ' => 'u',
+        'Ů' => 'U', 'ů' => 'u',
+        'Ű' => 'U', 'ű' => 'u',
+        'Ų' => 'U', 'ų' => 'u',
+        'Ŵ' => 'W', 'ŵ' => 'w',
+        'Ŷ' => 'Y', 'ŷ' => 'y',
+        'Ÿ' => 'Y', 'Ź' => 'Z',
+        'ź' => 'z', 'Ż' => 'Z',
+        'ż' => 'z', 'Ž' => 'Z',
+        'ž' => 'z', 'ſ' => 's',
+        // Decompositions for Latin Extended-B
+        'Ș' => 'S', 'ș' => 's',
+        'Ț' => 'T', 'ț' => 't',
+        // Euro Sign
+        '€' => 'E',
+        // GBP (Pound) Sign
+        '£' => '',
+        // Vowels with diacritic (Vietnamese)
+        // unmarked
+        'Ơ' => 'O', 'ơ' => 'o',
+        'Ư' => 'U', 'ư' => 'u',
+        // grave accent
+        'Ầ' => 'A', 'ầ' => 'a',
+        'Ằ' => 'A', 'ằ' => 'a',
+        'Ề' => 'E', 'ề' => 'e',
+        'Ồ' => 'O', 'ồ' => 'o',
+        'Ờ' => 'O', 'ờ' => 'o',
+        'Ừ' => 'U', 'ừ' => 'u',
+        'Ỳ' => 'Y', 'ỳ' => 'y',
+        // hook
+        'Ả' => 'A', 'ả' => 'a',
+        'Ẩ' => 'A', 'ẩ' => 'a',
+        'Ẳ' => 'A', 'ẳ' => 'a',
+        'Ẻ' => 'E', 'ẻ' => 'e',
+        'Ể' => 'E', 'ể' => 'e',
+        'Ỉ' => 'I', 'ỉ' => 'i',
+        'Ỏ' => 'O', 'ỏ' => 'o',
+        'Ổ' => 'O', 'ổ' => 'o',
+        'Ở' => 'O', 'ở' => 'o',
+        'Ủ' => 'U', 'ủ' => 'u',
+        'Ử' => 'U', 'ử' => 'u',
+        'Ỷ' => 'Y', 'ỷ' => 'y',
+        // tilde
+        'Ẫ' => 'A', 'ẫ' => 'a',
+        'Ẵ' => 'A', 'ẵ' => 'a',
+        'Ẽ' => 'E', 'ẽ' => 'e',
+        'Ễ' => 'E', 'ễ' => 'e',
+        'Ỗ' => 'O', 'ỗ' => 'o',
+        'Ỡ' => 'O', 'ỡ' => 'o',
+        'Ữ' => 'U', 'ữ' => 'u',
+        'Ỹ' => 'Y', 'ỹ' => 'y',
+        // acute accent
+        'Ấ' => 'A', 'ấ' => 'a',
+        'Ắ' => 'A', 'ắ' => 'a',
+        'Ế' => 'E', 'ế' => 'e',
+        'Ố' => 'O', 'ố' => 'o',
+        'Ớ' => 'O', 'ớ' => 'o',
+        'Ứ' => 'U', 'ứ' => 'u',
+        // dot below
+        'Ạ' => 'A', 'ạ' => 'a',
+        'Ậ' => 'A', 'ậ' => 'a',
+        'Ặ' => 'A', 'ặ' => 'a',
+        'Ẹ' => 'E', 'ẹ' => 'e',
+        'Ệ' => 'E', 'ệ' => 'e',
+        'Ị' => 'I', 'ị' => 'i',
+        'Ọ' => 'O', 'ọ' => 'o',
+        'Ộ' => 'O', 'ộ' => 'o',
+        'Ợ' => 'O', 'ợ' => 'o',
+        'Ụ' => 'U', 'ụ' => 'u',
+        'Ự' => 'U', 'ự' => 'u',
+        'Ỵ' => 'Y', 'ỵ' => 'y',
+        // Vowels with diacritic (Chinese, Hanyu Pinyin)
+        'ɑ' => 'a',
+        // macron
+        'Ǖ' => 'U', 'ǖ' => 'u',
+        // acute accent
+        'Ǘ' => 'U', 'ǘ' => 'u',
+        // caron
+        'Ǎ' => 'A', 'ǎ' => 'a',
+        'Ǐ' => 'I', 'ǐ' => 'i',
+        'Ǒ' => 'O', 'ǒ' => 'o',
+        'Ǔ' => 'U', 'ǔ' => 'u',
+        'Ǚ' => 'U', 'ǚ' => 'u',
+        // grave accent
+        'Ǜ' => 'U', 'ǜ' => 'u',
+        );
 
-		return  strtr($string, $chars);
-	}
+        return  strtr($string, $chars);
+    }
 
 
     public function handle()

Spacing +14 added lines, -14 removed lines

@@ -13,7 +13,7 @@ 
     protected $description = 'Guess gender for existing students, based on their firstname';
 
     // wordpress implementation, from https://github.com/WordPress/WordPress/blob/a2693fd8602e3263b5925b9d799ddd577202167d/wp-includes/formatting.php#L1528
-    private function remove_accents( $string ) {
+    private function remove_accents($string) {
 
 		$chars = array(
 		// Decompositions for Latin-1 Supplement
@@ -21,7 +21,7 @@ 
 		'À' => 'A', 'Á' => 'A',
 		'Â' => 'A', 'Ã' => 'A',
 		'Ä' => 'A', 'Å' => 'A',
-		'Æ' => 'AE','Ç' => 'C',
+		'Æ' => 'AE', 'Ç' => 'C',
 		'È' => 'E', 'É' => 'E',
 		'Ê' => 'E', 'Ë' => 'E',
 		'Ì' => 'I', 'Í' => 'I',
@@ -32,11 +32,11 @@ 
 		'Ö' => 'O', 'Ù' => 'U',
 		'Ú' => 'U', 'Û' => 'U',
 		'Ü' => 'U', 'Ý' => 'Y',
-		'Þ' => 'TH','ß' => 's',
+		'Þ' => 'TH', 'ß' => 's',
 		'à' => 'a', 'á' => 'a',
 		'â' => 'a', 'ã' => 'a',
 		'ä' => 'a', 'å' => 'a',
-		'æ' => 'ae','ç' => 'c',
+		'æ' => 'ae', 'ç' => 'c',
 		'è' => 'e', 'é' => 'e',
 		'ê' => 'e', 'ë' => 'e',
 		'ì' => 'i', 'í' => 'i',
@@ -75,7 +75,7 @@ 
 		'Ĭ' => 'I', 'ĭ' => 'i',
 		'Į' => 'I', 'į' => 'i',
 		'İ' => 'I', 'ı' => 'i',
-		'IJ' => 'IJ','ij' => 'ij',
+		'IJ' => 'IJ', 'ij' => 'ij',
 		'Ĵ' => 'J', 'ĵ' => 'j',
 		'Ķ' => 'K', 'ķ' => 'k',
 		'ĸ' => 'k', 'Ĺ' => 'L',
@@ -91,13 +91,13 @@ 
 		'Ō' => 'O', 'ō' => 'o',
 		'Ŏ' => 'O', 'ŏ' => 'o',
 		'Ő' => 'O', 'ő' => 'o',
-		'Œ' => 'OE','œ' => 'oe',
-		'Ŕ' => 'R','ŕ' => 'r',
-		'Ŗ' => 'R','ŗ' => 'r',
-		'Ř' => 'R','ř' => 'r',
-		'Ś' => 'S','ś' => 's',
-		'Ŝ' => 'S','ŝ' => 's',
-		'Ş' => 'S','ş' => 's',
+		'Œ' => 'OE', 'œ' => 'oe',
+		'Ŕ' => 'R', 'ŕ' => 'r',
+		'Ŗ' => 'R', 'ŗ' => 'r',
+		'Ř' => 'R', 'ř' => 'r',
+		'Ś' => 'S', 'ś' => 's',
+		'Ŝ' => 'S', 'ŝ' => 's',
+		'Ş' => 'S', 'ş' => 's',
 		'Š' => 'S', 'š' => 's',
 		'Ţ' => 'T', 'ţ' => 't',
 		'Ť' => 'T', 'ť' => 't',
@@ -197,10 +197,10 @@ 
 
     public function handle()
     {
-        Student::whereNull('gender_id')->chunkById(10, function ($students) {
+        Student::whereNull('gender_id')->chunkById(10, function($students) {
             $query = $students->map(fn($student) => ['id' => $student->id, 'name' => $this->remove_accents(strtok($student->firstname, " "))]);
 
-            $response = Http::get('https://api.genderize.io/?name[]=' . $query->pluck('name')->implode('&name[]='));
+            $response = Http::get('https://api.genderize.io/?name[]='.$query->pluck('name')->implode('&name[]='));
             foreach ($students as $student) {
                 $firstname = $query->firstWhere('id', $student->id)['name'];
 

app/Models/Year.php

Spacing +1 added lines, -1 removed lines

@@ -26,7 +26,7 @@
 
     public function studentCount($gender = null)
     {
-        if (in_array($gender, [1,2])) {
+        if (in_array($gender, [1, 2])) {
             return DB::table('enrollments')
                 ->join('courses', 'enrollments.course_id', 'courses.id')
                 ->join('periods', 'courses.period_id', 'periods.id')

app/Http/Controllers/ReportController.php

Spacing +1 added lines, -1 removed lines

@@ -63,7 +63,7 @@
         $year_data = [];
         $years = []; // New array
 
-        if (! isset($request->period)) {
+        if (!isset($request->period)) {
             $startperiod = Period::find(Config::where('name', 'first_external_period')->first()->value ?? Period::first()->id);
         } else {
             $startperiod = Period::find($request->period);