Add ordered_class_elements rule to code standard

Author: fntneves

.php_cs

@@ -62,6 +62,7 @@ $rules = [
     'normalize_index_brace' => true,
     'not_operator_with_successor_space' => true,
     'object_operator_without_whitespace' => true,
+    'ordered_class_elements' => true,
     'ordered_imports' => ['sortAlgorithm' => 'length'],
     'phpdoc_align' => true,
     'phpdoc_indent' => true,

app/Http/Controllers/Auth/RegisterController.php

@@ -46,47 +46,6 @@ public function __construct()
             ->only(['confirm', 'resendConfirmationEmail']);
     }
 
-    /**
-     * Get a validator for an incoming registration request.
-     *
-     * @param array $data
-     *
-     * @return \Illuminate\Contracts\Validation\Validator
-     */
-    protected function validator(array $data)
-    {
-        return Validator::make($data, [
-            'name' => 'required|string|max:255',
-            'student_number' => 'required|string|unique:students,student_number|student_number',
-            'password' => 'required|string|min:6|confirmed',
-        ]);
-    }
-
-    /**
-     * Create a new user instance after a valid registration.
-     *
-     * @param array $data
-     *
-     * @return \App\Judite\Models\User
-     */
-    protected function create(array $data)
-    {
-        $user = DB::transaction(function () use ($data) {
-            $user = User::make([
-                'name' => $data['name'],
-                'email' => $data['student_number'].'@alunos.uminho.pt',
-                'password' => bcrypt($data['password']),
-            ]);
-            $user->verification_token = str_random(32);
-            $user->save();
-            $user->student()->create(['student_number' => $data['student_number']]);
-
-            return $user;
-        });
-
-        return $user;
-    }
-
     /**
      * Confirm a student account.
      *
@@ -133,6 +92,47 @@ public function resendConfirmationEmail()
         return redirect($this->redirectTo);
     }
 
+    /**
+     * Get a validator for an incoming registration request.
+     *
+     * @param array $data
+     *
+     * @return \Illuminate\Contracts\Validation\Validator
+     */
+    protected function validator(array $data)
+    {
+        return Validator::make($data, [
+            'name' => 'required|string|max:255',
+            'student_number' => 'required|string|unique:students,student_number|student_number',
+            'password' => 'required|string|min:6|confirmed',
+        ]);
+    }
+
+    /**
+     * Create a new user instance after a valid registration.
+     *
+     * @param array $data
+     *
+     * @return \App\Judite\Models\User
+     */
+    protected function create(array $data)
+    {
+        $user = DB::transaction(function () use ($data) {
+            $user = User::make([
+                'name' => $data['name'],
+                'email' => $data['student_number'].'@alunos.uminho.pt',
+                'password' => bcrypt($data['password']),
+            ]);
+            $user->verification_token = str_random(32);
+            $user->save();
+            $user->student()->create(['student_number' => $data['student_number']]);
+
+            return $user;
+        });
+
+        return $user;
+    }
+
     /**
      * The user has been registered.
      *

app/Judite/Models/Exchange.php

@@ -182,20 +182,6 @@ public function toEnrollment()
         return $this->belongsTo(Enrollment::class, 'to_enrollment_id');
     }
 
-    /**
-     * Deletes all exchanges involving the given enrollments.
-     *
-     * @param \Illuminate\Support\Collection $enrollments
-     */
-    private function deleteExchangesOfEnrollments(Collection $enrollments)
-    {
-        $enrollmentIds = $enrollments->pluck('id');
-
-        self::whereIn('from_enrollment_id', $enrollmentIds)
-            ->orWhereIn('to_enrollment_id', $enrollmentIds)
-            ->delete();
-    }
-
     /**
      * Get the course of this exchange.
      *
@@ -257,4 +243,18 @@ public function isOwnedBy(Student $student): bool
     {
         return $this->fromStudent()->is($student);
     }
+
+    /**
+     * Deletes all exchanges involving the given enrollments.
+     *
+     * @param \Illuminate\Support\Collection $enrollments
+     */
+    private function deleteExchangesOfEnrollments(Collection $enrollments)
+    {
+        $enrollmentIds = $enrollments->pluck('id');
+
+        self::whereIn('from_enrollment_id', $enrollmentIds)
+            ->orWhereIn('to_enrollment_id', $enrollmentIds)
+            ->delete();
+    }
 }