Fixing bad merge conflict

Author: weaverryan

src/AppBundle/Controller/WebhookController.php

@@ -16,64 +16,7 @@ class WebhookController extends Controller
      */
     public function githubAction(Request $request)
     {
-        $data = json_decode($request->getContent(), true);
-        if ($data === null) {
-            throw new \Exception('Invalid JSON body!');
-        }
-
-        $event = $request->headers->get('X-Github-Event');
-        $listener = $this->get('app.issue_listener');
-
-        switch ($event) {
-            case 'issue_comment':
-                $responseData = [
-                    'issue' => $data['issue']['number'],
-                    'status_change' => $listener->handleCommentAddedEvent(
-                        $data['issue']['number'],
-                        $data['comment']['body']
-                    ),
-                ];
-                break;
-            case 'pull_request':
-                switch ($data['action']) {
-                    case 'opened':
-                        $responseData = [
-                            'pull_request' => $data['pull_request']['number'],
-                            'status_change' => $listener->handlePullRequestCreatedEvent(
-                                $data['pull_request']['number'],
-                                $data['pull_request']['title'],
-                                $data['pull_request']['body']
-                            ),
-                        ];
-                        break;
-                    default:
-                        $responseData = [
-                            'unsupported_action' => $data['action'],
-                        ];
-                }
-                break;
-            case 'issues':
-                switch ($data['action']) {
-                    case 'labeled':
-                        $responseData = [
-                            'issue' => $data['issue']['number'],
-                            'status_change' => $listener->handleLabelAddedEvent(
-                                $data['issue']['number'],
-                                $data['label']['name']
-                            ),
-                        ];
-                        break;
-                    default:
-                        $responseData = [
-                            'unsupported_action' => $data['action'],
-                        ];
-                }
-                break;
-            default:
-                $responseData = [
-                    'unsupported_event' => $event,
-                ];
-        }
+        $responseData = $this->get('app.github.request_handler')->handle($request);
 
         return new JsonResponse($responseData);
     }