@@ -11,9 +11,6 @@ |
||
| 11 | 11 | |
| 12 | 12 | namespace Gitamin\Models; |
| 13 | 13 | |
| 14 | -use Illuminate\Support\Facades\Auth; |
|
| 15 | -use Illuminate\Database\Eloquent\Model; |
|
| 16 | - |
|
| 17 | 14 | class Group extends ProjectNamespace |
| 18 | 15 | { |
| 19 | 16 | protected $table = 'namespaces'; |
@@ -39,6 +39,6 @@ |
||
| 39 | 39 | */ |
| 40 | 40 | public function scopeMine($query) |
| 41 | 41 | { |
| 42 | - //return $query->where('owner_id', Auth::user()->id); |
|
| 42 | + //return $query->where('owner_id', Auth::user()->id); |
|
| 43 | 43 | } |
| 44 | 44 | } |
@@ -14,7 +14,6 @@ |
||
| 14 | 14 | use Illuminate\Foundation\Bus\DispatchesJobs; |
| 15 | 15 | use Illuminate\Routing\Controller as BaseController; |
| 16 | 16 | use Gitamin\Models\Project; |
| 17 | -use Gitamin\Models\ProjectNamespace; |
|
| 18 | 17 | |
| 19 | 18 | |
| 20 | 19 | class Controller extends BaseController |
@@ -23,10 +23,10 @@ |
||
| 23 | 23 | |
| 24 | 24 | public function getProject($namespace, $path) |
| 25 | 25 | { |
| 26 | - $project = Project::leftJoin('namespaces', function($join) { |
|
| 26 | + $project = Project::leftJoin('namespaces', function($join) { |
|
| 27 | 27 | $join->on('projects.namespace_id', '=', 'namespaces.id'); |
| 28 | 28 | })->where('projects.path', '=', $path)->where('namespaces.path', '=', $namespace)->first(['projects.*']); |
| 29 | 29 | |
| 30 | - return $project; |
|
| 30 | + return $project; |
|
| 31 | 31 | } |
| 32 | 32 | } |
@@ -78,7 +78,6 @@ |
||
| 78 | 78 | /** |
| 79 | 79 | * Display the specified resource. |
| 80 | 80 | * |
| 81 | - * @param int $id |
|
| 82 | 81 | * @return \Illuminate\Http\Response |
| 83 | 82 | */ |
| 84 | 83 | public function show($namespace, $project, Issue $issue) |
@@ -3,19 +3,12 @@ |
||
| 3 | 3 | namespace Gitamin\Http\Controllers\Projects; |
| 4 | 4 | |
| 5 | 5 | use Illuminate\Http\Request; |
| 6 | -use Illuminate\Foundation\Bus\DispatchesJobs; |
|
| 7 | 6 | use Illuminate\Support\Facades\Redirect; |
| 8 | 7 | use Illuminate\Support\Facades\Auth; |
| 9 | 8 | use Illuminate\Support\Facades\View; |
| 10 | 9 | use Gitamin\Http\Controllers\Controller; |
| 11 | 10 | use GrahamCampbell\Binput\Facades\Binput; |
| 12 | 11 | use Gitamin\Commands\Issue\AddIssueCommand; |
| 13 | -use Gitamin\Commands\Issue\RemoveIssueCommand; |
|
| 14 | -use Gitamin\Commands\Issue\UpdateIssueCommand; |
|
| 15 | -use Gitamin\Models\Project; |
|
| 16 | -use Gitamin\Models\ProjectNamespace; |
|
| 17 | -use Gitamin\Models\Group; |
|
| 18 | -use Gitamin\Models\Tag; |
|
| 19 | 12 | use Gitamin\Models\Issue; |
| 20 | 13 | |
| 21 | 14 | class IssuesController extends Controller |
@@ -59,7 +59,7 @@ |
||
| 59 | 59 | $project = $this->getProject($namespace, $project_path); |
| 60 | 60 | $issueData = Binput::get('issue'); |
| 61 | 61 | |
| 62 | - try { |
|
| 62 | + try { |
|
| 63 | 63 | $issueData['author_id'] = Auth::user()->id; |
| 64 | 64 | $issueData['project_id'] = $project->id; |
| 65 | 65 | $issue = $this->dispatchFromArray(AddIssueCommand::class, $issueData); |
@@ -125,7 +125,7 @@ |
||
| 125 | 125 | { |
| 126 | 126 | $statuses = trans('gitamin.issues.status'); |
| 127 | 127 | |
| 128 | - return $statuses[rand(0,2)]; |
|
| 128 | + return $statuses[rand(0, 2)]; |
|
| 129 | 129 | //return $statuses[$this->state]; |
| 130 | 130 | } |
| 131 | 131 | |
@@ -22,17 +22,17 @@ |
||
| 22 | 22 | class FeedController extends Controller |
| 23 | 23 | { |
| 24 | 24 | /** |
| 25 | - * Feed facade. |
|
| 26 | - * |
|
| 27 | - * @var Roumen\Feed\Facades\Feed |
|
| 28 | - */ |
|
| 25 | + * Feed facade. |
|
| 26 | + * |
|
| 27 | + * @var Roumen\Feed\Facades\Feed |
|
| 28 | + */ |
|
| 29 | 29 | private $feed; |
| 30 | 30 | |
| 31 | 31 | /** |
| 32 | - * Create a new feed controller instance. |
|
| 33 | - * |
|
| 34 | - * @return void |
|
| 35 | - */ |
|
| 32 | + * Create a new feed controller instance. |
|
| 33 | + * |
|
| 34 | + * @return void |
|
| 35 | + */ |
|
| 36 | 36 | public function __construct() |
| 37 | 37 | { |
| 38 | 38 | $this->feed = Feed::make(); |
@@ -76,16 +76,16 @@ |
||
| 76 | 76 | * |
| 77 | 77 | * @return \Illuminate\Http\Response |
| 78 | 78 | */ |
| 79 | - private function feedAction(ProjectNamespace &$namespace, $isRss) |
|
| 79 | + private function feedAction(ProjectNamespace & $namespace, $isRss) |
|
| 80 | 80 | { |
| 81 | 81 | if ($namespace->exists) { |
| 82 | - $namespace->projects->map(function ($project) { |
|
| 83 | - $project->issues()->visible()->orderBy('created_at', 'desc')->get()->map(function ($issue) use ($isRss) { |
|
| 82 | + $namespace->projects->map(function($project) { |
|
| 83 | + $project->issues()->visible()->orderBy('created_at', 'desc')->get()->map(function($issue) use ($isRss) { |
|
| 84 | 84 | $this->feedAddItem($issue, $isRss); |
| 85 | 85 | }); |
| 86 | 86 | }); |
| 87 | 87 | } else { |
| 88 | - Issue::visible()->orderBy('created_at', 'desc')->get()->map(function ($issue) use ($isRss) { |
|
| 88 | + Issue::visible()->orderBy('created_at', 'desc')->get()->map(function($issue) use ($isRss) { |
|
| 89 | 89 | $this->feedAddItem($issue, $isRss); |
| 90 | 90 | }); |
| 91 | 91 | } |
@@ -66,10 +66,10 @@ |
||
| 66 | 66 | /** |
| 67 | 67 | * Create a add project namespace command instance. |
| 68 | 68 | * |
| 69 | - * @param \Gitamin\Models\ProjectNamepsace $projectNamespace |
|
| 69 | + * @param ProjectNamespace $projectNamespace |
|
| 70 | 70 | * @param string $name |
| 71 | 71 | * @param string $path |
| 72 | - * @param int $ower_id |
|
| 72 | + * @param int $owner_id |
|
| 73 | 73 | * @param string $description |
| 74 | 74 | * |
| 75 | 75 | * @return void |
@@ -30,7 +30,7 @@ discard block |
||
| 30 | 30 | * |
| 31 | 31 | * @param \Symfony\Component\HttpFoundation\Request $request |
| 32 | 32 | * |
| 33 | - * @return \Illuminate\Http\JsonResponse |
|
| 33 | + * @return \Illuminate\Http\Response |
|
| 34 | 34 | */ |
| 35 | 35 | public function getTeams(Request $request) |
| 36 | 36 | { |
@@ -44,7 +44,7 @@ discard block |
||
| 44 | 44 | * |
| 45 | 45 | * @param \Gitamin\Models\ProjectTeam $team |
| 46 | 46 | * |
| 47 | - * @return \Illuminate\Http\JsonResponse |
|
| 47 | + * @return \Illuminate\Http\Response |
|
| 48 | 48 | */ |
| 49 | 49 | public function getTeam(ProjectTeam $team) |
| 50 | 50 | { |
@@ -54,7 +54,7 @@ discard block |
||
| 54 | 54 | /** |
| 55 | 55 | * Create a new project team. |
| 56 | 56 | * |
| 57 | - * @return \Illuminate\Http\JsonResponse |
|
| 57 | + * @return \Illuminate\Http\Response |
|
| 58 | 58 | */ |
| 59 | 59 | public function postTeams() |
| 60 | 60 | { |
@@ -76,7 +76,7 @@ discard block |
||
| 76 | 76 | * |
| 77 | 77 | * @param \Gitamin\Models\ProjectTeam $team |
| 78 | 78 | * |
| 79 | - * @return \Illuminate\Http\JsonResponse |
|
| 79 | + * @return \Illuminate\Http\Response |
|
| 80 | 80 | */ |
| 81 | 81 | public function putTeam(ProjectTeam $team) |
| 82 | 82 | { |
@@ -99,7 +99,7 @@ discard block |
||
| 99 | 99 | * |
| 100 | 100 | * @param \Gitamin\Models\ProjectTeam $team |
| 101 | 101 | * |
| 102 | - * @return \Illuminate\Http\JsonResponse |
|
| 102 | + * @return \Illuminate\Http\Response |
|
| 103 | 103 | */ |
| 104 | 104 | public function deleteTeam(ProjectTeam $team) |
| 105 | 105 | { |
@@ -14,7 +14,6 @@ |
||
| 14 | 14 | use Illuminate\Foundation\Bus\DispatchesJobs; |
| 15 | 15 | use Illuminate\Routing\Controller as BaseController; |
| 16 | 16 | use Gitamin\Models\Project; |
| 17 | -use Gitamin\Models\ProjectNamespace; |
|
| 18 | 17 | |
| 19 | 18 | |
| 20 | 19 | class Controller extends BaseController |