Merge pull request #456 from exussum12/psr2

Mark Railton · web-flow · commit 656cf8a7fddb · 2018-10-08T12:31:12.000+01:00
PSR2 check so we can add the build
diff --git a/src/controllers/ApplicationsController.php b/src/controllers/ApplicationsController.php
@@ -33,7 +33,6 @@ public function listApplications(Request $request, PDO $db)
         );
 
         return $clients->getOutputView($request, $this->getVerbosity($request));
-
     }
 
     public function createApplication(Request $request, PDO $db)
@@ -138,7 +137,6 @@ public function editApplication(Request $request, PDO $db)
         $newClient = $clientMapper->getClientByIdAndUser($clientId, $request->user_id);
 
         return $newClient->getOutputView($request);
-
     }
 
     public function deleteApplication(Request $request, PDO $db)
diff --git a/src/controllers/BaseApiController.php b/src/controllers/BaseApiController.php
@@ -38,7 +38,6 @@ public function getVerbosity(Request $request)
     public function getStart(Request $request)
     {
         return $request->paginationParameters['start'];
-
     }
 
     public function getResultsPerPage(Request $request)
diff --git a/src/controllers/Event_hostsController.php b/src/controllers/Event_hostsController.php
@@ -159,7 +159,6 @@ public function removeHostFromEvent(Request $request, PDO $db)
         $request->getView()->setNoRender(true);
 
         return;
-
     }
 
     /**
diff --git a/src/controllers/EventsController.php b/src/controllers/EventsController.php
@@ -564,7 +564,6 @@ public function pendingClaims(Request $request, PDO $db)
             $list = new PendingTalkClaimModelCollection([], 0);
         }
         return $list->getOutputView($request, $verbose);
-
     }
 
     /**
diff --git a/src/controllers/TalksController.php b/src/controllers/TalksController.php
@@ -13,7 +13,6 @@ public function getAction(Request $request, PDO $db)
         $collection = new TalkModelCollection([$talk], 1);
 
         return $collection->getOutputView($request, $verbose);
-
     }
 
     public function getTalkComments(Request $request, PDO $db)
diff --git a/src/controllers/TwitterController.php b/src/controllers/TwitterController.php
@@ -121,7 +121,6 @@ public function logUserIn(Request $request, PDO $db)
 
                 try {
                     $res = $client1->get('1.1/account/verify_credentials.json?include_email=true');
-
                 } catch (Exception $e) {
                     throw new Exception('Could not retrieve user-informations from Twitter', 403, $e);
                 }
@@ -140,7 +139,6 @@ public function logUserIn(Request $request, PDO $db)
             $requestTokenMapper->delete($request_token);
 
             return array('access_token' => $result['access_token'], 'user_uri' => $result['user_uri']);
-
         }
 
         throw new Exception("Twitter: error (" . $res->getStatusCode() . ": " . $res->getBody() . ")", 500);
diff --git a/src/controllers/UsersController.php b/src/controllers/UsersController.php
@@ -80,7 +80,6 @@ public function getAction(Request $request, PDO $db)
         }
 
         return $mapper->getUserList($resultsperpage, $start, $verbose);
-
     }
 
     public function postAction(Request $request, PDO $db)
@@ -382,7 +381,6 @@ public function passwordReset(Request $request, PDO $db)
             // the password wasn't acceptable, tell the user why
             throw new Exception(implode(". ", $validity), 400);
         }
-
     }
 
     public function deleteUser(Request $request, PDO $db)
diff --git a/src/models/EventCommentMapper.php b/src/models/EventCommentMapper.php
@@ -157,7 +157,6 @@ protected function getBasicSQL($include_hidden = false)
             $sql .= 'and ec.active = 1 ';
         }
         return $sql;
-
     }
 
     public function save(array $data)
diff --git a/src/models/TalkMapper.php b/src/models/TalkMapper.php
@@ -343,7 +343,6 @@ public function getTalksBySpeaker($user_id, $resultsperpage, $start)
         }
 
         return false;
-
     }
 
     /**
@@ -920,7 +919,6 @@ public function getSpeakerFromTalk($talk_id, $display_name)
         $speakers = $speaker_stmt->fetchAll(PDO::FETCH_ASSOC);
 
         return count($speakers) > 0 ? $speakers[0] : false;
-
     }
 
     /**
diff --git a/src/models/UserMapper.php b/src/models/UserMapper.php
@@ -467,7 +467,6 @@ public function generateEmailVerificationTokenForUserId($user_id)
         }
 
         return false;
-
     }
 
     /**
diff --git a/src/services/CommentReportedEmailService.php b/src/services/CommentReportedEmailService.php
@@ -20,7 +20,6 @@ public function __construct(array $config, array $recipients, array $comment, ar
         $this->comment = $comment['comments'][0];
         $this->website_url = $config['website_url'];
         $this->event = $event['events'][0];
-
     }
 
     public function sendEmail()
diff --git a/src/services/TalkAssignEmailService.php b/src/services/TalkAssignEmailService.php
@@ -24,7 +24,6 @@ public function __construct(array $config, array $recipients, array $event, Talk
         $this->website_url = $config['website_url'];
         $this->event = $event['events'][0];
         $this->username = $username;
-
     }
 
     public function sendEmail()
diff --git a/src/services/TalkClaimApprovedEmailService.php b/src/services/TalkClaimApprovedEmailService.php
@@ -16,7 +16,6 @@ public function __construct(array $config, array $recipients, array $event, Talk
         $this->website_url = $config['website_url'];
         $this->talk = $talk;
         $this->event = $event['events'][0];
-
     }
 
     public function sendEmail()
diff --git a/src/services/TalkClaimEmailService.php b/src/services/TalkClaimEmailService.php
@@ -17,7 +17,6 @@ public function __construct(array $config, array $recipients, array $event, Talk
         $this->talk = $talk;
         $this->website_url = $config['website_url'];
         $this->event = $event['events'][0];
-
     }
 
     public function sendEmail()
diff --git a/src/services/TalkClaimRejectedEmailService.php b/src/services/TalkClaimRejectedEmailService.php
@@ -15,7 +15,6 @@ public function __construct(array $config, array $recipients, array $event, Talk
 
         $this->talk = $talk;
         $this->event = $event['events'][0];
-
     }
 
     public function sendEmail()
diff --git a/tests/controllers/TalksControllerTest.php b/tests/controllers/TalksControllerTest.php
@@ -47,7 +47,6 @@ public function testClaimTalkWithNoUserIdThrowsException()
         $db = $this->getMockBuilder(mockPDO::class)->getMock();
 
         $talks_controller->setSpeakerForTalk($request, $db);
-
     }
 
     /**
@@ -90,8 +89,6 @@ public function testClaimNonExistantTalkThrowsException()
         $talks_controller->setEventMapper($event_mapper);
 
         $talks_controller->setSpeakerForTalk($request, $db);
-
-
     }
 
     /**
@@ -454,7 +451,6 @@ public function testClaimTalkAsUserIsSuccessful()
         $talks_controller->setEventMapper($event_mapper);
 
         $this->assertNull($talks_controller->setSpeakerForTalk($request, $db));
-
     }
 
     /**
@@ -523,7 +519,6 @@ public function testAssignTalkAsHostIsSuccessful()
         $talks_controller->setEventMapper($event_mapper);
 
         $this->assertNull($talks_controller->setSpeakerForTalk($request, $db));
-
     }
 
     /**
@@ -791,7 +786,6 @@ public function testApproveAssignmentAsUserSucceeds()
         $talks_controller->setEventMapper($event_mapper);
 
         $this->assertNull($talks_controller->setSpeakerForTalk($request, $db));
-
     }
 
 
@@ -866,7 +860,6 @@ public function testApproveClaimAsHostSucceeds()
         $talks_controller->setEventMapper($event_mapper);
 
         $this->assertNull($talks_controller->setSpeakerForTalk($request, $db));
-
     }
     /**
      * @dataProvider getComments
@@ -1135,7 +1128,6 @@ public function testRejectClaimAsHostSucceeds()
         $talks_controller->setEventMapper($event_mapper);
 
         $this->assertTrue($talks_controller->removeSpeakerForTalk($request, $db));
-
     }
 
     public function testDifferentTalkMedia()
@@ -1243,7 +1235,6 @@ public function testGetComments()
 
         $output = $talks_controller->getTalkComments($request, $db);
         $this->assertSame($expected, $output);
-
     }
 
     public function testGetStarred()
diff --git a/tests/controllers/UsersControllerTest.php b/tests/controllers/UsersControllerTest.php
@@ -23,7 +23,6 @@ public function testDeleteUserWithNoUserIdThrowsException()
         $db = $this->getMockBuilder('\JoindinTest\Inc\mockPDO')->getMock();
 
         $usersController->deleteUser($request, $db);
-
     }
 
     /**
@@ -56,7 +55,6 @@ public function testDeleteUserWithNonAdminIdThrowsException()
 
         $usersController->setUserMapper($userMapper);
         $usersController->deleteUser($request, $db);
-
     }
 
     /**
@@ -94,7 +92,6 @@ public function testDeleteUserWithAdminAccessThowsExceptionOnFailedDelete()
 
         $usersController->setUserMapper($userMapper);
         $usersController->deleteUser($request, $db);
-
     }
 
 
@@ -129,7 +126,6 @@ public function testDeleteUserWithAdminAccessDeletesSuccesfully()
 
         $usersController->setUserMapper($userMapper);
         $this->assertNull($usersController->deleteUser($request, $db));
-
     }
 
     public function testThatUserDataIsNotDoubleEscapedOnUserCreation()
@@ -284,7 +280,6 @@ public function testSetTrustedWithNonAdminIdThrowsException()
 
         $usersController->setUserMapper($userMapper);
         $usersController->setTrusted($request, $db);
-
     }
 
 
@@ -322,7 +317,6 @@ public function testSetTrustedWithoutStateThrowsException()
 
         $usersController->setUserMapper($userMapper);
         $usersController->setTrusted($request, $db);
-
     }
 
     /**
@@ -363,7 +357,6 @@ public function testSetTrustedWithFailureThrowsException()
 
         $usersController->setUserMapper($userMapper);
         $usersController->setTrusted($request, $db);
-
     }
 
 
@@ -414,6 +407,5 @@ public function testSetTrustedWithSuccessCreatesView()
 
         $usersController->setUserMapper($userMapper);
         $this->assertNull($usersController->setTrusted($request, $db));
-
     }
 }
diff --git a/tests/models/EventHostMapperTest.php b/tests/models/EventHostMapperTest.php
@@ -139,6 +139,5 @@ public function testThatRemovingAHostFromAnEventCallsTheExpectedMethods()
 
         $mapper = new EventHostMapper($pdo, $request);
         $this->assertTrue($mapper->removeHostFromEvent(12, 14));
-
     }
 }
diff --git a/tests/models/TalkMapperTest.php b/tests/models/TalkMapperTest.php
@@ -244,8 +244,4 @@ public function testThatWorkingTalkDeletionCommits()
 
         $this->assertTrue($mapper->delete(12));
     }
-
-
-
-
 }

Original file line number	Diff line number	Diff line change
`@@ -33,7 +33,6 @@ public function listApplications(Request $request, PDO $db)`
`33`	`33`	`);`
`34`	`34`
`35`	`35`	`return $clients->getOutputView($request, $this->getVerbosity($request));`
`36`		`-`
`37`	`36`	`}`
`38`	`37`
`39`	`38`	`public function createApplication(Request $request, PDO $db)`
`@@ -138,7 +137,6 @@ public function editApplication(Request $request, PDO $db)`
`138`	`137`	`$newClient = $clientMapper->getClientByIdAndUser($clientId, $request->user_id);`
`139`	`138`
`140`	`139`	`return $newClient->getOutputView($request);`
`141`		`-`
`142`	`140`	`}`
`143`	`141`
`144`	`142`	`public function deleteApplication(Request $request, PDO $db)`
Original file line number	Diff line number	Diff line change
`@@ -38,7 +38,6 @@ public function getVerbosity(Request $request)`
`38`	`38`	`public function getStart(Request $request)`
`39`	`39`	`{`
`40`	`40`	`return $request->paginationParameters['start'];`
`41`		`-`
`42`	`41`	`}`
`43`	`42`
`44`	`43`	`public function getResultsPerPage(Request $request)`
Original file line number	Diff line number	Diff line change
`@@ -159,7 +159,6 @@ public function removeHostFromEvent(Request $request, PDO $db)`
`159`	`159`	`$request->getView()->setNoRender(true);`
`160`	`160`
`161`	`161`	`return;`
`162`		`-`
`163`	`162`	`}`
`164`	`163`
`165`	`164`	`/**`
Original file line number	Diff line number	Diff line change
`@@ -564,7 +564,6 @@ public function pendingClaims(Request $request, PDO $db)`
`564`	`564`	`$list = new PendingTalkClaimModelCollection([], 0);`
`565`	`565`	`}`
`566`	`566`	`return $list->getOutputView($request, $verbose);`
`567`		`-`
`568`	`567`	`}`
`569`	`568`
`570`	`569`	`/**`
Original file line number	Diff line number	Diff line change
`@@ -13,7 +13,6 @@ public function getAction(Request $request, PDO $db)`
`13`	`13`	`$collection = new TalkModelCollection([$talk], 1);`
`14`	`14`
`15`	`15`	`return $collection->getOutputView($request, $verbose);`
`16`		`-`
`17`	`16`	`}`
`18`	`17`
`19`	`18`	`public function getTalkComments(Request $request, PDO $db)`
Original file line number	Diff line number	Diff line change
`@@ -121,7 +121,6 @@ public function logUserIn(Request $request, PDO $db)`
`121`	`121`
`122`	`122`	`try {`
`123`	`123`	`$res = $client1->get('1.1/account/verify_credentials.json?include_email=true');`
`124`		`-`
`125`	`124`	`} catch (Exception $e) {`
`126`	`125`	`throw new Exception('Could not retrieve user-informations from Twitter', 403, $e);`
`127`	`126`	`}`
`@@ -140,7 +139,6 @@ public function logUserIn(Request $request, PDO $db)`
`140`	`139`	`$requestTokenMapper->delete($request_token);`
`141`	`140`
`142`	`141`	`return array('access_token' => $result['access_token'], 'user_uri' => $result['user_uri']);`
`143`		`-`
`144`	`142`	`}`
`145`	`143`
`146`	`144`	`throw new Exception("Twitter: error (" . $res->getStatusCode() . ": " . $res->getBody() . ")", 500);`
Original file line number	Diff line number	Diff line change
`@@ -80,7 +80,6 @@ public function getAction(Request $request, PDO $db)`
`80`	`80`	`}`
`81`	`81`
`82`	`82`	`return $mapper->getUserList($resultsperpage, $start, $verbose);`
`83`		`-`
`84`	`83`	`}`
`85`	`84`
`86`	`85`	`public function postAction(Request $request, PDO $db)`
`@@ -382,7 +381,6 @@ public function passwordReset(Request $request, PDO $db)`
`382`	`381`	`// the password wasn't acceptable, tell the user why`
`383`	`382`	`throw new Exception(implode(". ", $validity), 400);`
`384`	`383`	`}`
`385`		`-`
`386`	`384`	`}`
`387`	`385`
`388`	`386`	`public function deleteUser(Request $request, PDO $db)`
Original file line number	Diff line number	Diff line change
`@@ -157,7 +157,6 @@ protected function getBasicSQL($include_hidden = false)`
`157`	`157`	`$sql .= 'and ec.active = 1 ';`
`158`	`158`	`}`
`159`	`159`	`return $sql;`
`160`		`-`
`161`	`160`	`}`
`162`	`161`
`163`	`162`	`public function save(array $data)`
Original file line number	Diff line number	Diff line change
`@@ -343,7 +343,6 @@ public function getTalksBySpeaker($user_id, $resultsperpage, $start)`
`343`	`343`	`}`
`344`	`344`
`345`	`345`	`return false;`
`346`		`-`
`347`	`346`	`}`
`348`	`347`
`349`	`348`	`/**`
`@@ -920,7 +919,6 @@ public function getSpeakerFromTalk($talk_id, $display_name)`
`920`	`919`	`$speakers = $speaker_stmt->fetchAll(PDO::FETCH_ASSOC);`
`921`	`920`
`922`	`921`	`return count($speakers) > 0 ? $speakers[0] : false;`
`923`		`-`
`924`	`922`	`}`
`925`	`923`
`926`	`924`	`/**`
Original file line number	Diff line number	Diff line change
`@@ -467,7 +467,6 @@ public function generateEmailVerificationTokenForUserId($user_id)`
`467`	`467`	`}`
`468`	`468`
`469`	`469`	`return false;`
`470`		`-`
`471`	`470`	`}`
`472`	`471`
`473`	`472`	`/**`