Inspection of "Finish 4.10.0" - Schlaefer/Saito - Measure and Improve Code Quality continuously with Scrutinizer

Completed

Branch — master (e5db64)

by Schlaefer

created 2019-05-10 05:32 UTC

Spacing +1 added lines, -1 removed lines patch added patch discarded remove patch

@@ -58,7 +58,7 @@
 block discarded – undo
 				throw new BadRequestException('User id is missing.');
 			}
 			$_userId = $this->request->data['id'];
-			if ((int)$_userId !== $this->CurrentUser->getId()) {
+			if ((int) $_userId !== $this->CurrentUser->getId()) {
 				throw new ForbiddenException(sprintf(
 					'Not allowed to logout user with id `%s`.',
 					$_userId

Please login to merge, or discard this patch.

app/Plugin/Api/Controller/ApiEntriesController.php 1 patch

Spacing +3 added lines, -3 removed lines patch added patch discarded remove patch

@@ -19,12 +19,12 @@  discard block
 block discarded – undo
 			}
 			$order = [
 				'Entry.fixed' => 'DESC',
-				'Entry.' . $order => 'DESC'
+				'Entry.'.$order => 'DESC'
 			];
 
 			$limit = 10;
 			if (isset($this->request->query['limit'])) {
-				$limitQuery = (int)$this->request->query['limit'];
+				$limitQuery = (int) $this->request->query['limit'];
 				if ($limitQuery > 0 && $limitQuery < 100) {
 					$limit = $limitQuery;
 				}
@@ -32,7 +32,7 @@  discard block
 block discarded – undo
 
 			$offset = 0;
 			if (isset($this->request->query['offset'])) {
-				$offset = (int)$this->request->query['offset'];
+				$offset = (int) $this->request->query['offset'];
 			}
 
 			$conditions = [

Please login to merge, or discard this patch.

app/Plugin/Api/Test/Case/Controller/ApiAppControllerTest.php 1 patch

Spacing +4 added lines, -4 removed lines patch added patch discarded remove patch

@@ -33,13 +33,13 @@  discard block
 block discarded – undo
 		public function testApiDisabled() {
 			Configure::write('Saito.Settings.api_enabled', '0');
 			$this->setExpectedException('Saito\Api\ApiDisabledException');
-			$this->testAction($this->_apiRoot . 'bootstrap.json');
+			$this->testAction($this->_apiRoot.'bootstrap.json');
 		}
 
 		public function testApiEnabled() {
 			Configure::write('Saito.Settings.api_enabled', '1');
 			$this->setExpectedException('Saito\Api\UnknownRouteException');
-			$this->testAction($this->_apiRoot . 'foobar');
+			$this->testAction($this->_apiRoot.'foobar');
 		}
 
 		public function testApiAllowOriginHeader() {
@@ -47,7 +47,7 @@  discard block
 block discarded – undo
 			Configure::write('Saito.Settings.api_crossdomain', $expected);
 			$Controller = $this->generate('ApiCore');
 			$this->testAction(
-				$this->_apiRoot . 'bootstrap.json',
+				$this->_apiRoot.'bootstrap.json',
 				[
 					'method' => 'GET',
 					'return' => 'contents'
@@ -61,7 +61,7 @@  discard block
 block discarded – undo
 			Configure::write('Saito.Settings.api_crossdomain', '');
 			$Controller = $this->generate('ApiCore');
 			$this->testAction(
-				$this->_apiRoot . 'bootstrap.json',
+				$this->_apiRoot.'bootstrap.json',
 				[
 					'method' => 'GET',
 					'return' => 'contents'

Please login to merge, or discard this patch.

app/Plugin/Api/Test/Case/Controller/ApiUsersControllerTest.php 1 patch

Spacing +13 added lines, -13 removed lines patch added patch discarded remove patch

@@ -35,7 +35,7 @@  discard block
 block discarded – undo
 				'BadRequestException',
 				'Field `username` is missing.'
 			);
-			$this->testAction($this->_apiRoot . 'login', ['method' => 'POST']);
+			$this->testAction($this->_apiRoot.'login', ['method' => 'POST']);
 		}
 
 		public function testLoginNoPassword() {
@@ -47,7 +47,7 @@  discard block
 block discarded – undo
 				'username' => 'Jane'
 			];
 			$this->testAction(
-				$this->_apiRoot . 'login',
+				$this->_apiRoot.'login',
 				['data' => $data, 'method' => 'POST']
 			);
 		}
@@ -72,7 +72,7 @@  discard block
 block discarded – undo
 			');
 
 			$result = $this->testAction(
-				$this->_apiRoot . 'login.json',
+				$this->_apiRoot.'login.json',
 				['method' => 'POST', 'data' => $data, 'return' => 'contents']
 			);
 			$this->assertEqual(json_decode($result), $expected);
@@ -106,7 +106,7 @@  discard block
 block discarded – undo
 					->will($this->returnValue(false));
 			$this->setExpectedException('UnauthorizedException');
 			$this->testAction(
-				$this->_apiRoot . 'login',
+				$this->_apiRoot.'login',
 				['method' => 'POST', 'data' => $data]
 			);
 		}
@@ -114,17 +114,17 @@  discard block
 block discarded – undo
 		public function testLoginDisallowedRequestType() {
 			$this->_checkDisallowedRequestType(
 				['GET', 'PUT', 'DELETE'],
-					$this->_apiRoot . 'login'
+					$this->_apiRoot.'login'
 			);
 		}
 
 		public function testMarkAsReadMissingUserId() {
 			$this->generate('Api.ApiUsers');
 			$this->_loginUser(3);
-			$data = [ ];
+			$data = [];
 			$this->setExpectedException('InvalidArgumentException', 'User id is missing.');
 			$this->testAction(
-				$this->_apiRoot . 'markasread',
+				$this->_apiRoot.'markasread',
 				['method' => 'POST', 'data' => $data]
 			);
 		}
@@ -137,7 +137,7 @@  discard block
 block discarded – undo
 			];
 			$this->setExpectedException('ForbiddenException', 'You are not authorized for user id `1`.');
 			$this->testAction(
-				$this->_apiRoot . 'markasread',
+				$this->_apiRoot.'markasread',
 				['method' => 'POST', 'data' => $data]
 			);
 		}
@@ -176,7 +176,7 @@  discard block
 block discarded – undo
 			];
 
 			$result = $this->testAction(
-				$this->_apiRoot . 'markasread.json',
+				$this->_apiRoot.'markasread.json',
 				['method' => 'POST', 'data' => $data, 'return' => 'contents']
 			);
 			$result = json_decode($result, true);
@@ -218,7 +218,7 @@  discard block
 block discarded – undo
 			];
 
 			$result = $this->testAction(
-				$this->_apiRoot . 'markasread.json',
+				$this->_apiRoot.'markasread.json',
 				['method' => 'POST', 'data' => $data, 'return' => 'contents']
 			);
 			$result = json_decode($result, true);
@@ -243,7 +243,7 @@  discard block
 block discarded – undo
 			];
 
 			$result = $this->testAction(
-				$this->_apiRoot . 'markasread.json',
+				$this->_apiRoot.'markasread.json',
 				['method' => 'POST', 'data' => $data, 'return' => 'contents']
 			);
 			$result = json_decode($result, true);
@@ -255,14 +255,14 @@  discard block
 block discarded – undo
 
 		public function testMarkAsReadOnlyAuthenticatedUsers() {
 			$this->generate('ApiUsers', ['methods' => 'markasread']);
-			$this->testAction($this->_apiRoot . 'markasread.json', ['method' => 'POST']);
+			$this->testAction($this->_apiRoot.'markasread.json', ['method' => 'POST']);
 			$this->assertRedirectedTo('login');
 		}
 
 		public function testMarkAsReadDisallowedRequestType() {
 			$this->_checkDisallowedRequestType(
 				['GET', 'PUT', 'DELETE'],
-					$this->_apiRoot . 'markasread'
+					$this->_apiRoot.'markasread'
 			);
 		}
 

Please login to merge, or discard this patch.

app/Plugin/Api/Test/Case/Controller/ApiCoreControllerTest.php 1 patch

Spacing +2 added lines, -2 removed lines patch added patch discarded remove patch

@@ -63,7 +63,7 @@  discard block
 block discarded – undo
 			$expected = json_decode($_json, true);
 
 			$result = $this->testAction(
-				$this->_apiRoot . 'bootstrap.json',
+				$this->_apiRoot.'bootstrap.json',
 				[
 					'method' => 'GET',
 					'return' => 'contents'
@@ -123,7 +123,7 @@  discard block
 block discarded – undo
 			$this->generate('ApiCore');
 			$this->_loginUser(3);
 			$result = $this->testAction(
-				$this->_apiRoot . 'bootstrap.json',
+				$this->_apiRoot.'bootstrap.json',
 				[
 					'method' => 'GET',
 					'return' => 'contents'

Please login to merge, or discard this patch.

app/Plugin/Api/Test/Case/Controller/ApiShoutsControllerTest.php 1 patch

Spacing +6 added lines, -6 removed lines patch added patch discarded remove patch

@@ -65,7 +65,7 @@  discard block
 block discarded – undo
 		public function testShoutsDisallowedRequestTypes() {
 			$this->_checkDisallowedRequestType(
 				['PUT', 'DELETE'],
-					$this->_apiRoot . 'shouts'
+					$this->_apiRoot.'shouts'
 			);
 		}
 
@@ -74,7 +74,7 @@  discard block
 block discarded – undo
 			$this->_loginUser(3);
 
 			$expected = $this->_fixtureResult;
-			$result = $this->testAction($this->_apiRoot . 'shouts.json',
+			$result = $this->testAction($this->_apiRoot.'shouts.json',
 				[
 					'method' => 'GET',
 					'return' => 'contents'
@@ -86,7 +86,7 @@  discard block
 block discarded – undo
 		public function testShoutsGetNotLoggedIn() {
 			$this->generate('Api.ApiShouts');
 			$this->setExpectedException('Saito\Api\ApiAuthException');
-			$this->testAction($this->_apiRoot . 'shouts.json', ['method' => 'GET']);
+			$this->testAction($this->_apiRoot.'shouts.json', ['method' => 'GET']);
 		}
 
 		public function testShoutsPost() {
@@ -96,7 +96,7 @@  discard block
 block discarded – undo
 			$data = [
 				'text' => 'test < shout'
 			];
-			$result = $this->testAction($this->_apiRoot . 'shouts.json',
+			$result = $this->testAction($this->_apiRoot.'shouts.json',
 				[
 					'method' => 'POST',
 					'data' => $data,
@@ -127,13 +127,13 @@  discard block
 block discarded – undo
 			$this->_loginUser(3);
 
 			$this->setExpectedException('BadRequestException', 'Missing text.');
-			$this->testAction($this->_apiRoot . 'shouts.json', ['method' => 'POST']);
+			$this->testAction($this->_apiRoot.'shouts.json', ['method' => 'POST']);
 		}
 
 		public function testShoutsPostNotLoggedIn() {
 			$this->generate('Api.ApiShouts');
 			$this->setExpectedException('Saito\Api\ApiAuthException');
-			$this->testAction($this->_apiRoot . 'shouts.json', ['method' => 'POST']);
+			$this->testAction($this->_apiRoot.'shouts.json', ['method' => 'POST']);
 		}
 
 	}

Please login to merge, or discard this patch.

app/Plugin/Api/Test/Case/Controller/ApiEntriesControllerTest.php 1 patch

Spacing +24 added lines, -24 removed lines patch added patch discarded remove patch

@@ -44,7 +44,7 @@  discard block
 block discarded – undo
 
 			$data = ['limit' => 2, 'offset' => 1, 'order' => 'answer'];
 			$result = $this->testAction(
-				$this->_apiRoot . 'threads.json',
+				$this->_apiRoot.'threads.json',
 				['return' => 'contents', 'method' => 'GET', 'data' => $data]
 			);
 			$expected = json_decode('
@@ -83,7 +83,7 @@  discard block
 block discarded – undo
 		public function testThreadsNoAdminAnon() {
 			$data = ['limit' => 3];
 			$result = $this->testAction(
-				$this->_apiRoot . 'threads.json',
+				$this->_apiRoot.'threads.json',
 				['return' => 'contents', 'method' => 'GET', 'data' => $data]
 			);
 			$result = json_decode($result, true);
@@ -100,7 +100,7 @@  discard block
 block discarded – undo
 			$this->_loginUser(3);
 			$data = ['limit' => 2, 'offset' => 1, 'order' => 'answer'];
 			$result = $this->testAction(
-				$this->_apiRoot . 'threads.json',
+				$this->_apiRoot.'threads.json',
 				['return' => 'contents', 'method' => 'GET', 'data' => $data]
 			);
 			$result = json_decode($result, true);
@@ -111,7 +111,7 @@  discard block
 block discarded – undo
 		public function testThreadsDisallowedRequestTypes() {
 			$this->_checkDisallowedRequestType(
 				['POST', 'PUT', 'DELETE'],
-					$this->_apiRoot . 'threads'
+					$this->_apiRoot.'threads'
 			);
 		}
 
@@ -121,7 +121,7 @@  discard block
 block discarded – undo
 			$this->setExpectedException('Saito\Api\ApiValidationError',
 				'Subject must not be empty.');
 			$this->testAction(
-				$this->_apiRoot . 'entries.json',
+				$this->_apiRoot.'entries.json',
 				[
 					'method' => 'POST',
 					'data' => [
@@ -137,7 +137,7 @@  discard block
 block discarded – undo
 			$this->generate('Api.ApiEntries');
 			$this->_loginUser(3);
 			$result = $this->testAction(
-				$this->_apiRoot . 'entries.json',
+				$this->_apiRoot.'entries.json',
 				[
 					'return' => 'view',
 					'method' => 'POST',
@@ -154,18 +154,18 @@  discard block
 block discarded – undo
 
 		public function testEntriesItemPutOnlyAuthenticatedUsers() {
 			$this->generate('ApiEntries', ['methods' => 'entriesItemPut']);
-			$this->testAction($this->_apiRoot . 'entries/1', ['method' => 'PUT']);
+			$this->testAction($this->_apiRoot.'entries/1', ['method' => 'PUT']);
 			$this->assertRedirectedTo('login');
 		}
 
 		public function testEntriesItemEntryIdMustBeProvided() {
 			$this->setExpectedException('BadRequestException', 'Missing entry id.');
-			$this->testAction($this->_apiRoot . 'entries/', ['method' => 'PUT']);
+			$this->testAction($this->_apiRoot.'entries/', ['method' => 'PUT']);
 		}
 
 		public function testEntriesItemPutEntryMustExist() {
 			$this->setExpectedException('NotFoundException', 'Entry with id `999` not found.');
-			$this->testAction($this->_apiRoot . 'entries/999', ['method' => 'PUT']);
+			$this->testAction($this->_apiRoot.'entries/999', ['method' => 'PUT']);
 		}
 
 		public function testEntriesItemPutForbiddenTime() {
@@ -173,7 +173,7 @@  discard block
 block discarded – undo
 			$this->_loginUser(3);
 			$this->setExpectedException('ForbiddenException', 'The editing time ran out.');
 			$this->testAction(
-				$this->_apiRoot . 'entries/1',
+				$this->_apiRoot.'entries/1',
 				[
 					'method' => 'PUT',
 					'data' => [
@@ -191,7 +191,7 @@  discard block
 block discarded – undo
 			$id = 2;
 			$ApiEntries->Entry->save(['id' => $id, 'time' => bdate()]);
 			$this->testAction(
-				$this->_apiRoot . 'entries/' . $id,
+				$this->_apiRoot.'entries/'.$id,
 				[
 					'method' => 'PUT',
 					'data' => [
@@ -223,7 +223,7 @@  discard block
 block discarded – undo
 			$this->_loginUser(3);
 			$this->setExpectedException('ForbiddenException', 'Editing is forbidden for unknown reason.');
 			$this->testAction(
-				$this->_apiRoot . 'entries/1',
+				$this->_apiRoot.'entries/1',
 				[
 					'method' => 'PUT',
 					'data' => [
@@ -239,7 +239,7 @@  discard block
 block discarded – undo
 			$this->_loginUser(1);
 			$id = 1;
 			$result = $this->testAction(
-				$this->_apiRoot . 'entries/' . $id . '.json',
+				$this->_apiRoot.'entries/'.$id.'.json',
 				[
 					'method' => 'PUT',
 					'data' => [
@@ -292,7 +292,7 @@  discard block
 block discarded – undo
 				->method('update')
 				->will($this->returnValue(false));
 			$this->testAction(
-				$this->_apiRoot . 'entries/' . $id,
+				$this->_apiRoot.'entries/'.$id,
 				[
 					'method' => 'PUT',
 					'data' => [
@@ -306,20 +306,20 @@  discard block
 block discarded – undo
 		public function testEntriesItemDisallowedRequestTypes() {
 			$this->_checkDisallowedRequestType(
 				['GET', 'POST', 'DELETE'],
-					$this->_apiRoot . 'entries/1'
+					$this->_apiRoot.'entries/1'
 			);
 		}
 
 		public function testThreadsItemGetThreadNotFound() {
 			$this->setExpectedException('NotFoundException', 'Thread with id `2` not found.');
-			$this->testAction($this->_apiRoot . 'threads/2.json', ['method' => 'GET']);
+			$this->testAction($this->_apiRoot.'threads/2.json', ['method' => 'GET']);
 		}
 
 		public function testThreadsItemGet() {
 			$this->generate('ApiEntries');
 			$this->_loginUser(3);
 			$result = $this->testAction(
-				$this->_apiRoot . 'threads/1.json',
+				$this->_apiRoot.'threads/1.json',
 				['method' => 'GET', 'return' => 'contents']
 			);
 			$json = <<< EOF
@@ -353,7 +353,7 @@  discard block
 block discarded – undo
 
 		public function testThreadsItemGetNotLoggedIn() {
 			$result = $this->testAction(
-				$this->_apiRoot . 'threads/10.json',
+				$this->_apiRoot.'threads/10.json',
 				['method' => 'GET', 'return' => 'contents']
 			);
 			$result = json_decode($result, true);
@@ -369,7 +369,7 @@  discard block
 block discarded – undo
 		public function testThreadsItemGetNotLoggedInCategory() {
 			$this->setExpectedException('NotFoundException', 'Thread with id `4` not found.');
 			$this->testAction(
-				$this->_apiRoot . 'threads/4.json',
+				$this->_apiRoot.'threads/4.json',
 				['method' => 'GET', 'return' => 'contents']
 			);
 		}
@@ -381,7 +381,7 @@  discard block
 block discarded – undo
 			$this->generate('ApiEntries');
 			$this->_loginUser(3);
 			$result = $this->testAction(
-				$this->_apiRoot . 'threads/4.json',
+				$this->_apiRoot.'threads/4.json',
 				['method' => 'GET', 'return' => 'contents']
 			);
 			$result = json_decode($result, true);
@@ -394,7 +394,7 @@  discard block
 block discarded – undo
 		public function testThreadsItemGetNotAdminAnonCategory() {
 			$this->setExpectedException('NotFoundException', 'Thread with id `6` not found.');
 			$this->testAction(
-				$this->_apiRoot . 'threads/6.json',
+				$this->_apiRoot.'threads/6.json',
 				['method' => 'GET', 'return' => 'contents']
 			);
 		}
@@ -408,7 +408,7 @@  discard block
 block discarded – undo
 
 			$this->setExpectedException('NotFoundException', 'Thread with id `6` not found.');
 			$this->testAction(
-				$this->_apiRoot . 'threads/6.json',
+				$this->_apiRoot.'threads/6.json',
 				['method' => 'GET', 'return' => 'contents']
 			);
 		}
@@ -420,7 +420,7 @@  discard block
 block discarded – undo
 			$this->generate('ApiEntries');
 			$this->_loginUser(1);
 			$result = $this->testAction(
-				$this->_apiRoot . 'threads/6.json',
+				$this->_apiRoot.'threads/6.json',
 				['method' => 'GET', 'return' => 'contents']
 			);
 			$result = json_decode($result, true);
@@ -430,7 +430,7 @@  discard block
 block discarded – undo
 		public function testThreadsItemDisallowedRequestTypes() {
 			$this->_checkDisallowedRequestType(
 				['PUT', 'POST', 'DELETE'],
-					$this->_apiRoot . 'threads/1'
+					$this->_apiRoot.'threads/1'
 			);
 		}
 

Please login to merge, or discard this patch.

app/Plugin/Api/Test/Case/AllApiTest.php 1 patch

Spacing +2 added lines, -2 removed lines patch added patch discarded remove patch

@@ -3,9 +3,9 @@
 block discarded – undo
 	class AllApiTest extends CakeTestSuite {
 
 		public static function suite() {
-			$testPath = CakePlugin::path('Api') . 'Test' . DS;
+			$testPath = CakePlugin::path('Api').'Test'.DS;
 			$suite = new CakeTestSuite('All Api tests.');
-			$suite->addTestDirectoryRecursive($testPath . 'Case' . DS . 'Controller');
+			$suite->addTestDirectoryRecursive($testPath.'Case'.DS.'Controller');
 			return $suite;
 		}
 

Please login to merge, or discard this patch.

app/Plugin/Api/Config/bootstrap.php 1 patch

Spacing +2 added lines, -2 removed lines patch added patch discarded remove patch

@@ -1,8 +1,8 @@
 block discarded – undo
 <?php
 
-	include CakePlugin::path('Api') . 'Lib' . DS . 'exceptions.php';
+	include CakePlugin::path('Api').'Lib'.DS.'exceptions.php';
 
-	$getUri = function () {
+	$getUri = function() {
 		if (!empty($_SERVER['PATH_INFO'])) {
 			$uri = $_SERVER['PATH_INFO'];
 		} elseif (isset($_SERVER['REQUEST_URI'])) {

Please login to merge, or discard this patch.

		@@ -58,7 +58,7 @@
		block discarded – undo
58	58	throw new BadRequestException('User id is missing.');
59	59	}
60	60	$_userId = $this->request->data['id'];
61		- if ((int)$_userId !== $this->CurrentUser->getId()) {
	61	+ if ((int) $_userId !== $this->CurrentUser->getId()) {
62	62	throw new ForbiddenException(sprintf(
63	63	'Not allowed to logout user with id `%s`.',
64	64	$_userId

		@@ -19,12 +19,12 @@ discard block
		block discarded – undo
19	19	}
20	20	$order = [
21	21	'Entry.fixed' => 'DESC',
22		- 'Entry.' . $order => 'DESC'
	22	+ 'Entry.'.$order => 'DESC'
23	23	];
24	24
25	25	$limit = 10;
26	26	if (isset($this->request->query['limit'])) {
27		- $limitQuery = (int)$this->request->query['limit'];
	27	+ $limitQuery = (int) $this->request->query['limit'];
28	28	if ($limitQuery > 0 && $limitQuery < 100) {
29	29	$limit = $limitQuery;
30	30	}
		@@ -32,7 +32,7 @@ discard block
		block discarded – undo
32	32
33	33	$offset = 0;
34	34	if (isset($this->request->query['offset'])) {
35		- $offset = (int)$this->request->query['offset'];
	35	+ $offset = (int) $this->request->query['offset'];
36	36	}
37	37
38	38	$conditions = [

		@@ -33,13 +33,13 @@ discard block
		block discarded – undo
33	33	public function testApiDisabled() {
34	34	Configure::write('Saito.Settings.api_enabled', '0');
35	35	$this->setExpectedException('Saito\Api\ApiDisabledException');
36		- $this->testAction($this->_apiRoot . 'bootstrap.json');
	36	+ $this->testAction($this->_apiRoot.'bootstrap.json');
37	37	}
38	38
39	39	public function testApiEnabled() {
40	40	Configure::write('Saito.Settings.api_enabled', '1');
41	41	$this->setExpectedException('Saito\Api\UnknownRouteException');
42		- $this->testAction($this->_apiRoot . 'foobar');
	42	+ $this->testAction($this->_apiRoot.'foobar');
43	43	}
44	44
45	45	public function testApiAllowOriginHeader() {
		@@ -47,7 +47,7 @@ discard block
		block discarded – undo
47	47	Configure::write('Saito.Settings.api_crossdomain', $expected);
48	48	$Controller = $this->generate('ApiCore');
49	49	$this->testAction(
50		- $this->_apiRoot . 'bootstrap.json',
	50	+ $this->_apiRoot.'bootstrap.json',
51	51	[
52	52	'method' => 'GET',
53	53	'return' => 'contents'
		@@ -61,7 +61,7 @@ discard block
		block discarded – undo
61	61	Configure::write('Saito.Settings.api_crossdomain', '');
62	62	$Controller = $this->generate('ApiCore');
63	63	$this->testAction(
64		- $this->_apiRoot . 'bootstrap.json',
	64	+ $this->_apiRoot.'bootstrap.json',
65	65	[
66	66	'method' => 'GET',
67	67	'return' => 'contents'

		@@ -35,7 +35,7 @@ discard block
		block discarded – undo
35	35	'BadRequestException',
36	36	'Field `username` is missing.'
37	37	);
38		- $this->testAction($this->_apiRoot . 'login', ['method' => 'POST']);
	38	+ $this->testAction($this->_apiRoot.'login', ['method' => 'POST']);
39	39	}
40	40
41	41	public function testLoginNoPassword() {
		@@ -47,7 +47,7 @@ discard block
		block discarded – undo
47	47	'username' => 'Jane'
48	48	];
49	49	$this->testAction(
50		- $this->_apiRoot . 'login',
	50	+ $this->_apiRoot.'login',
51	51	['data' => $data, 'method' => 'POST']
52	52	);
53	53	}
		@@ -72,7 +72,7 @@ discard block
		block discarded – undo
72	72	');
73	73
74	74	$result = $this->testAction(
75		- $this->_apiRoot . 'login.json',
	75	+ $this->_apiRoot.'login.json',
76	76	['method' => 'POST', 'data' => $data, 'return' => 'contents']
77	77	);
78	78	$this->assertEqual(json_decode($result), $expected);
		@@ -106,7 +106,7 @@ discard block
		block discarded – undo
106	106	->will($this->returnValue(false));
107	107	$this->setExpectedException('UnauthorizedException');
108	108	$this->testAction(
109		- $this->_apiRoot . 'login',
	109	+ $this->_apiRoot.'login',
110	110	['method' => 'POST', 'data' => $data]
111	111	);
112	112	}
		@@ -114,17 +114,17 @@ discard block
		block discarded – undo
114	114	public function testLoginDisallowedRequestType() {
115	115	$this->_checkDisallowedRequestType(
116	116	['GET', 'PUT', 'DELETE'],
117		- $this->_apiRoot . 'login'
	117	+ $this->_apiRoot.'login'
118	118	);
119	119	}
120	120
121	121	public function testMarkAsReadMissingUserId() {
122	122	$this->generate('Api.ApiUsers');
123	123	$this->_loginUser(3);
124		- $data = [ ];
	124	+ $data = [];
125	125	$this->setExpectedException('InvalidArgumentException', 'User id is missing.');
126	126	$this->testAction(
127		- $this->_apiRoot . 'markasread',
	127	+ $this->_apiRoot.'markasread',
128	128	['method' => 'POST', 'data' => $data]
129	129	);
130	130	}
		@@ -137,7 +137,7 @@ discard block
		block discarded – undo
137	137	];
138	138	$this->setExpectedException('ForbiddenException', 'You are not authorized for user id `1`.');
139	139	$this->testAction(
140		- $this->_apiRoot . 'markasread',
	140	+ $this->_apiRoot.'markasread',
141	141	['method' => 'POST', 'data' => $data]
142	142	);
143	143	}
		@@ -176,7 +176,7 @@ discard block
		block discarded – undo
176	176	];
177	177
178	178	$result = $this->testAction(
179		- $this->_apiRoot . 'markasread.json',
	179	+ $this->_apiRoot.'markasread.json',
180	180	['method' => 'POST', 'data' => $data, 'return' => 'contents']
181	181	);
182	182	$result = json_decode($result, true);
		@@ -218,7 +218,7 @@ discard block
		block discarded – undo
218	218	];
219	219
220	220	$result = $this->testAction(
221		- $this->_apiRoot . 'markasread.json',
	221	+ $this->_apiRoot.'markasread.json',
222	222	['method' => 'POST', 'data' => $data, 'return' => 'contents']
223	223	);
224	224	$result = json_decode($result, true);
		@@ -243,7 +243,7 @@ discard block
		block discarded – undo
243	243	];
244	244
245	245	$result = $this->testAction(
246		- $this->_apiRoot . 'markasread.json',
	246	+ $this->_apiRoot.'markasread.json',
247	247	['method' => 'POST', 'data' => $data, 'return' => 'contents']
248	248	);
249	249	$result = json_decode($result, true);
		@@ -255,14 +255,14 @@ discard block
		block discarded – undo
255	255
256	256	public function testMarkAsReadOnlyAuthenticatedUsers() {
257	257	$this->generate('ApiUsers', ['methods' => 'markasread']);
258		- $this->testAction($this->_apiRoot . 'markasread.json', ['method' => 'POST']);
	258	+ $this->testAction($this->_apiRoot.'markasread.json', ['method' => 'POST']);
259	259	$this->assertRedirectedTo('login');
260	260	}
261	261
262	262	public function testMarkAsReadDisallowedRequestType() {
263	263	$this->_checkDisallowedRequestType(
264	264	['GET', 'PUT', 'DELETE'],
265		- $this->_apiRoot . 'markasread'
	265	+ $this->_apiRoot.'markasread'
266	266	);
267	267	}
268	268

		@@ -63,7 +63,7 @@ discard block
		block discarded – undo
63	63	$expected = json_decode($_json, true);
64	64
65	65	$result = $this->testAction(
66		- $this->_apiRoot . 'bootstrap.json',
	66	+ $this->_apiRoot.'bootstrap.json',
67	67	[
68	68	'method' => 'GET',
69	69	'return' => 'contents'
		@@ -123,7 +123,7 @@ discard block
		block discarded – undo
123	123	$this->generate('ApiCore');
124	124	$this->_loginUser(3);
125	125	$result = $this->testAction(
126		- $this->_apiRoot . 'bootstrap.json',
	126	+ $this->_apiRoot.'bootstrap.json',
127	127	[
128	128	'method' => 'GET',
129	129	'return' => 'contents'

		@@ -65,7 +65,7 @@ discard block
		block discarded – undo
65	65	public function testShoutsDisallowedRequestTypes() {
66	66	$this->_checkDisallowedRequestType(
67	67	['PUT', 'DELETE'],
68		- $this->_apiRoot . 'shouts'
	68	+ $this->_apiRoot.'shouts'
69	69	);
70	70	}
71	71
		@@ -74,7 +74,7 @@ discard block
		block discarded – undo
74	74	$this->_loginUser(3);
75	75
76	76	$expected = $this->_fixtureResult;
77		- $result = $this->testAction($this->_apiRoot . 'shouts.json',
	77	+ $result = $this->testAction($this->_apiRoot.'shouts.json',
78	78	[
79	79	'method' => 'GET',
80	80	'return' => 'contents'
		@@ -86,7 +86,7 @@ discard block
		block discarded – undo
86	86	public function testShoutsGetNotLoggedIn() {
87	87	$this->generate('Api.ApiShouts');
88	88	$this->setExpectedException('Saito\Api\ApiAuthException');
89		- $this->testAction($this->_apiRoot . 'shouts.json', ['method' => 'GET']);
	89	+ $this->testAction($this->_apiRoot.'shouts.json', ['method' => 'GET']);
90	90	}
91	91
92	92	public function testShoutsPost() {
		@@ -96,7 +96,7 @@ discard block
		block discarded – undo
96	96	$data = [
97	97	'text' => 'test < shout'
98	98	];
99		- $result = $this->testAction($this->_apiRoot . 'shouts.json',
	99	+ $result = $this->testAction($this->_apiRoot.'shouts.json',
100	100	[
101	101	'method' => 'POST',
102	102	'data' => $data,
		@@ -127,13 +127,13 @@ discard block
		block discarded – undo
127	127	$this->_loginUser(3);
128	128
129	129	$this->setExpectedException('BadRequestException', 'Missing text.');
130		- $this->testAction($this->_apiRoot . 'shouts.json', ['method' => 'POST']);
	130	+ $this->testAction($this->_apiRoot.'shouts.json', ['method' => 'POST']);
131	131	}
132	132
133	133	public function testShoutsPostNotLoggedIn() {
134	134	$this->generate('Api.ApiShouts');
135	135	$this->setExpectedException('Saito\Api\ApiAuthException');
136		- $this->testAction($this->_apiRoot . 'shouts.json', ['method' => 'POST']);
	136	+ $this->testAction($this->_apiRoot.'shouts.json', ['method' => 'POST']);
137	137	}
138	138
139	139	}

		@@ -44,7 +44,7 @@ discard block
		block discarded – undo
44	44
45	45	$data = ['limit' => 2, 'offset' => 1, 'order' => 'answer'];
46	46	$result = $this->testAction(
47		- $this->_apiRoot . 'threads.json',
	47	+ $this->_apiRoot.'threads.json',
48	48	['return' => 'contents', 'method' => 'GET', 'data' => $data]
49	49	);
50	50	$expected = json_decode('
		@@ -83,7 +83,7 @@ discard block
		block discarded – undo
83	83	public function testThreadsNoAdminAnon() {
84	84	$data = ['limit' => 3];
85	85	$result = $this->testAction(
86		- $this->_apiRoot . 'threads.json',
	86	+ $this->_apiRoot.'threads.json',
87	87	['return' => 'contents', 'method' => 'GET', 'data' => $data]
88	88	);
89	89	$result = json_decode($result, true);
		@@ -100,7 +100,7 @@ discard block
		block discarded – undo
100	100	$this->_loginUser(3);
101	101	$data = ['limit' => 2, 'offset' => 1, 'order' => 'answer'];
102	102	$result = $this->testAction(
103		- $this->_apiRoot . 'threads.json',
	103	+ $this->_apiRoot.'threads.json',
104	104	['return' => 'contents', 'method' => 'GET', 'data' => $data]
105	105	);
106	106	$result = json_decode($result, true);
		@@ -111,7 +111,7 @@ discard block
		block discarded – undo
111	111	public function testThreadsDisallowedRequestTypes() {
112	112	$this->_checkDisallowedRequestType(
113	113	['POST', 'PUT', 'DELETE'],
114		- $this->_apiRoot . 'threads'
	114	+ $this->_apiRoot.'threads'
115	115	);
116	116	}
117	117
		@@ -121,7 +121,7 @@ discard block
		block discarded – undo
121	121	$this->setExpectedException('Saito\Api\ApiValidationError',
122	122	'Subject must not be empty.');
123	123	$this->testAction(
124		- $this->_apiRoot . 'entries.json',
	124	+ $this->_apiRoot.'entries.json',
125	125	[
126	126	'method' => 'POST',
127	127	'data' => [
		@@ -137,7 +137,7 @@ discard block
		block discarded – undo
137	137	$this->generate('Api.ApiEntries');
138	138	$this->_loginUser(3);
139	139	$result = $this->testAction(
140		- $this->_apiRoot . 'entries.json',
	140	+ $this->_apiRoot.'entries.json',
141	141	[
142	142	'return' => 'view',
143	143	'method' => 'POST',
		@@ -154,18 +154,18 @@ discard block
		block discarded – undo
154	154
155	155	public function testEntriesItemPutOnlyAuthenticatedUsers() {
156	156	$this->generate('ApiEntries', ['methods' => 'entriesItemPut']);
157		- $this->testAction($this->_apiRoot . 'entries/1', ['method' => 'PUT']);
	157	+ $this->testAction($this->_apiRoot.'entries/1', ['method' => 'PUT']);
158	158	$this->assertRedirectedTo('login');
159	159	}
160	160
161	161	public function testEntriesItemEntryIdMustBeProvided() {
162	162	$this->setExpectedException('BadRequestException', 'Missing entry id.');
163		- $this->testAction($this->_apiRoot . 'entries/', ['method' => 'PUT']);
	163	+ $this->testAction($this->_apiRoot.'entries/', ['method' => 'PUT']);
164	164	}
165	165
166	166	public function testEntriesItemPutEntryMustExist() {
167	167	$this->setExpectedException('NotFoundException', 'Entry with id `999` not found.');
168		- $this->testAction($this->_apiRoot . 'entries/999', ['method' => 'PUT']);
	168	+ $this->testAction($this->_apiRoot.'entries/999', ['method' => 'PUT']);
169	169	}
170	170
171	171	public function testEntriesItemPutForbiddenTime() {
		@@ -173,7 +173,7 @@ discard block
		block discarded – undo
173	173	$this->_loginUser(3);
174	174	$this->setExpectedException('ForbiddenException', 'The editing time ran out.');
175	175	$this->testAction(
176		- $this->_apiRoot . 'entries/1',
	176	+ $this->_apiRoot.'entries/1',
177	177	[
178	178	'method' => 'PUT',
179	179	'data' => [
		@@ -191,7 +191,7 @@ discard block
		block discarded – undo
191	191	$id = 2;
192	192	$ApiEntries->Entry->save(['id' => $id, 'time' => bdate()]);
193	193	$this->testAction(
194		- $this->_apiRoot . 'entries/' . $id,
	194	+ $this->_apiRoot.'entries/'.$id,
195	195	[
196	196	'method' => 'PUT',
197	197	'data' => [
		@@ -223,7 +223,7 @@ discard block
		block discarded – undo
223	223	$this->_loginUser(3);
224	224	$this->setExpectedException('ForbiddenException', 'Editing is forbidden for unknown reason.');
225	225	$this->testAction(
226		- $this->_apiRoot . 'entries/1',
	226	+ $this->_apiRoot.'entries/1',
227	227	[
228	228	'method' => 'PUT',
229	229	'data' => [
		@@ -239,7 +239,7 @@ discard block
		block discarded – undo
239	239	$this->_loginUser(1);
240	240	$id = 1;
241	241	$result = $this->testAction(
242		- $this->_apiRoot . 'entries/' . $id . '.json',
	242	+ $this->_apiRoot.'entries/'.$id.'.json',
243	243	[
244	244	'method' => 'PUT',
245	245	'data' => [
		@@ -292,7 +292,7 @@ discard block
		block discarded – undo
292	292	->method('update')
293	293	->will($this->returnValue(false));
294	294	$this->testAction(
295		- $this->_apiRoot . 'entries/' . $id,
	295	+ $this->_apiRoot.'entries/'.$id,
296	296	[
297	297	'method' => 'PUT',
298	298	'data' => [
		@@ -306,20 +306,20 @@ discard block
		block discarded – undo
306	306	public function testEntriesItemDisallowedRequestTypes() {
307	307	$this->_checkDisallowedRequestType(
308	308	['GET', 'POST', 'DELETE'],
309		- $this->_apiRoot . 'entries/1'
	309	+ $this->_apiRoot.'entries/1'
310	310	);
311	311	}
312	312
313	313	public function testThreadsItemGetThreadNotFound() {
314	314	$this->setExpectedException('NotFoundException', 'Thread with id `2` not found.');
315		- $this->testAction($this->_apiRoot . 'threads/2.json', ['method' => 'GET']);
	315	+ $this->testAction($this->_apiRoot.'threads/2.json', ['method' => 'GET']);
316	316	}
317	317
318	318	public function testThreadsItemGet() {
319	319	$this->generate('ApiEntries');
320	320	$this->_loginUser(3);
321	321	$result = $this->testAction(
322		- $this->_apiRoot . 'threads/1.json',
	322	+ $this->_apiRoot.'threads/1.json',
323	323	['method' => 'GET', 'return' => 'contents']
324	324	);
325	325	$json = <<< EOF
		@@ -353,7 +353,7 @@ discard block
		block discarded – undo
353	353
354	354	public function testThreadsItemGetNotLoggedIn() {
355	355	$result = $this->testAction(
356		- $this->_apiRoot . 'threads/10.json',
	356	+ $this->_apiRoot.'threads/10.json',
357	357	['method' => 'GET', 'return' => 'contents']
358	358	);
359	359	$result = json_decode($result, true);
		@@ -369,7 +369,7 @@ discard block
		block discarded – undo
369	369	public function testThreadsItemGetNotLoggedInCategory() {
370	370	$this->setExpectedException('NotFoundException', 'Thread with id `4` not found.');
371	371	$this->testAction(
372		- $this->_apiRoot . 'threads/4.json',
	372	+ $this->_apiRoot.'threads/4.json',
373	373	['method' => 'GET', 'return' => 'contents']
374	374	);
375	375	}
		@@ -381,7 +381,7 @@ discard block
		block discarded – undo
381	381	$this->generate('ApiEntries');
382	382	$this->_loginUser(3);
383	383	$result = $this->testAction(
384		- $this->_apiRoot . 'threads/4.json',
	384	+ $this->_apiRoot.'threads/4.json',
385	385	['method' => 'GET', 'return' => 'contents']
386	386	);
387	387	$result = json_decode($result, true);
		@@ -394,7 +394,7 @@ discard block
		block discarded – undo
394	394	public function testThreadsItemGetNotAdminAnonCategory() {
395	395	$this->setExpectedException('NotFoundException', 'Thread with id `6` not found.');
396	396	$this->testAction(
397		- $this->_apiRoot . 'threads/6.json',
	397	+ $this->_apiRoot.'threads/6.json',
398	398	['method' => 'GET', 'return' => 'contents']
399	399	);
400	400	}
		@@ -408,7 +408,7 @@ discard block
		block discarded – undo
408	408
409	409	$this->setExpectedException('NotFoundException', 'Thread with id `6` not found.');
410	410	$this->testAction(
411		- $this->_apiRoot . 'threads/6.json',
	411	+ $this->_apiRoot.'threads/6.json',
412	412	['method' => 'GET', 'return' => 'contents']
413	413	);
414	414	}
		@@ -420,7 +420,7 @@ discard block
		block discarded – undo
420	420	$this->generate('ApiEntries');
421	421	$this->_loginUser(1);
422	422	$result = $this->testAction(
423		- $this->_apiRoot . 'threads/6.json',
	423	+ $this->_apiRoot.'threads/6.json',
424	424	['method' => 'GET', 'return' => 'contents']
425	425	);
426	426	$result = json_decode($result, true);
		@@ -430,7 +430,7 @@ discard block
		block discarded – undo
430	430	public function testThreadsItemDisallowedRequestTypes() {
431	431	$this->_checkDisallowedRequestType(
432	432	['PUT', 'POST', 'DELETE'],
433		- $this->_apiRoot . 'threads/1'
	433	+ $this->_apiRoot.'threads/1'
434	434	);
435	435	}
436	436

		@@ -3,9 +3,9 @@
		block discarded – undo
3	3	class AllApiTest extends CakeTestSuite {
4	4
5	5	public static function suite() {
6		- $testPath = CakePlugin::path('Api') . 'Test' . DS;
	6	+ $testPath = CakePlugin::path('Api').'Test'.DS;
7	7	$suite = new CakeTestSuite('All Api tests.');
8		- $suite->addTestDirectoryRecursive($testPath . 'Case' . DS . 'Controller');
	8	+ $suite->addTestDirectoryRecursive($testPath.'Case'.DS.'Controller');
9	9	return $suite;
10	10	}
11	11

		@@ -1,8 +1,8 @@
		block discarded – undo
1	1	<?php
2	2
3		- include CakePlugin::path('Api') . 'Lib' . DS . 'exceptions.php';
	3	+ include CakePlugin::path('Api').'Lib'.DS.'exceptions.php';
4	4
5		- $getUri = function () {
	5	+ $getUri = function() {
6	6	if (!empty($_SERVER['PATH_INFO'])) {
7	7	$uri = $_SERVER['PATH_INFO'];
8	8	} elseif (isset($_SERVER['REQUEST_URI'])) {

Schlaefer / Saito

Branch — master (e5db64)

Category

Spacing +1 added lines, -1 removed lines patch added patch discarded remove patch

Spacing +3 added lines, -3 removed lines patch added patch discarded remove patch

Spacing +4 added lines, -4 removed lines patch added patch discarded remove patch

Spacing +13 added lines, -13 removed lines patch added patch discarded remove patch

Spacing +2 added lines, -2 removed lines patch added patch discarded remove patch

Spacing +6 added lines, -6 removed lines patch added patch discarded remove patch

Spacing +24 added lines, -24 removed lines patch added patch discarded remove patch

Spacing +2 added lines, -2 removed lines patch added patch discarded remove patch

Spacing +2 added lines, -2 removed lines patch added patch discarded remove patch