@@ -22,6 +22,9 @@ discard block |
||
| 22 | 22 | $this->convertToLines($result); |
| 23 | 23 | } |
| 24 | 24 | |
| 25 | + /** |
|
| 26 | + * @param string $result |
|
| 27 | + */ |
|
| 25 | 28 | private function addSuggestionFix($result) |
| 26 | 29 | { |
| 27 | 30 | $arr = explode('<br />', nl2br($result)); |
@@ -47,6 +50,9 @@ discard block |
||
| 47 | 50 | } |
| 48 | 51 | } |
| 49 | 52 | |
| 53 | + /** |
|
| 54 | + * @param string $result |
|
| 55 | + */ |
|
| 50 | 56 | private function convertToLines($result) |
| 51 | 57 | { |
| 52 | 58 | $arr = explode('<br />', nl2br($result)); |
@@ -8,7 +8,6 @@ |
||
| 8 | 8 | namespace GitScrum\Http\Controllers\Auth; |
| 9 | 9 | |
| 10 | 10 | use GitScrum\Http\Requests\AuthRequest; |
| 11 | -use GitScrum\Models\User; |
|
| 12 | 11 | use GitScrum\Classes\UserClass; |
| 13 | 12 | use GitScrum\Http\Controllers\Controller; |
| 14 | 13 | use Carbon\Carbon; |
@@ -95,7 +95,7 @@ discard block |
||
| 95 | 95 | * |
| 96 | 96 | * @param \Illuminate\Http\Request $request |
| 97 | 97 | * |
| 98 | - * @return \Illuminate\Http\Response |
|
| 98 | + * @return \Illuminate\Http\RedirectResponse |
|
| 99 | 99 | */ |
| 100 | 100 | public function store(IssueRequest $request) |
| 101 | 101 | { |
@@ -112,7 +112,6 @@ discard block |
||
| 112 | 112 | /** |
| 113 | 113 | * Display the specified resource. |
| 114 | 114 | * |
| 115 | - * @param int $id |
|
| 116 | 115 | * |
| 117 | 116 | * @return \Illuminate\Http\Response |
| 118 | 117 | */ |
@@ -141,7 +140,6 @@ discard block |
||
| 141 | 140 | /** |
| 142 | 141 | * Show the form for editing the specified resource. |
| 143 | 142 | * |
| 144 | - * @param int $id |
|
| 145 | 143 | * |
| 146 | 144 | * @return \Illuminate\Http\Response |
| 147 | 145 | */ |
@@ -173,9 +171,8 @@ discard block |
||
| 173 | 171 | * Update the specified resource in storage. |
| 174 | 172 | * |
| 175 | 173 | * @param \Illuminate\Http\Request $request |
| 176 | - * @param int $id |
|
| 177 | 174 | * |
| 178 | - * @return \Illuminate\Http\Response |
|
| 175 | + * @return \Illuminate\Http\RedirectResponse |
|
| 179 | 176 | */ |
| 180 | 177 | public function update(IssueRequest $request, $slug) |
| 181 | 178 | { |
@@ -212,9 +209,8 @@ discard block |
||
| 212 | 209 | /** |
| 213 | 210 | * Remove the specified resource from storage. |
| 214 | 211 | * |
| 215 | - * @param int $id |
|
| 216 | 212 | * |
| 217 | - * @return \Illuminate\Http\Response |
|
| 213 | + * @return \Illuminate\Http\RedirectResponse |
|
| 218 | 214 | */ |
| 219 | 215 | public function destroy($slug) |
| 220 | 216 | { |
@@ -62,9 +62,9 @@ discard block |
||
| 62 | 62 | /** |
| 63 | 63 | * Store a newly created resource in storage. |
| 64 | 64 | * |
| 65 | - * @param GitScrum\Http\Requests\SprintRequest $request |
|
| 65 | + * @param SprintRequest $request |
|
| 66 | 66 | * |
| 67 | - * @return \Illuminate\Http\Response |
|
| 67 | + * @return \Illuminate\Http\RedirectResponse |
|
| 68 | 68 | */ |
| 69 | 69 | public function store(SprintRequest $request) |
| 70 | 70 | { |
@@ -111,7 +111,6 @@ discard block |
||
| 111 | 111 | /** |
| 112 | 112 | * Show the form for editing the specified resource. |
| 113 | 113 | * |
| 114 | - * @param int $id |
|
| 115 | 114 | * |
| 116 | 115 | * @return \Illuminate\Http\Response |
| 117 | 116 | */ |
@@ -128,9 +127,8 @@ discard block |
||
| 128 | 127 | * Update the specified resource in storage. |
| 129 | 128 | * |
| 130 | 129 | * @param \Illuminate\Http\Request $request |
| 131 | - * @param int $id |
|
| 132 | 130 | * |
| 133 | - * @return \Illuminate\Http\Response |
|
| 131 | + * @return \Illuminate\Http\RedirectResponse |
|
| 134 | 132 | */ |
| 135 | 133 | public function update(SprintRequest $request, $slug) |
| 136 | 134 | { |
@@ -144,9 +142,8 @@ discard block |
||
| 144 | 142 | /** |
| 145 | 143 | * Remove the specified resource from storage. |
| 146 | 144 | * |
| 147 | - * @param int $id |
|
| 148 | 145 | * |
| 149 | - * @return \Illuminate\Http\Response |
|
| 146 | + * @return \Illuminate\Http\RedirectResponse |
|
| 150 | 147 | */ |
| 151 | 148 | public function destroy(Request $request) |
| 152 | 149 | { |
@@ -70,7 +70,6 @@ |
||
| 70 | 70 | /** |
| 71 | 71 | * Display the specified resource. |
| 72 | 72 | * |
| 73 | - * @param int $id |
|
| 74 | 73 | * |
| 75 | 74 | * @return \Illuminate\Http\Response |
| 76 | 75 | */ |
@@ -87,9 +87,8 @@ |
||
| 87 | 87 | * Update the specified resource in storage. |
| 88 | 88 | * |
| 89 | 89 | * @param \Illuminate\Http\Request $request |
| 90 | - * @param int $id |
|
| 91 | 90 | * |
| 92 | - * @return \Illuminate\Http\Response |
|
| 91 | + * @return \Illuminate\Http\RedirectResponse|null |
|
| 93 | 92 | */ |
| 94 | 93 | public function update(Request $request, $slug) |
| 95 | 94 | { |
@@ -52,7 +52,7 @@ discard block |
||
| 52 | 52 | * |
| 53 | 53 | * @param \Illuminate\Http\Request $request |
| 54 | 54 | * |
| 55 | - * @return \Illuminate\Http\Response |
|
| 55 | + * @return \Illuminate\Http\RedirectResponse |
|
| 56 | 56 | */ |
| 57 | 57 | public function store(Request $request) |
| 58 | 58 | { |
@@ -65,7 +65,6 @@ discard block |
||
| 65 | 65 | /** |
| 66 | 66 | * Display the specified resource. |
| 67 | 67 | * |
| 68 | - * @param int $id |
|
| 69 | 68 | * |
| 70 | 69 | * @return \Illuminate\Http\Response |
| 71 | 70 | */ |
@@ -82,7 +81,6 @@ discard block |
||
| 82 | 81 | /** |
| 83 | 82 | * Show the form for editing the specified resource. |
| 84 | 83 | * |
| 85 | - * @param int $id |
|
| 86 | 84 | * |
| 87 | 85 | * @return \Illuminate\Http\Response |
| 88 | 86 | */ |
@@ -105,9 +103,8 @@ discard block |
||
| 105 | 103 | * Update the specified resource in storage. |
| 106 | 104 | * |
| 107 | 105 | * @param \Illuminate\Http\Request $request |
| 108 | - * @param int $id |
|
| 109 | 106 | * |
| 110 | - * @return \Illuminate\Http\Response |
|
| 107 | + * @return \Illuminate\Http\RedirectResponse |
|
| 111 | 108 | */ |
| 112 | 109 | public function update(Request $request, $slug) |
| 113 | 110 | { |
@@ -74,6 +74,9 @@ |
||
| 74 | 74 | return Carbon::createFromFormat('Y-m-d H:i:s', $this->attributes['created_at'])->diffForHumans(); |
| 75 | 75 | } |
| 76 | 76 | |
| 77 | + /** |
|
| 78 | + * @param string $alias |
|
| 79 | + */ |
|
| 77 | 80 | public function track($alias, $model) |
| 78 | 81 | { |
| 79 | 82 | if (!isset($model->config_status_id)) { |
@@ -7,11 +7,9 @@ |
||
| 7 | 7 | */ |
| 8 | 8 | namespace GitScrum\Models; |
| 9 | 9 | |
| 10 | -use Illuminate\Database\Eloquent\Model; |
|
| 11 | 10 | use Illuminate\Foundation\Auth\User as Authenticatable; |
| 12 | 11 | use GitScrum\Classes\Helper; |
| 13 | 12 | use Carbon\Carbon; |
| 14 | -use Auth; |
|
| 15 | 13 | |
| 16 | 14 | class User extends Authenticatable |
| 17 | 15 | { |
@@ -102,14 +102,14 @@ discard block |
||
| 102 | 102 | |
| 103 | 103 | public function labels($feature) |
| 104 | 104 | { |
| 105 | - return $this->{$feature}->map(function ($obj) { |
|
| 105 | + return $this->{$feature}->map(function($obj) { |
|
| 106 | 106 | return $obj->labels; |
| 107 | 107 | })->flatten(1)->unique('id'); |
| 108 | 108 | } |
| 109 | 109 | |
| 110 | 110 | public function productBacklogs($product_backlog_id = null) |
| 111 | 111 | { |
| 112 | - return $this->organizations->map(function ($organization) use ($product_backlog_id) { |
|
| 112 | + return $this->organizations->map(function($organization) use ($product_backlog_id) { |
|
| 113 | 113 | $obj = $organization->productBacklog() |
| 114 | 114 | ->with('sprints') |
| 115 | 115 | ->with('favorite') |
@@ -154,7 +154,7 @@ discard block |
||
| 154 | 154 | |
| 155 | 155 | public function team() |
| 156 | 156 | { |
| 157 | - return $this->organizations->map(function ($obj) { |
|
| 157 | + return $this->organizations->map(function($obj) { |
|
| 158 | 158 | return $obj->users; |
| 159 | 159 | })->flatten(1)->unique('id'); |
| 160 | 160 | //->where('id', '!=', Auth::user()->id); |
@@ -162,7 +162,7 @@ discard block |
||
| 162 | 162 | |
| 163 | 163 | public function activities() |
| 164 | 164 | { |
| 165 | - return $this->team()->map(function ($obj) { |
|
| 165 | + return $this->team()->map(function($obj) { |
|
| 166 | 166 | return $obj->statuses; |
| 167 | 167 | })->flatten(1)->sortByDesc('id')->take(6); |
| 168 | 168 | } |