zsturgess / overwatch

src/TestBundle/Controller/TestApiController.php

Spacing +2 added lines, -2 removed lines

@@ -96,7 +96,7 @@ 
         try {
             $this->expectationManager->get($test->getExpectation());
         } catch (ExpectationNotFoundException $ex) {
-            return new JsonResponse("Expectation '" . $test->getExpectation() . "' could not be found", JsonResponse::HTTP_UNPROCESSABLE_ENTITY);
+            return new JsonResponse("Expectation '".$test->getExpectation()."' could not be found", JsonResponse::HTTP_UNPROCESSABLE_ENTITY);
         }
         
         if ($test->getActual() === null) {
@@ -160,7 +160,7 @@ 
         
         foreach (['name', 'actual', 'expectation', 'expected'] as $field) {
             if ($request->request->has($field)) {
-                $test->{'set' . ucfirst($field)}($request->request->get($field));
+                $test->{'set'.ucfirst($field)}($request->request->get($field));
             }
         }
         

src/TestBundle/Tests/Controller/TestGroupApiControllerTest.php

Spacing +15 added lines, -15 removed lines

@@ -112,7 +112,7 @@ 
     public function testGetGroup()
     {
         $this->logIn('ROLE_SUPER_ADMIN');
-        $this->client->request('GET', '/api/groups/' . TestGroupFixtures::$groups['group-1']->getId());
+        $this->client->request('GET', '/api/groups/'.TestGroupFixtures::$groups['group-1']->getId());
         
         $this->assertJsonResponse($this->client->getResponse());
         $this->assertJsonStringEqualsJsonString(
@@ -126,7 +126,7 @@ 
     public function testGetGroupInsufficentPerms()
     {
         $this->logIn('ROLE_ADMIN');
-        $this->client->request('GET', '/api/groups/' . TestGroupFixtures::$groups['group-1']->getId());
+        $this->client->request('GET', '/api/groups/'.TestGroupFixtures::$groups['group-1']->getId());
         
         $this->assertForbidden($this->client->getResponse());
     }
@@ -146,7 +146,7 @@ 
         $this->logIn('ROLE_SUPER_ADMIN');
         $this->makeJsonRequest(
             'PUT',
-            '/api/groups/' . TestGroupFixtures::$groups['group-2']->getId(),
+            '/api/groups/'.TestGroupFixtures::$groups['group-2']->getId(),
             [
                 'name' => $newName
             ]
@@ -166,7 +166,7 @@ 
     public function testUpdateGroupInsufficentPerms()
     {
         $this->logIn('ROLE_USER');
-        $this->client->request('PUT', '/api/groups/' . TestGroupFixtures::$groups['group-2']->getId());
+        $this->client->request('PUT', '/api/groups/'.TestGroupFixtures::$groups['group-2']->getId());
         
         $this->assertForbidden($this->client->getResponse());
     }
@@ -182,7 +182,7 @@ 
     public function testDeleteGroup()
     {
         $this->logIn('ROLE_SUPER_ADMIN');
-        $this->client->request('DELETE', '/api/groups/' . TestGroupFixtures::$groups['group-3']->getId());
+        $this->client->request('DELETE', '/api/groups/'.TestGroupFixtures::$groups['group-3']->getId());
         
         $this->assertEquals(Response::HTTP_NO_CONTENT, $this->client->getResponse()->getStatusCode());
         $this->assertNull($this->em->find("Overwatch\TestBundle\Entity\TestGroup", TestGroupFixtures::$groups['group-3']->getId()));
@@ -191,7 +191,7 @@ 
     public function testDeleteGroupPopulatedGroup()
     {
         $this->logIn('ROLE_SUPER_ADMIN');
-        $this->client->request('DELETE', '/api/groups/' . TestGroupFixtures::$groups['group-2']->getId());
+        $this->client->request('DELETE', '/api/groups/'.TestGroupFixtures::$groups['group-2']->getId());
         
         $this->assertEquals(Response::HTTP_UNPROCESSABLE_ENTITY, $this->client->getResponse()->getStatusCode());
         $this->assertNotNull($this->em->find("Overwatch\TestBundle\Entity\TestGroup", TestGroupFixtures::$groups['group-2']->getId()));
@@ -200,7 +200,7 @@ 
     public function testDeleteGroupInsufficentPerms()
     {
         $this->logIn('ROLE_ADMIN');
-        $this->client->request('DELETE', '/api/groups/' . TestGroupFixtures::$groups['group-3']->getId());
+        $this->client->request('DELETE', '/api/groups/'.TestGroupFixtures::$groups['group-3']->getId());
         
         $this->assertForbidden($this->client->getResponse());
         $this->assertNotNull($this->em->find("Overwatch\TestBundle\Entity\TestGroup", TestGroupFixtures::$groups['group-2']->getId()));
@@ -220,7 +220,7 @@ 
         $group = TestGroupFixtures::$groups['group-3'];
         
         $this->logIn('ROLE_SUPER_ADMIN');
-        $this->client->request('POST', '/api/groups/' . $group->getId() . '/user/' . $user->getId());
+        $this->client->request('POST', '/api/groups/'.$group->getId().'/user/'.$user->getId());
         
         $group = $this->em->find("Overwatch\TestBundle\Entity\TestGroup", $group->getId());
         
@@ -235,7 +235,7 @@ 
         $group = TestGroupFixtures::$groups['group-3'];
         
         $this->logIn('ROLE_ADMIN');
-        $this->client->request('POST', '/api/groups/' . $group->getId() . '/user/' . $user->getId());
+        $this->client->request('POST', '/api/groups/'.$group->getId().'/user/'.$user->getId());
         
         $group = $this->em->find("Overwatch\TestBundle\Entity\TestGroup", $group->getId());
         
@@ -248,7 +248,7 @@ 
         $user = UserFixtures::$users['user-2'];
         
         $this->logIn('ROLE_SUPER_ADMIN');
-        $this->client->request('POST', '/api/groups/1000/user/' . $user->getId());
+        $this->client->request('POST', '/api/groups/1000/user/'.$user->getId());
         
         $this->assertEquals(Response::HTTP_NOT_FOUND, $this->client->getResponse()->getStatusCode());
     }
@@ -258,7 +258,7 @@ 
         $group = TestGroupFixtures::$groups['group-3'];
         
         $this->logIn('ROLE_SUPER_ADMIN');
-        $this->client->request('POST', '/api/groups/' . $group->getId() . '/user/1000');
+        $this->client->request('POST', '/api/groups/'.$group->getId().'/user/1000');
         
         $group = $this->em->find("Overwatch\TestBundle\Entity\TestGroup", $group->getId());
         
@@ -272,7 +272,7 @@ 
         $group = TestGroupFixtures::$groups['group-1'];
         
         $this->logIn('ROLE_SUPER_ADMIN');
-        $this->client->request('DELETE', '/api/groups/' . $group->getId() . '/user/' . $user->getId());
+        $this->client->request('DELETE', '/api/groups/'.$group->getId().'/user/'.$user->getId());
         
         $group = $this->em->find("Overwatch\TestBundle\Entity\TestGroup", $group->getId());
         
@@ -287,7 +287,7 @@ 
         $group = TestGroupFixtures::$groups['group-1'];
         
         $this->logIn('ROLE_ADMIN');
-        $this->client->request('DELETE', '/api/groups/' . $group->getId() . '/user/' . $user->getId());
+        $this->client->request('DELETE', '/api/groups/'.$group->getId().'/user/'.$user->getId());
         
         $group = $this->em->find("Overwatch\TestBundle\Entity\TestGroup", $group->getId());
         
@@ -301,7 +301,7 @@ 
         $group = TestGroupFixtures::$groups['group-1'];
         
         $this->logIn('ROLE_SUPER_ADMIN');
-        $this->client->request('DELETE', '/api/groups/1000/user/' . $user->getId());
+        $this->client->request('DELETE', '/api/groups/1000/user/'.$user->getId());
         
         $group = $this->em->find("Overwatch\TestBundle\Entity\TestGroup", $group->getId());
         
@@ -314,7 +314,7 @@ 
         $group = TestGroupFixtures::$groups['group-1'];
         
         $this->logIn('ROLE_SUPER_ADMIN');
-        $this->client->request('DELETE', '/api/groups/' . $group->getId() . '/user/1000');
+        $this->client->request('DELETE', '/api/groups/'.$group->getId().'/user/1000');
         
         $group = $this->em->find("Overwatch\TestBundle\Entity\TestGroup", $group->getId());
         

src/TestBundle/Tests/Controller/TestApiControllerTest.php

Spacing +14 added lines, -14 removed lines

@@ -26,7 +26,7 @@ 
         $this->logIn('ROLE_SUPER_ADMIN');
         $this->makeJsonRequest(
             'POST',
-            '/api/tests/group/' . TestGroupFixtures::$groups['group-2']->getId(),
+            '/api/tests/group/'.TestGroupFixtures::$groups['group-2']->getId(),
             [
                 'name'        => $newTest->getName(),
                 'actual'      => $newTest->getActual(),
@@ -52,7 +52,7 @@ 
     public function testCreateTestInsufficentPerms()
     {
         $this->logIn('ROLE_USER');
-        $this->client->request('POST', '/api/tests/group/' . TestGroupFixtures::$groups['group-1']->getId());
+        $this->client->request('POST', '/api/tests/group/'.TestGroupFixtures::$groups['group-1']->getId());
         
         $this->assertForbidden($this->client->getResponse());
     }
@@ -69,7 +69,7 @@ 
         $this->logIn('ROLE_SUPER_ADMIN');
         $this->makeJsonRequest(
             'POST',
-            '/api/tests/group/' . TestGroupFixtures::$groups['group-2']->getId(),
+            '/api/tests/group/'.TestGroupFixtures::$groups['group-2']->getId(),
             [
                 'name'        => $newTest->getName(),
                 'actual'      => $newTest->getActual(),
@@ -97,7 +97,7 @@ 
         $this->logIn('ROLE_SUPER_ADMIN');
         $this->makeJsonRequest(
             'POST',
-            '/api/tests/group/' . TestGroupFixtures::$groups['group-2']->getId(),
+            '/api/tests/group/'.TestGroupFixtures::$groups['group-2']->getId(),
             [
                 'name'        => $newTest->getName(),
                 'expectation' => $newTest->getExpectation()
@@ -115,7 +115,7 @@ 
     public function testGetTestsInGroup()
     {
         $this->logIn('ROLE_SUPER_ADMIN');
-        $this->client->request('GET', '/api/tests/group/' . TestGroupFixtures::$groups['group-1']->getId());
+        $this->client->request('GET', '/api/tests/group/'.TestGroupFixtures::$groups['group-1']->getId());
         
         $this->assertJsonResponse($this->client->getResponse());
         $this->assertCount(2, $this->getResponseContent());
@@ -132,7 +132,7 @@ 
     public function testGetTestsInGroupInsufficentPerms()
     {
         $this->logIn('ROLE_ADMIN');
-        $this->client->request('GET', '/api/tests/group/' . TestGroupFixtures::$groups['group-1']->getId());
+        $this->client->request('GET', '/api/tests/group/'.TestGroupFixtures::$groups['group-1']->getId());
         
         $this->assertForbidden($this->client->getResponse());
     }
@@ -148,7 +148,7 @@ 
     public function testGetTest()
     {
         $this->logIn('ROLE_SUPER_ADMIN');
-        $this->client->request('GET', '/api/tests/' . TestFixtures::$tests['test-1']->getId());
+        $this->client->request('GET', '/api/tests/'.TestFixtures::$tests['test-1']->getId());
         
         $this->assertJsonResponse($this->client->getResponse());
         $this->assertJsonStringEqualsJsonString(
@@ -162,7 +162,7 @@ 
     public function testGetTestInsufficentPerms()
     {
         $this->logIn('ROLE_ADMIN');
-        $this->client->request('GET', '/api/tests/' . TestFixtures::$tests['test-1']->getId());
+        $this->client->request('GET', '/api/tests/'.TestFixtures::$tests['test-1']->getId());
         
         $this->assertForbidden($this->client->getResponse());
     }
@@ -182,7 +182,7 @@ 
         $this->logIn('ROLE_SUPER_ADMIN');
         $this->makeJsonRequest(
             'PUT',
-            '/api/tests/' . TestFixtures::$tests['test-1']->getId(),
+            '/api/tests/'.TestFixtures::$tests['test-1']->getId(),
             [
                 'name' => $newName
             ]
@@ -202,7 +202,7 @@ 
     public function testUpdateTestInsufficentPerms()
     {
         $this->logIn('ROLE_USER');
-        $this->client->request('PUT', '/api/tests/' . TestFixtures::$tests['test-1']->getId());
+        $this->client->request('PUT', '/api/tests/'.TestFixtures::$tests['test-1']->getId());
         
         $this->assertForbidden($this->client->getResponse());
     }
@@ -218,7 +218,7 @@ 
     public function testDeleteTest()
     {
         $this->logIn('ROLE_SUPER_ADMIN');
-        $this->client->request('DELETE', '/api/tests/' . TestFixtures::$tests['test-1']->getId());
+        $this->client->request('DELETE', '/api/tests/'.TestFixtures::$tests['test-1']->getId());
         
         $this->assertTrue($this->client->getResponse()->isSuccessful());
         $this->assertEquals(Response::HTTP_NO_CONTENT, $this->client->getResponse()->getStatusCode());
@@ -228,7 +228,7 @@ 
     public function testDeleteTestInsufficentPerms()
     {
         $this->logIn('ROLE_USER');
-        $this->client->request('DELETE', '/api/tests/' . TestFixtures::$tests['test-1']->getId());
+        $this->client->request('DELETE', '/api/tests/'.TestFixtures::$tests['test-1']->getId());
         
         $this->assertForbidden($this->client->getResponse());
     }
@@ -244,7 +244,7 @@ 
     public function testRunTest()
     {
         $this->logIn('ROLE_SUPER_ADMIN');
-        $this->client->request('POST', '/api/tests/' . TestFixtures::$tests['test-1']->getId());
+        $this->client->request('POST', '/api/tests/'.TestFixtures::$tests['test-1']->getId());
         
         $test = $this->em->find("Overwatch\TestBundle\Entity\Test", TestFixtures::$tests['test-1']->getId());
         
@@ -258,7 +258,7 @@ 
     public function testRunTestInsufficentPerms()
     {
         $this->logIn('ROLE_USER');
-        $this->client->request('POST', '/api/tests/' . TestFixtures::$tests['test-1']->getId());
+        $this->client->request('POST', '/api/tests/'.TestFixtures::$tests['test-1']->getId());
         
         $this->assertForbidden($this->client->getResponse());
     }

src/TestBundle/Tests/E2E/AddEditTestTest.php

Spacing +1 added lines, -1 removed lines

@@ -73,7 +73,7 @@
         $field = strtolower($field);
         
         if ($value === null) {
-            $value = TestFixtures::$tests['test-1']->{'get' . ucfirst($field)}();
+            $value = TestFixtures::$tests['test-1']->{'get'.ucfirst($field)}();
         }
         
         if ($field === 'expectation') {

src/TestBundle/Tests/Command/TestsRunCommandTest.php

Spacing +9 added lines, -9 removed lines

@@ -33,7 +33,7 @@ 
         $command = new TestsRunCommand();
         $command->setContainer($this->getContainer());
         
-        $this->application = new Application('Overwatch', '0.0.1-test.' . time());
+        $this->application = new Application('Overwatch', '0.0.1-test.'.time());
         $this->application->add($command);
 
         $this->command = new CommandTester($command);
@@ -69,13 +69,13 @@ 
         $this->assertCountLinesOfOutput(5);
         
         $this->assertHasStandardOutput();
-        $this->assertStringStartsWith(' > ' . TestFixtures::$tests['test-1'] . ' : PASSED - Pinged in ', $this->output[1]);
+        $this->assertStringStartsWith(' > '.TestFixtures::$tests['test-1'].' : PASSED - Pinged in ', $this->output[1]);
         $this->assertRegExp('/0\.[0-9]+s$/', $this->output[1]);
         
-        $this->assertStringStartsWith(' > ' . TestFixtures::$tests['test-2'] . ' : PASSED - Pinged in ', $this->output[2]);
+        $this->assertStringStartsWith(' > '.TestFixtures::$tests['test-2'].' : PASSED - Pinged in ', $this->output[2]);
         $this->assertRegExp('/0\.[0-9]+s$/', $this->output[2]);
         
-        $this->assertStringStartsWith(' > ' . TestFixtures::$tests['test-3'] . ' : PASSED - Pinged in ', $this->output[3]);
+        $this->assertStringStartsWith(' > '.TestFixtures::$tests['test-3'].' : PASSED - Pinged in ', $this->output[3]);
         $this->assertRegExp('/0\.[0-9]+s$/', $this->output[3]);
         
         $this->assertCountRunTests();
@@ -149,10 +149,10 @@ 
         
         $this->assertHasStandardOutput();
         
-        $this->assertStringStartsWith(' > ' . TestFixtures::$tests['test-2'] . ' : UNSATISFACTORY - ', $this->output[1]);
+        $this->assertStringStartsWith(' > '.TestFixtures::$tests['test-2'].' : UNSATISFACTORY - ', $this->output[1]);
         $this->assertRegExp('/responded in 1\.[0-9]+ s, above the unsatisfactory threshold \(1 s\)$/', $this->output[1]);
         
-        $this->assertStringStartsWith(' > ' . TestFixtures::$tests['test-3'] . ' : FAILED - ', $this->output[2]);
+        $this->assertStringStartsWith(' > '.TestFixtures::$tests['test-3'].' : FAILED - ', $this->output[2]);
         $this->assertStringEndsWith('failed to respond in the timeout threshold (2 s)', $this->output[2]);
         
         
@@ -175,13 +175,13 @@ 
         
         $this->assertHasStandardOutput();
         
-        $this->assertStringStartsWith(' > ' . TestFixtures::$tests['test-1'] . ' : PASSED - Pinged in ', $this->output[1]);
+        $this->assertStringStartsWith(' > '.TestFixtures::$tests['test-1'].' : PASSED - Pinged in ', $this->output[1]);
         $this->assertRegExp('/0\.[0-9]+s$/', $this->output[1]);
         
-        $this->assertStringStartsWith(' > ' . TestFixtures::$tests['test-2'] . ' : UNSATISFACTORY - ', $this->output[2]);
+        $this->assertStringStartsWith(' > '.TestFixtures::$tests['test-2'].' : UNSATISFACTORY - ', $this->output[2]);
         $this->assertRegExp('/responded in 1\.[0-9]+ s, above the unsatisfactory threshold \(1 s\)$/', $this->output[2]);
         
-        $this->assertStringStartsWith(' > ' . TestFixtures::$tests['test-3'] . ' : FAILED - ', $this->output[3]);
+        $this->assertStringStartsWith(' > '.TestFixtures::$tests['test-3'].' : FAILED - ', $this->output[3]);
         $this->assertStringEndsWith('failed to respond in the timeout threshold (2 s)', $this->output[3]);
         
         

src/TestBundle/Command/TestsRunCommand.php

Spacing +8 added lines, -8 removed lines

@@ -70,7 +70,7 @@ 
             throw new \InvalidArgumentException('Could not find any tests to run.');
         }
         
-        $output->writeln($this->getApplication()->getLongVersion() . ', running <info>' . count($tests) . '</info> tests');
+        $output->writeln($this->getApplication()->getLongVersion().', running <info>'.count($tests).'</info> tests');
         
         foreach ($tests as $test) {
             $result = $this->expectations->run($test);
@@ -79,9 +79,9 @@ 
             //Don't output if we're not running verbosely and the test passes.
             if ($result->getStatus() !== ResultStatus::PASSED || $output->isVerbose()) {
                 $output->writeln(
-                    ' > ' . $test->getName() . ' : ' .
-                    $this->getColouredStatus($result->getStatus()) .
-                    ' - ' . $result->getInfo()
+                    ' > '.$test->getName().' : '.
+                    $this->getColouredStatus($result->getStatus()).
+                    ' - '.$result->getInfo()
                 );
             }
             $this->_em->persist($result);
@@ -104,11 +104,11 @@ 
         if ($value === null) {
             $value = $status;
         } else {
-            $value .= ' ' . $status;
+            $value .= ' '.$status;
         }
         
         ResultStatus::isValid($status);
-        return '<' . $this->colours[$status] . '>' . $value . '</' . $this->colours[$status] . '>';
+        return '<'.$this->colours[$status].'>'.$value.'</'.$this->colours[$status].'>';
     }
     
     /**
@@ -121,10 +121,10 @@ 
         $summary = '';
         
         foreach (ResultStatus::getAll() as $status) {
-            $summary .= $this->getColouredStatus($status, $this->results[$status]) . ', ';
+            $summary .= $this->getColouredStatus($status, $this->results[$status]).', ';
         }
         
-        $summary .= 'in ' . $runTime->i . ' minutes and ' . $runTime->s . ' seconds';
+        $summary .= 'in '.$runTime->i.' minutes and '.$runTime->s.' seconds';
         return $summary;
     }
 }

src/UserBundle/Controller/AppController.php

Spacing +1 added lines, -1 removed lines

@@ -38,6 +38,6 @@
         $this->getUser()->resetApiKey();
         $this->_em->flush();
         
-        return $this->redirect($this->generateUrl('overwatch_user_app_index') . '#/my-account');
+        return $this->redirect($this->generateUrl('overwatch_user_app_index').'#/my-account');
     }
 }

src/UserBundle/Security/ApiAuthenticator.php

Spacing +1 added lines, -1 removed lines

@@ -82,7 +82,7 @@
         
         $apiToken = hash_hmac(
             'sha256',
-            'timestamp=' . $credentials[self::TIMESTAMP],
+            'timestamp='.$credentials[self::TIMESTAMP],
             $user->getApiKey()
         );
         

src/UserBundle/Tests/Controller/ApiControllerTest.php

Spacing +12 added lines, -12 removed lines

@@ -20,7 +20,7 @@ 
         $this->loginAs(UserFixtures::$users['user-1'], 'overwatchApi');
         $this->client = $this->makeClient(); //When using loginAs, we must re-create the client
         $this->client->enableProfiler();
-        $this->client->request('POST', '/api/users/' . $email);
+        $this->client->request('POST', '/api/users/'.$email);
         
         $this->assertJsonResponse($this->client->getResponse());
         
@@ -65,7 +65,7 @@ 
     public function testFindUser()
     {
         $this->logIn('ROLE_SUPER_ADMIN');
-        $this->client->request('GET', '/api/users/' . UserFixtures::$users['user-1']);
+        $this->client->request('GET', '/api/users/'.UserFixtures::$users['user-1']);
         
         $this->assertJsonResponse($this->client->getResponse());
         $this->assertJsonStringEqualsJsonString(
@@ -80,7 +80,7 @@ 
     public function testFindUserInsufficentPerms()
     {
         $this->logIn('ROLE_ADMIN');
-        $this->client->request('GET', '/api/users/' . UserFixtures::$users['user-1']);
+        $this->client->request('GET', '/api/users/'.UserFixtures::$users['user-1']);
         
         $this->assertForbidden($this->client->getResponse());
     }
@@ -151,7 +151,7 @@ 
     {
         $this->loginAs(UserFixtures::$users['user-1'], 'overwatchApi');
         $this->client = $this->makeClient(); //When using loginAs, we must re-create the client
-        $this->client->request('POST', '/api/users/' . UserFixtures::$users['user-2']->getId() . '/lock');
+        $this->client->request('POST', '/api/users/'.UserFixtures::$users['user-2']->getId().'/lock');
         
         $user = $this->em->find('Overwatch\UserBundle\Entity\User', UserFixtures::$users['user-2']->getId());
         $this->assertTrue($user->isLocked());
@@ -166,7 +166,7 @@ 
     public function testToggleLockUserInsufficentPerms()
     {
         $this->logIn('ROLE_ADMIN');
-        $this->client->request('POST', '/api/users/' . UserFixtures::$users['user-1']->getId() . '/lock');
+        $this->client->request('POST', '/api/users/'.UserFixtures::$users['user-1']->getId().'/lock');
         
         $this->assertForbidden($this->client->getResponse());
     }
@@ -175,7 +175,7 @@ 
     {
         $this->loginAs(UserFixtures::$users['user-1'], 'overwatchApi');
         $this->client = $this->makeClient(); //When using loginAs, we must re-create the client
-        $this->client->request('POST', '/api/users/' . UserFixtures::$users['user-1']->getId() . '/lock');
+        $this->client->request('POST', '/api/users/'.UserFixtures::$users['user-1']->getId().'/lock');
         
         $this->assertForbidden($this->client->getResponse());
     }
@@ -184,7 +184,7 @@ 
     {
         $this->loginAs(UserFixtures::$users['user-1'], 'overwatchApi');
         $this->client = $this->makeClient(); //When using loginAs, we must re-create the client
-        $this->client->request('POST', '/api/users/' . UserFixtures::$users['user-2']->getId() . '/role/ROLE_ADMIN');
+        $this->client->request('POST', '/api/users/'.UserFixtures::$users['user-2']->getId().'/role/ROLE_ADMIN');
         
         $user = $this->em->find('Overwatch\UserBundle\Entity\User', UserFixtures::$users['user-2']->getId());
         $this->assertTrue($user->hasRole('ROLE_ADMIN'));
@@ -199,7 +199,7 @@ 
     public function testSetUserRoleInsufficentPerms()
     {
         $this->logIn('ROLE_ADMIN');
-        $this->client->request('POST', '/api/users/' . UserFixtures::$users['user-1']->getId() . '/role/ROLE_USER');
+        $this->client->request('POST', '/api/users/'.UserFixtures::$users['user-1']->getId().'/role/ROLE_USER');
         
         $this->assertForbidden($this->client->getResponse());
     }
@@ -208,7 +208,7 @@ 
     {
         $this->loginAs(UserFixtures::$users['user-1'], 'overwatchApi');
         $this->client = $this->makeClient(); //When using loginAs, we must re-create the client
-        $this->client->request('POST', '/api/users/' . UserFixtures::$users['user-1']->getId() . '/role/ROLE_USER');
+        $this->client->request('POST', '/api/users/'.UserFixtures::$users['user-1']->getId().'/role/ROLE_USER');
         
         $this->assertForbidden($this->client->getResponse());
     }
@@ -217,7 +217,7 @@ 
     {
         $this->loginAs(UserFixtures::$users['user-1'], 'overwatchApi');
         $this->client = $this->makeClient(); //When using loginAs, we must re-create the client
-        $this->client->request('DELETE', '/api/users/' . UserFixtures::$users['user-2']->getId());
+        $this->client->request('DELETE', '/api/users/'.UserFixtures::$users['user-2']->getId());
         
         $user = $this->em->find('Overwatch\UserBundle\Entity\User', UserFixtures::$users['user-2']->getId());
         $this->assertNull($user);
@@ -228,7 +228,7 @@ 
     public function testDeleteUserInsufficentPerms()
     {
         $this->logIn('ROLE_ADMIN');
-        $this->client->request('DELETE', '/api/users/' . UserFixtures::$users['user-1']->getId());
+        $this->client->request('DELETE', '/api/users/'.UserFixtures::$users['user-1']->getId());
         
         $this->assertForbidden($this->client->getResponse());
     }
@@ -237,7 +237,7 @@ 
     {
         $this->loginAs(UserFixtures::$users['user-1'], 'overwatchApi');
         $this->client = $this->makeClient(); //When using loginAs, we must re-create the client
-        $this->client->request('DELETE', '/api/users/' . UserFixtures::$users['user-1']->getId());
+        $this->client->request('DELETE', '/api/users/'.UserFixtures::$users['user-1']->getId());
         
         $this->assertForbidden($this->client->getResponse());
     }