doesangueorg / doesangue-core

app/Exceptions/Handler.php

Spacing +1 added lines, -1 removed lines

@@ -57,7 +57,7 @@
     protected function unauthenticated($request, AuthenticationException $exception)
     {
         if ($request->expectsJson()) {
-            return response()->json(['error' => 'Unauthenticated.'], 401);
+            return response()->json([ 'error' => 'Unauthenticated.' ], 401);
         }
 
         return redirect()->guest('login');

app/Http/Controllers/Auth/RegisterController.php

Doc Comments +1 added lines, -5 removed lines

@@ -80,8 +80,4 @@
             'phone' => $data[ 'phone' ],
             'email' => $data[ 'email' ],
             'username' => $data[ 'username' ],
-            'password' => bcrypt($data[ 'password' ]),
-            ]
-        );
-    }
-}
+            'password' => bcrypt($data[
\ No newline at end of file

Unused Use Statements +1 added lines, -5 removed lines

@@ -80,8 +80,4 @@
             'phone' => $data[ 'phone' ],
             'email' => $data[ 'email' ],
             'username' => $data[ 'username' ],
-            'password' => bcrypt($data[ 'password' ]),
-            ]
-        );
-    }
-}
+            'password' => bcrypt($data[
\ No newline at end of file

Indentation +1 added lines, -5 removed lines

@@ -80,8 +80,4 @@
             'phone' => $data[ 'phone' ],
             'email' => $data[ 'email' ],
             'username' => $data[ 'username' ],
-            'password' => bcrypt($data[ 'password' ]),
-            ]
-        );
-    }
-}
+            'password' => bcrypt($data[
\ No newline at end of file

Switch Indentation +1 added lines, -5 removed lines

@@ -80,8 +80,4 @@
             'phone' => $data[ 'phone' ],
             'email' => $data[ 'email' ],
             'username' => $data[ 'username' ],
-            'password' => bcrypt($data[ 'password' ]),
-            ]
-        );
-    }
-}
+            'password' => bcrypt($data[
\ No newline at end of file

Spacing +6 added lines, -10 removed lines

@@ -2,7 +2,7 @@ 
 
 namespace DoeSangue\Http\Controllers\Auth;
 
-<<<<<<< HEAD
+<< << <<< HEAD
 use DoeSangue\Models\User;
 ||||||| merged common ancestors
 use DoeSangue\User;
@@ -76,12 +76,8 @@ 
     {
         return User::create(
             [
-            'name' => $data[ 'name' ],
-            'phone' => $data[ 'phone' ],
-            'email' => $data[ 'email' ],
-            'username' => $data[ 'username' ],
-            'password' => bcrypt($data[ 'password' ]),
-            ]
-        );
-    }
-}
+            'name' => $data[  'name' ],
+            'phone' => $data[  'phone' ],
+            'email' => $data[  'email' ],
+            'username' => $data[  'username' ],
+            'password' => bcrypt($data[ 
\ No newline at end of file

Braces +1 added lines, -5 removed lines

@@ -80,8 +80,4 @@
             'phone' => $data[ 'phone' ],
             'email' => $data[ 'email' ],
             'username' => $data[ 'username' ],
-            'password' => bcrypt($data[ 'password' ]),
-            ]
-        );
-    }
-}
+            'password' => bcrypt($data[
\ No newline at end of file

Upper-Lower-Casing +1 added lines, -5 removed lines

@@ -80,8 +80,4 @@
             'phone' => $data[ 'phone' ],
             'email' => $data[ 'email' ],
             'username' => $data[ 'username' ],
-            'password' => bcrypt($data[ 'password' ]),
-            ]
-        );
-    }
-}
+            'password' => bcrypt($data[
\ No newline at end of file

app/Http/Controllers/HomeController.php

Doc Comments +1 added lines, -15 removed lines

@@ -16,18 +16,4 @@
 ||||||| merged common ancestors
         $this->middleware('auth');
 =======
-        //  $this->middleware('auth');
-
->>>>>>> 4c37c57
-    }
-
-    /**
-     * Show the application dashboard.
-     *
-     * @return \Illuminate\Http\Response
-     */
-    public function index()
-    {
-        return view('home');
-    }
-}
+        //  $this->middleware
\ No newline at end of file

Unused Use Statements +1 added lines, -15 removed lines

@@ -16,18 +16,4 @@
 ||||||| merged common ancestors
         $this->middleware('auth');
 =======
-        //  $this->middleware('auth');
-
->>>>>>> 4c37c57
-    }
-
-    /**
-     * Show the application dashboard.
-     *
-     * @return \Illuminate\Http\Response
-     */
-    public function index()
-    {
-        return view('home');
-    }
-}
+        //  $this->middleware
\ No newline at end of file

Indentation +1 added lines, -15 removed lines

@@ -16,18 +16,4 @@
 ||||||| merged common ancestors
         $this->middleware('auth');
 =======
-        //  $this->middleware('auth');
-
->>>>>>> 4c37c57
-    }
-
-    /**
-     * Show the application dashboard.
-     *
-     * @return \Illuminate\Http\Response
-     */
-    public function index()
-    {
-        return view('home');
-    }
-}
+        //  $this->middleware
\ No newline at end of file

Switch Indentation +1 added lines, -15 removed lines

@@ -16,18 +16,4 @@
 ||||||| merged common ancestors
         $this->middleware('auth');
 =======
-        //  $this->middleware('auth');
-
->>>>>>> 4c37c57
-    }
-
-    /**
-     * Show the application dashboard.
-     *
-     * @return \Illuminate\Http\Response
-     */
-    public function index()
-    {
-        return view('home');
-    }
-}
+        //  $this->middleware
\ No newline at end of file

Spacing +2 added lines, -16 removed lines

@@ -11,23 +11,9 @@
      */
 public function __construct()
     {
-<<<<<<< HEAD
+<< << <<< HEAD
         //  $this->middleware('auth');
 ||||||| merged common ancestors
         $this->middleware('auth');
 =======
-        //  $this->middleware('auth');
-
->>>>>>> 4c37c57
-    }
-
-    /**
-     * Show the application dashboard.
-     *
-     * @return \Illuminate\Http\Response
-     */
-    public function index()
-    {
-        return view('home');
-    }
-}
+        //  $this->middleware
\ No newline at end of file

Braces +1 added lines, -15 removed lines

@@ -16,18 +16,4 @@
 ||||||| merged common ancestors
         $this->middleware('auth');
 =======
-        //  $this->middleware('auth');
-
->>>>>>> 4c37c57
-    }
-
-    /**
-     * Show the application dashboard.
-     *
-     * @return \Illuminate\Http\Response
-     */
-    public function index()
-    {
-        return view('home');
-    }
-}
+        //  $this->middleware
\ No newline at end of file

Upper-Lower-Casing +1 added lines, -15 removed lines

@@ -16,18 +16,4 @@
 ||||||| merged common ancestors
         $this->middleware('auth');
 =======
-        //  $this->middleware('auth');
-
->>>>>>> 4c37c57
-    }
-
-    /**
-     * Show the application dashboard.
-     *
-     * @return \Illuminate\Http\Response
-     */
-    public function index()
-    {
-        return view('home');
-    }
-}
+        //  $this->middleware
\ No newline at end of file

app/Http/Controllers/UsersController.php

Doc Comments +1 added lines, -3 removed lines

@@ -46,6 +46,4 @@
         $user->password = bcrypt($request->password);
         $user->save();
 
-      return redirect()->route('users.profile', $user->id);
-    }
-}
+      return redirect()->route('users.profile', $user->id
\ No newline at end of file

Unused Use Statements +1 added lines, -3 removed lines

@@ -46,6 +46,4 @@
         $user->password = bcrypt($request->password);
         $user->save();
 
-      return redirect()->route('users.profile', $user->id);
-    }
-}
+      return redirect()->route('users.profile', $user->id
\ No newline at end of file

Indentation +1 added lines, -3 removed lines

@@ -46,6 +46,4 @@
         $user->password = bcrypt($request->password);
         $user->save();
 
-      return redirect()->route('users.profile', $user->id);
-    }
-}
+      return redirect()->route('users.profile', $user->id
\ No newline at end of file

Switch Indentation +1 added lines, -3 removed lines

@@ -46,6 +46,4 @@
         $user->password = bcrypt($request->password);
         $user->save();
 
-      return redirect()->route('users.profile', $user->id);
-    }
-}
+      return redirect()->route('users.profile', $user->id
\ No newline at end of file

Spacing +2 added lines, -4 removed lines

@@ -2,7 +2,7 @@ 
 
 namespace DoeSangue\Http\Controllers;
 
-<<<<<<< HEAD
+<< << <<< HEAD
 use DoeSangue\Http\Requests\UserProfileRequest;
 use DoeSangue\Models\User;
 ||||||| merged common ancestors
@@ -46,6 +46,4 @@ 
         $user->password = bcrypt($request->password);
         $user->save();
 
-      return redirect()->route('users.profile', $user->id);
-    }
-}
+      return redirect()->route('users.profile', $user->id
\ No newline at end of file

Braces +1 added lines, -3 removed lines

@@ -46,6 +46,4 @@
         $user->password = bcrypt($request->password);
         $user->save();
 
-      return redirect()->route('users.profile', $user->id);
-    }
-}
+      return redirect()->route('users.profile', $user->id
\ No newline at end of file

Upper-Lower-Casing +1 added lines, -3 removed lines

@@ -46,6 +46,4 @@
         $user->password = bcrypt($request->password);
         $user->save();
 
-      return redirect()->route('users.profile', $user->id);
-    }
-}
+      return redirect()->route('users.profile', $user->id
\ No newline at end of file

app/Models/BloodType.php

Spacing +1 added lines, -1 removed lines

@@ -18,5 +18,5 @@
      *
      * @var array
      */
-    protected $filliable = ['description', 'code'];
+    protected $filliable = [ 'description', 'code' ];
 }

app/Http/Controllers/DonorController.php

Spacing +2 added lines, -2 removed lines

@@ -47,8 +47,8 @@
         );
 
         $donor = new Donor();
-        $donor->user_id => $request['user_id'];
-        $donor->blood_type_id => $request['blood_type_id'];
+        $donor->user_id => $request[ 'user_id' ];
+        $donor->blood_type_id => $request[ 'blood_type_id' ];
         $donor->save();
 
         return redirect()->route('user.profile');