Jitamin / jitamin

app/Helpers/NavbarSearchHelper.php

Doc Comments +1 added lines, -3 removed lines

@@ -92,6 +92,4 @@
     {
         $whiteList = ['Project/ProjectController@overview', 'Project/ProjectController@show', 'Project/Board/BoardController@show', 'CalendarController@show', 'Task/TaskController@index', 'Task/TaskController@gantt'];
 
-        return in_array($path, $whiteList);
-    }
-}
+        return in_array($path, $whiteList
\ No newline at end of file

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

@@ -92,6 +92,4 @@
     {
         $whiteList = ['Project/ProjectController@overview', 'Project/ProjectController@show', 'Project/Board/BoardController@show', 'CalendarController@show', 'Task/TaskController@index', 'Task/TaskController@gantt'];
 
-        return in_array($path, $whiteList);
-    }
-}
+        return in_array($path, $whiteList
\ No newline at end of file

Indentation +1 added lines, -3 removed lines

@@ -92,6 +92,4 @@
     {
         $whiteList = ['Project/ProjectController@overview', 'Project/ProjectController@show', 'Project/Board/BoardController@show', 'CalendarController@show', 'Task/TaskController@index', 'Task/TaskController@gantt'];
 
-        return in_array($path, $whiteList);
-    }
-}
+        return in_array($path, $whiteList
\ No newline at end of file

Switch Indentation +1 added lines, -3 removed lines

@@ -92,6 +92,4 @@
     {
         $whiteList = ['Project/ProjectController@overview', 'Project/ProjectController@show', 'Project/Board/BoardController@show', 'CalendarController@show', 'Task/TaskController@index', 'Task/TaskController@gantt'];
 
-        return in_array($path, $whiteList);
-    }
-}
+        return in_array($path, $whiteList
\ No newline at end of file

Spacing +2 added lines, -4 removed lines

@@ -48,7 +48,7 @@ 
     public function render(array $project)
     {
         if (empty($project)) {
-<<<<<<< HEAD
+<< << <<< HEAD
             return null;
 =======
             return;
@@ -92,6 +92,4 @@ 
     {
         $whiteList = ['Project/ProjectController@overview', 'Project/ProjectController@show', 'Project/Board/BoardController@show', 'CalendarController@show', 'Task/TaskController@index', 'Task/TaskController@gantt'];
 
-        return in_array($path, $whiteList);
-    }
-}
+        return in_array($path, $whiteList
\ No newline at end of file

Braces +1 added lines, -3 removed lines

@@ -92,6 +92,4 @@
     {
         $whiteList = ['Project/ProjectController@overview', 'Project/ProjectController@show', 'Project/Board/BoardController@show', 'CalendarController@show', 'Task/TaskController@index', 'Task/TaskController@gantt'];
 
-        return in_array($path, $whiteList);
-    }
-}
+        return in_array($path, $whiteList
\ No newline at end of file

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

@@ -92,6 +92,4 @@
     {
         $whiteList = ['Project/ProjectController@overview', 'Project/ProjectController@show', 'Project/Board/BoardController@show', 'CalendarController@show', 'Task/TaskController@index', 'Task/TaskController@gantt'];
 
-        return in_array($path, $whiteList);
-    }
-}
+        return in_array($path, $whiteList
\ No newline at end of file

app/Helpers/ProjectHeaderHelper.php

Doc Comments +1 added lines, -3 removed lines

@@ -82,6 +82,4 @@
             $description = $project['description'];
         }
 
-        return $description;
-    }
-}
+        return $description
\ No newline at end of file

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

@@ -82,6 +82,4 @@
             $description = $project['description'];
         }
 
-        return $description;
-    }
-}
+        return $description
\ No newline at end of file

Indentation +1 added lines, -3 removed lines

@@ -82,6 +82,4 @@
             $description = $project['description'];
         }
 
-        return $description;
-    }
-}
+        return $description
\ No newline at end of file

Switch Indentation +1 added lines, -3 removed lines

@@ -82,6 +82,4 @@
             $description = $project['description'];
         }
 
-        return $description;
-    }
-}
+        return $description
\ No newline at end of file

Spacing +2 added lines, -4 removed lines

@@ -48,7 +48,7 @@ 
      */
     public function render(array $project, $boardView = false)
     {
-<<<<<<< HEAD
+<< << <<< HEAD
 
         return $this->template->render('project/_header/header', [
             'project'             => $project,
@@ -82,6 +82,4 @@ 
             $description = $project['description'];
         }
 
-        return $description;
-    }
-}
+        return $description
\ No newline at end of file

Braces +1 added lines, -3 removed lines

@@ -82,6 +82,4 @@
             $description = $project['description'];
         }
 
-        return $description;
-    }
-}
+        return $description
\ No newline at end of file

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

@@ -82,6 +82,4 @@
             $description = $project['description'];
         }
 
-        return $description;
-    }
-}
+        return $description
\ No newline at end of file