Schlaefer / Saito

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

Spacing +4 added lines, -4 removed lines

@@ -33,13 +33,13 @@ 
 		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 @@ 
 			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 @@ 
 			Configure::write('Saito.Settings.api_crossdomain', '');
 			$Controller = $this->generate('ApiCore');
 			$this->testAction(
-				$this->_apiRoot . 'bootstrap.json',
+				$this->_apiRoot.'bootstrap.json',
 				[
 					'method' => 'GET',
 					'return' => 'contents'

Indentation +55 added lines, -55 removed lines

@@ -1,74 +1,74 @@
 <?php
 
-	App::uses('ApiControllerTestCase', 'Api.Lib');
+    App::uses('ApiControllerTestCase', 'Api.Lib');
 
 /**
  * ApiUsersController Test Case
  *
  */
-	class ApiAppControllerTest extends ApiControllerTestCase {
+    class ApiAppControllerTest extends ApiControllerTestCase {
 
-		protected $_apiRoot = 'api/v1/';
+        protected $_apiRoot = 'api/v1/';
 
 /**
  * Fixtures
  *
  * @var array
  */
-		public $fixtures = array(
-			'plugin.api.entry',
-			'plugin.api.category',
-			'plugin.api.user',
-			'plugin.api.user_block',
-			'plugin.api.user_ignore',
-			'plugin.api.user_online',
-			'plugin.api.user_read',
-			'plugin.api.bookmark',
-			'plugin.api.esnotification',
-			'plugin.api.esevent',
-			'plugin.api.upload',
-			'plugin.api.setting'
-		);
+        public $fixtures = array(
+            'plugin.api.entry',
+            'plugin.api.category',
+            'plugin.api.user',
+            'plugin.api.user_block',
+            'plugin.api.user_ignore',
+            'plugin.api.user_online',
+            'plugin.api.user_read',
+            'plugin.api.bookmark',
+            'plugin.api.esnotification',
+            'plugin.api.esevent',
+            'plugin.api.upload',
+            'plugin.api.setting'
+        );
 
-		public function testApiDisabled() {
-			Configure::write('Saito.Settings.api_enabled', '0');
-			$this->setExpectedException('Saito\Api\ApiDisabledException');
-			$this->testAction($this->_apiRoot . 'bootstrap.json');
-		}
+        public function testApiDisabled() {
+            Configure::write('Saito.Settings.api_enabled', '0');
+            $this->setExpectedException('Saito\Api\ApiDisabledException');
+            $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');
-		}
+        public function testApiEnabled() {
+            Configure::write('Saito.Settings.api_enabled', '1');
+            $this->setExpectedException('Saito\Api\UnknownRouteException');
+            $this->testAction($this->_apiRoot . 'foobar');
+        }
 
-		public function testApiAllowOriginHeader() {
-			$expected = rand();
-			Configure::write('Saito.Settings.api_crossdomain', $expected);
-			$Controller = $this->generate('ApiCore');
-			$this->testAction(
-				$this->_apiRoot . 'bootstrap.json',
-				[
-					'method' => 'GET',
-					'return' => 'contents'
-				]
-			);
-			$header = $Controller->response->header()['Access-Control-Allow-Origin'];
-			$this->assertEqual($header, $expected);
-		}
+        public function testApiAllowOriginHeader() {
+            $expected = rand();
+            Configure::write('Saito.Settings.api_crossdomain', $expected);
+            $Controller = $this->generate('ApiCore');
+            $this->testAction(
+                $this->_apiRoot . 'bootstrap.json',
+                [
+                    'method' => 'GET',
+                    'return' => 'contents'
+                ]
+            );
+            $header = $Controller->response->header()['Access-Control-Allow-Origin'];
+            $this->assertEqual($header, $expected);
+        }
 
-		public function testApiAllowOriginHeaderNotSet() {
-			Configure::write('Saito.Settings.api_crossdomain', '');
-			$Controller = $this->generate('ApiCore');
-			$this->testAction(
-				$this->_apiRoot . 'bootstrap.json',
-				[
-					'method' => 'GET',
-					'return' => 'contents'
-				]
-			);
-			$headers = $Controller->response->header();
-			$this->assertFalse(isset($headers['Access-Control-Allow-Origin']));
-		}
+        public function testApiAllowOriginHeaderNotSet() {
+            Configure::write('Saito.Settings.api_crossdomain', '');
+            $Controller = $this->generate('ApiCore');
+            $this->testAction(
+                $this->_apiRoot . 'bootstrap.json',
+                [
+                    'method' => 'GET',
+                    'return' => 'contents'
+                ]
+            );
+            $headers = $Controller->response->header();
+            $this->assertFalse(isset($headers['Access-Control-Allow-Origin']));
+        }
 
-	}
+    }

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

Spacing +13 added lines, -13 removed lines

@@ -35,7 +35,7 @@ 
 				'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 @@ 
 				'username' => 'Jane'
 			];
 			$this->testAction(
-				$this->_apiRoot . 'login',
+				$this->_apiRoot.'login',
 				['data' => $data, 'method' => 'POST']
 			);
 		}
@@ -72,7 +72,7 @@ 
 			');
 
 			$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 @@ 
 					->will($this->returnValue(false));
 			$this->setExpectedException('UnauthorizedException');
 			$this->testAction(
-				$this->_apiRoot . 'login',
+				$this->_apiRoot.'login',
 				['method' => 'POST', 'data' => $data]
 			);
 		}
@@ -114,17 +114,17 @@ 
 		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 @@ 
 			];
 			$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 @@ 
 			];
 
 			$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 @@ 
 			];
 
 			$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 @@ 
 			];
 
 			$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 @@ 
 
 		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'
 			);
 		}
 

Indentation +240 added lines, -240 removed lines

@@ -1,65 +1,65 @@ 
 <?php
 
-	App::uses('ApiControllerTestCase', 'Api.Lib');
+    App::uses('ApiControllerTestCase', 'Api.Lib');
 
 /**
  * ApiUsersController Test Case
  *
  */
-	class ApiUsersControllerTest extends ApiControllerTestCase {
+    class ApiUsersControllerTest extends ApiControllerTestCase {
 
-		protected $_apiRoot = 'api/v1/';
+        protected $_apiRoot = 'api/v1/';
 
 /**
  * Fixtures
  *
  * @var array
  */
-		public $fixtures = array(
-			'plugin.api.entry',
-			'plugin.api.category',
-			'plugin.api.user',
-			'plugin.api.user_block',
-			'plugin.api.user_ignore',
-			'plugin.api.user_online',
-			'plugin.api.user_read',
-			'plugin.api.bookmark',
-			'plugin.api.esnotification',
-			'plugin.api.esevent',
-			'plugin.api.upload',
-			'plugin.api.setting'
-		);
-
-		public function testLoginNoUsername() {
-			$this->setExpectedException(
-				'BadRequestException',
-				'Field `username` is missing.'
-			);
-			$this->testAction($this->_apiRoot . 'login', ['method' => 'POST']);
-		}
-
-		public function testLoginNoPassword() {
-			$this->setExpectedException(
-				'BadRequestException',
-				'Field `password` is missing.'
-			);
-			$data = [
-				'username' => 'Jane'
-			];
-			$this->testAction(
-				$this->_apiRoot . 'login',
-				['data' => $data, 'method' => 'POST']
-			);
-		}
-
-		public function testLoginSuccess() {
-			$data = [
-				'username' => 'Alice',
-				'password' => 'test',
-				'remember_me' => '1'
-			];
-
-			$expected = json_decode('
+        public $fixtures = array(
+            'plugin.api.entry',
+            'plugin.api.category',
+            'plugin.api.user',
+            'plugin.api.user_block',
+            'plugin.api.user_ignore',
+            'plugin.api.user_online',
+            'plugin.api.user_read',
+            'plugin.api.bookmark',
+            'plugin.api.esnotification',
+            'plugin.api.esevent',
+            'plugin.api.upload',
+            'plugin.api.setting'
+        );
+
+        public function testLoginNoUsername() {
+            $this->setExpectedException(
+                'BadRequestException',
+                'Field `username` is missing.'
+            );
+            $this->testAction($this->_apiRoot . 'login', ['method' => 'POST']);
+        }
+
+        public function testLoginNoPassword() {
+            $this->setExpectedException(
+                'BadRequestException',
+                'Field `password` is missing.'
+            );
+            $data = [
+                'username' => 'Jane'
+            ];
+            $this->testAction(
+                $this->_apiRoot . 'login',
+                ['data' => $data, 'method' => 'POST']
+            );
+        }
+
+        public function testLoginSuccess() {
+            $data = [
+                'username' => 'Alice',
+                'password' => 'test',
+                'remember_me' => '1'
+            ];
+
+            $expected = json_decode('
 				{
 					"user": {
 						"isLoggedIn": true,
@@ -71,199 +71,199 @@ 
 				}
 			');
 
-			$result = $this->testAction(
-				$this->_apiRoot . 'login.json',
-				['method' => 'POST', 'data' => $data, 'return' => 'contents']
-			);
-			$this->assertEqual(json_decode($result), $expected);
-		}
-
-		public function testLoginFailure() {
-			$data = [
-				'username' => 'Jane',
-				'password' => 'N7',
-				'remember_me' => '1'
-			];
-			$ApiUsers = $this->generate(
-				'ApiUsers',
-				[
-					'components' => [
-						'CurrentUser' => [
-							'login',
-							'initialize',
-							'isLoggedIn',
-							'logout'
-						]
-					]
-				]
-			);
-			$ApiUsers->CurrentUser->expects($this->once())
-					->method('logout');
-			$ApiUsers->CurrentUser->expects($this->once())
-					->method('login');
-			$ApiUsers->CurrentUser->expects($this->any())
-					->method('isLoggedIn')
-					->will($this->returnValue(false));
-			$this->setExpectedException('UnauthorizedException');
-			$this->testAction(
-				$this->_apiRoot . 'login',
-				['method' => 'POST', 'data' => $data]
-			);
-		}
-
-		public function testLoginDisallowedRequestType() {
-			$this->_checkDisallowedRequestType(
-				['GET', 'PUT', 'DELETE'],
-					$this->_apiRoot . 'login'
-			);
-		}
-
-		public function testMarkAsReadMissingUserId() {
-			$this->generate('Api.ApiUsers');
-			$this->_loginUser(3);
-			$data = [ ];
-			$this->setExpectedException('InvalidArgumentException', 'User id is missing.');
-			$this->testAction(
-				$this->_apiRoot . 'markasread',
-				['method' => 'POST', 'data' => $data]
-			);
-		}
-
-		public function testMarkAsReadUserIdNotAuthorized() {
-			$this->generate('Api.ApiUsers');
-			$this->_loginUser(3);
-			$data = [
-				'id' => 1
-			];
-			$this->setExpectedException('ForbiddenException', 'You are not authorized for user id `1`.');
-			$this->testAction(
-				$this->_apiRoot . 'markasread',
-				['method' => 'POST', 'data' => $data]
-			);
-		}
-
-		public function testMarkAsReadSuccessNow() {
-			$ApiUsers = $this->generate(
-				'ApiUsers',
-				[
-					'components' => [
-						'CurrentUser' => [
-							'isLoggedIn',
-							'getId',
-							'initialize'
-						]
-					]
-				]
-			);
-
-			$_userId = 3;
-
-			$ApiUsers->CurrentUser->expects($this->any())
-					->method('isLoggedIn')
-					->will($this->returnValue(true));
-			$ApiUsers->CurrentUser->expects($this->any())
-					->method('getId')
-					->will($this->returnValue($_userId));
-
-			$ApiUsers->CurrentUser->LastRefresh = $this->getMock('Object', ['set']);
-			$ApiUsers->CurrentUser->LastRefresh->expects($this->once())
-					->method('set')
-					->with('now');
-
-			$this->_loginUser($_userId);
-			$data = [
-				'id' => $_userId
-			];
-
-			$result = $this->testAction(
-				$this->_apiRoot . 'markasread.json',
-				['method' => 'POST', 'data' => $data, 'return' => 'contents']
-			);
-			$result = json_decode($result, true);
-			$this->assertTrue(isset($result['last_refresh']));
-		}
-
-		public function testMarkAsReadSuccessTimestamp() {
-			$ApiUsers = $this->generate(
-				'ApiUsers',
-				[
-					'components' => [
-						'CurrentUser' => [
-							'isLoggedIn',
-							'getId',
-							'initialize'
-						]
-					]
-				]
-			);
-
-			$_userId = 3;
-
-			$ApiUsers->CurrentUser->expects($this->any())
-					->method('isLoggedIn')
-					->will($this->returnValue(true));
-			$ApiUsers->CurrentUser->expects($this->any())
-					->method('getId')
-					->will($this->returnValue($_userId));
-
-			$ApiUsers->CurrentUser->LastRefresh = $this->getMock('Object', ['set']);
-			$ApiUsers->CurrentUser->LastRefresh->expects($this->once())
-					->method('set')
-					->with('2013-07-04 19:53:14');
-
-			$this->_loginUser($_userId);
-			$data = [
-				'id' => $_userId,
-				'last_refresh' => '2013-07-04T19:53:14+00:00'
-			];
-
-			$result = $this->testAction(
-				$this->_apiRoot . 'markasread.json',
-				['method' => 'POST', 'data' => $data, 'return' => 'contents']
-			);
-			$result = json_decode($result, true);
-			$this->assertTrue(isset($result['last_refresh']));
-		}
+            $result = $this->testAction(
+                $this->_apiRoot . 'login.json',
+                ['method' => 'POST', 'data' => $data, 'return' => 'contents']
+            );
+            $this->assertEqual(json_decode($result), $expected);
+        }
+
+        public function testLoginFailure() {
+            $data = [
+                'username' => 'Jane',
+                'password' => 'N7',
+                'remember_me' => '1'
+            ];
+            $ApiUsers = $this->generate(
+                'ApiUsers',
+                [
+                    'components' => [
+                        'CurrentUser' => [
+                            'login',
+                            'initialize',
+                            'isLoggedIn',
+                            'logout'
+                        ]
+                    ]
+                ]
+            );
+            $ApiUsers->CurrentUser->expects($this->once())
+                    ->method('logout');
+            $ApiUsers->CurrentUser->expects($this->once())
+                    ->method('login');
+            $ApiUsers->CurrentUser->expects($this->any())
+                    ->method('isLoggedIn')
+                    ->will($this->returnValue(false));
+            $this->setExpectedException('UnauthorizedException');
+            $this->testAction(
+                $this->_apiRoot . 'login',
+                ['method' => 'POST', 'data' => $data]
+            );
+        }
+
+        public function testLoginDisallowedRequestType() {
+            $this->_checkDisallowedRequestType(
+                ['GET', 'PUT', 'DELETE'],
+                    $this->_apiRoot . 'login'
+            );
+        }
+
+        public function testMarkAsReadMissingUserId() {
+            $this->generate('Api.ApiUsers');
+            $this->_loginUser(3);
+            $data = [ ];
+            $this->setExpectedException('InvalidArgumentException', 'User id is missing.');
+            $this->testAction(
+                $this->_apiRoot . 'markasread',
+                ['method' => 'POST', 'data' => $data]
+            );
+        }
+
+        public function testMarkAsReadUserIdNotAuthorized() {
+            $this->generate('Api.ApiUsers');
+            $this->_loginUser(3);
+            $data = [
+                'id' => 1
+            ];
+            $this->setExpectedException('ForbiddenException', 'You are not authorized for user id `1`.');
+            $this->testAction(
+                $this->_apiRoot . 'markasread',
+                ['method' => 'POST', 'data' => $data]
+            );
+        }
+
+        public function testMarkAsReadSuccessNow() {
+            $ApiUsers = $this->generate(
+                'ApiUsers',
+                [
+                    'components' => [
+                        'CurrentUser' => [
+                            'isLoggedIn',
+                            'getId',
+                            'initialize'
+                        ]
+                    ]
+                ]
+            );
+
+            $_userId = 3;
+
+            $ApiUsers->CurrentUser->expects($this->any())
+                    ->method('isLoggedIn')
+                    ->will($this->returnValue(true));
+            $ApiUsers->CurrentUser->expects($this->any())
+                    ->method('getId')
+                    ->will($this->returnValue($_userId));
+
+            $ApiUsers->CurrentUser->LastRefresh = $this->getMock('Object', ['set']);
+            $ApiUsers->CurrentUser->LastRefresh->expects($this->once())
+                    ->method('set')
+                    ->with('now');
+
+            $this->_loginUser($_userId);
+            $data = [
+                'id' => $_userId
+            ];
+
+            $result = $this->testAction(
+                $this->_apiRoot . 'markasread.json',
+                ['method' => 'POST', 'data' => $data, 'return' => 'contents']
+            );
+            $result = json_decode($result, true);
+            $this->assertTrue(isset($result['last_refresh']));
+        }
+
+        public function testMarkAsReadSuccessTimestamp() {
+            $ApiUsers = $this->generate(
+                'ApiUsers',
+                [
+                    'components' => [
+                        'CurrentUser' => [
+                            'isLoggedIn',
+                            'getId',
+                            'initialize'
+                        ]
+                    ]
+                ]
+            );
+
+            $_userId = 3;
+
+            $ApiUsers->CurrentUser->expects($this->any())
+                    ->method('isLoggedIn')
+                    ->will($this->returnValue(true));
+            $ApiUsers->CurrentUser->expects($this->any())
+                    ->method('getId')
+                    ->will($this->returnValue($_userId));
+
+            $ApiUsers->CurrentUser->LastRefresh = $this->getMock('Object', ['set']);
+            $ApiUsers->CurrentUser->LastRefresh->expects($this->once())
+                    ->method('set')
+                    ->with('2013-07-04 19:53:14');
+
+            $this->_loginUser($_userId);
+            $data = [
+                'id' => $_userId,
+                'last_refresh' => '2013-07-04T19:53:14+00:00'
+            ];
+
+            $result = $this->testAction(
+                $this->_apiRoot . 'markasread.json',
+                ['method' => 'POST', 'data' => $data, 'return' => 'contents']
+            );
+            $result = json_decode($result, true);
+            $this->assertTrue(isset($result['last_refresh']));
+        }
 
 /**
  * Send timestamp is ignored is not set if it's older than the current one
  */
-		public function testMarkAsReadNoPastValues() {
-			$ApiUsers = $this->generate('ApiUsers');
-
-			$_userId = 3;
-			$this->_loginUser($_userId);
-
-			$ApiUsers->User->id = $_userId;
-			$ApiUsers->User->saveField('last_refresh', '2013-07-04 19:53:14');
-
-			$data = [
-				'id' => $_userId,
-				'last_refresh' => '2013-07-04T19:53:13+00:00'
-			];
-
-			$result = $this->testAction(
-				$this->_apiRoot . 'markasread.json',
-				['method' => 'POST', 'data' => $data, 'return' => 'contents']
-			);
-			$result = json_decode($result, true);
-			$expected = [
-				'last_refresh' => '2013-07-04T19:53:14+00:00'
-			] + $data;
-			$this->assertEqual($result, $expected);
-		}
-
-		public function testMarkAsReadOnlyAuthenticatedUsers() {
-			$this->generate('ApiUsers', ['methods' => 'markasread']);
-			$this->testAction($this->_apiRoot . 'markasread.json', ['method' => 'POST']);
-			$this->assertRedirectedTo('login');
-		}
-
-		public function testMarkAsReadDisallowedRequestType() {
-			$this->_checkDisallowedRequestType(
-				['GET', 'PUT', 'DELETE'],
-					$this->_apiRoot . 'markasread'
-			);
-		}
-
-	}
+        public function testMarkAsReadNoPastValues() {
+            $ApiUsers = $this->generate('ApiUsers');
+
+            $_userId = 3;
+            $this->_loginUser($_userId);
+
+            $ApiUsers->User->id = $_userId;
+            $ApiUsers->User->saveField('last_refresh', '2013-07-04 19:53:14');
+
+            $data = [
+                'id' => $_userId,
+                'last_refresh' => '2013-07-04T19:53:13+00:00'
+            ];
+
+            $result = $this->testAction(
+                $this->_apiRoot . 'markasread.json',
+                ['method' => 'POST', 'data' => $data, 'return' => 'contents']
+            );
+            $result = json_decode($result, true);
+            $expected = [
+                'last_refresh' => '2013-07-04T19:53:14+00:00'
+            ] + $data;
+            $this->assertEqual($result, $expected);
+        }
+
+        public function testMarkAsReadOnlyAuthenticatedUsers() {
+            $this->generate('ApiUsers', ['methods' => 'markasread']);
+            $this->testAction($this->_apiRoot . 'markasread.json', ['method' => 'POST']);
+            $this->assertRedirectedTo('login');
+        }
+
+        public function testMarkAsReadDisallowedRequestType() {
+            $this->_checkDisallowedRequestType(
+                ['GET', 'PUT', 'DELETE'],
+                    $this->_apiRoot . 'markasread'
+            );
+        }
+
+    }

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

Spacing +2 added lines, -2 removed lines

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

Indentation +55 added lines, -55 removed lines

@@ -1,38 +1,38 @@ 
 <?php
 
-	App::uses('ApiControllerTestCase', 'Api.Lib');
+    App::uses('ApiControllerTestCase', 'Api.Lib');
 
 /**
  * ApiUsersController Test Case
  *
  */
-	class ApiCoreControllerTest extends ApiControllerTestCase {
+    class ApiCoreControllerTest extends ApiControllerTestCase {
 
-		protected $_apiRoot = 'api/v1/';
+        protected $_apiRoot = 'api/v1/';
 
 /**
  * Fixtures
  *
  * @var array
  */
-		public $fixtures = array(
-			'plugin.api.entry',
-			'plugin.api.category',
-			'plugin.api.user',
-			'plugin.api.user_block',
-			'plugin.api.user_ignore',
-			'plugin.api.user_online',
-			'plugin.api.bookmark',
-			'plugin.api.esnotification',
-			'plugin.api.esevent',
-			'plugin.api.upload',
-			'plugin.api.setting'
-		);
+        public $fixtures = array(
+            'plugin.api.entry',
+            'plugin.api.category',
+            'plugin.api.user',
+            'plugin.api.user_block',
+            'plugin.api.user_ignore',
+            'plugin.api.user_online',
+            'plugin.api.bookmark',
+            'plugin.api.esnotification',
+            'plugin.api.esevent',
+            'plugin.api.upload',
+            'plugin.api.setting'
+        );
 
-		public function testBootstrap() {
-			Configure::write('Saito.Settings.edit_period', 20);
+        public function testBootstrap() {
+            Configure::write('Saito.Settings.edit_period', 20);
 
-			$_json = <<<EOF
+            $_json = <<<EOF
 {
   "categories": [
     {
@@ -60,34 +60,34 @@ 
   }
 }
 EOF;
-			$expected = json_decode($_json, true);
+            $expected = json_decode($_json, true);
 
-			$result = $this->testAction(
-				$this->_apiRoot . 'bootstrap.json',
-				[
-					'method' => 'GET',
-					'return' => 'contents'
-				]
-			);
+            $result = $this->testAction(
+                $this->_apiRoot . 'bootstrap.json',
+                [
+                    'method' => 'GET',
+                    'return' => 'contents'
+                ]
+            );
 
-			$result = json_decode($result, true);
+            $result = json_decode($result, true);
 
-			// test server_time
-			$this->assertNotEmpty($result['server']['time']);
-			$_serverTime = strtotime($result['server']['time']);
-			$withinTheLastFewSeconds = $_serverTime > (time() - 20);
-			$this->assertTrue($withinTheLastFewSeconds);
-			unset($result['server']['time']);
+            // test server_time
+            $this->assertNotEmpty($result['server']['time']);
+            $_serverTime = strtotime($result['server']['time']);
+            $withinTheLastFewSeconds = $_serverTime > (time() - 20);
+            $this->assertTrue($withinTheLastFewSeconds);
+            unset($result['server']['time']);
 
-			if (empty($result['server'])) {
-				unset($result['server']);
-			}
+            if (empty($result['server'])) {
+                unset($result['server']);
+            }
 
-			$this->assertEqual($result, $expected);
-		}
+            $this->assertEqual($result, $expected);
+        }
 
-		public function testBootstrapCategoriesLoggedIn() {
-			$_json = <<<EOF
+        public function testBootstrapCategoriesLoggedIn() {
+            $_json = <<<EOF
  [
     {
       "id": 2,
@@ -119,18 +119,18 @@ 
     }
 ]
 EOF;
-			$expected = json_decode($_json, true);
-			$this->generate('ApiCore');
-			$this->_loginUser(3);
-			$result = $this->testAction(
-				$this->_apiRoot . 'bootstrap.json',
-				[
-					'method' => 'GET',
-					'return' => 'contents'
-				]
-			);
-			$result = json_decode($result, true)['categories'];
-			$this->assertEqual($result, $expected);
-		}
+            $expected = json_decode($_json, true);
+            $this->generate('ApiCore');
+            $this->_loginUser(3);
+            $result = $this->testAction(
+                $this->_apiRoot . 'bootstrap.json',
+                [
+                    'method' => 'GET',
+                    'return' => 'contents'
+                ]
+            );
+            $result = json_decode($result, true)['categories'];
+            $this->assertEqual($result, $expected);
+        }
 
-	}
+    }

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

Spacing +6 added lines, -6 removed lines

@@ -65,7 +65,7 @@ 
 		public function testShoutsDisallowedRequestTypes() {
 			$this->_checkDisallowedRequestType(
 				['PUT', 'DELETE'],
-					$this->_apiRoot . 'shouts'
+					$this->_apiRoot.'shouts'
 			);
 		}
 
@@ -74,7 +74,7 @@ 
 			$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 @@ 
 		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 @@ 
 			$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 @@ 
 			$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']);
 		}
 
 	}

Indentation +137 added lines, -137 removed lines

@@ -1,139 +1,139 @@
 <?php
 
-	App::uses('ApiControllerTestCase', 'Api.Lib');
-
-	/**
-	 * ApiEntriesController Test Case
-	 *
-	 */
-	class ApiShoutsControllerTest extends ApiControllerTestCase {
-
-		protected $_apiRoot = 'api/v1/';
-
-		protected $_fixtureResult = [
-			0 =>
-					array(
-						'id' => 4,
-						'time' => '2013-02-08T11:49:31+00:00',
-						'text' => '<script></script>[i]italic[/i]',
-						'html' => '&lt;script&gt;&lt;/script&gt;<em>italic</em>',
-						'user_id' => 1,
-						'user_name' => 'Alice',
-					),
-			1 =>
-					array(
-						'id' => 3,
-						'time' => '2013-02-08T11:49:31+00:00',
-						'text' => 'Lorem ipsum dolor sit amet',
-						'html' => 'Lorem ipsum dolor sit amet',
-						'user_id' => 1,
-						'user_name' => 'Alice',
-					),
-			2 =>
-					array(
-						'id' => 2,
-						'time' => '2013-02-08T11:49:31+00:00',
-						'text' => 'Lorem ipsum dolor sit amet',
-						'html' => 'Lorem ipsum dolor sit amet',
-						'user_id' => 1,
-						'user_name' => 'Alice',
-					),
-		];
-
-		/**
-		 * Fixtures
-		 *
-		 * @var array
-		 */
-		public $fixtures = array(
-			'plugin.api.entry',
-			'plugin.api.category',
-			'plugin.api.user',
-			'plugin.api.user_block',
-			'plugin.api.user_ignore',
-			'plugin.api.user_online',
-			'plugin.api.bookmark',
-			'plugin.api.esnotification',
-			'plugin.api.esevent',
-			'plugin.api.setting',
-			'plugin.api.smiley',
-			'plugin.api.smiley_code',
-			'plugin.api.shout',
-			'plugin.api.upload'
-		);
-
-		public function testShoutsDisallowedRequestTypes() {
-			$this->_checkDisallowedRequestType(
-				['PUT', 'DELETE'],
-					$this->_apiRoot . 'shouts'
-			);
-		}
-
-		public function testShoutsGet() {
-			$this->generate('Api.ApiShouts');
-			$this->_loginUser(3);
-
-			$expected = $this->_fixtureResult;
-			$result = $this->testAction($this->_apiRoot . 'shouts.json',
-				[
-					'method' => 'GET',
-					'return' => 'contents'
-				]);
-			$result = json_decode($result, true);
-			$this->assertEqual($result, $expected);
-		}
-
-		public function testShoutsGetNotLoggedIn() {
-			$this->generate('Api.ApiShouts');
-			$this->setExpectedException('Saito\Api\ApiAuthException');
-			$this->testAction($this->_apiRoot . 'shouts.json', ['method' => 'GET']);
-		}
-
-		public function testShoutsPost() {
-			$this->generate('Api.ApiShouts');
-			$this->_loginUser(3);
-
-			$data = [
-				'text' => 'test < shout'
-			];
-			$result = $this->testAction($this->_apiRoot . 'shouts.json',
-				[
-					'method' => 'POST',
-					'data' => $data,
-					'return' => 'contents'
-				]);
-			$result = json_decode($result, true);
-			$_newEntry = array_shift($result);
-
-			$_newEntryTime = strtotime($_newEntry['time']);
-			$this->assertGreaterThanOrEqual(time() - 1, $_newEntryTime);
-			unset($_newEntry['time']);
-
-			$expected = [
-				'id' => 5,
-				'text' => 'test < shout',
-				'html' => 'test &lt; shout',
-				'user_id' => 3,
-				'user_name' => 'Ulysses',
-			];
-			$this->assertEqual($_newEntry, $expected);
-
-			$expected = $this->_fixtureResult;
-			$this->assertEqual($result, $expected);
-		}
-
-		public function testShoutsPostTextMissing() {
-			$this->generate('Api.ApiShouts');
-			$this->_loginUser(3);
-
-			$this->setExpectedException('BadRequestException', 'Missing text.');
-			$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']);
-		}
-
-	}
+    App::uses('ApiControllerTestCase', 'Api.Lib');
+
+    /**
+     * ApiEntriesController Test Case
+     *
+     */
+    class ApiShoutsControllerTest extends ApiControllerTestCase {
+
+        protected $_apiRoot = 'api/v1/';
+
+        protected $_fixtureResult = [
+            0 =>
+                    array(
+                        'id' => 4,
+                        'time' => '2013-02-08T11:49:31+00:00',
+                        'text' => '<script></script>[i]italic[/i]',
+                        'html' => '&lt;script&gt;&lt;/script&gt;<em>italic</em>',
+                        'user_id' => 1,
+                        'user_name' => 'Alice',
+                    ),
+            1 =>
+                    array(
+                        'id' => 3,
+                        'time' => '2013-02-08T11:49:31+00:00',
+                        'text' => 'Lorem ipsum dolor sit amet',
+                        'html' => 'Lorem ipsum dolor sit amet',
+                        'user_id' => 1,
+                        'user_name' => 'Alice',
+                    ),
+            2 =>
+                    array(
+                        'id' => 2,
+                        'time' => '2013-02-08T11:49:31+00:00',
+                        'text' => 'Lorem ipsum dolor sit amet',
+                        'html' => 'Lorem ipsum dolor sit amet',
+                        'user_id' => 1,
+                        'user_name' => 'Alice',
+                    ),
+        ];
+
+        /**
+         * Fixtures
+         *
+         * @var array
+         */
+        public $fixtures = array(
+            'plugin.api.entry',
+            'plugin.api.category',
+            'plugin.api.user',
+            'plugin.api.user_block',
+            'plugin.api.user_ignore',
+            'plugin.api.user_online',
+            'plugin.api.bookmark',
+            'plugin.api.esnotification',
+            'plugin.api.esevent',
+            'plugin.api.setting',
+            'plugin.api.smiley',
+            'plugin.api.smiley_code',
+            'plugin.api.shout',
+            'plugin.api.upload'
+        );
+
+        public function testShoutsDisallowedRequestTypes() {
+            $this->_checkDisallowedRequestType(
+                ['PUT', 'DELETE'],
+                    $this->_apiRoot . 'shouts'
+            );
+        }
+
+        public function testShoutsGet() {
+            $this->generate('Api.ApiShouts');
+            $this->_loginUser(3);
+
+            $expected = $this->_fixtureResult;
+            $result = $this->testAction($this->_apiRoot . 'shouts.json',
+                [
+                    'method' => 'GET',
+                    'return' => 'contents'
+                ]);
+            $result = json_decode($result, true);
+            $this->assertEqual($result, $expected);
+        }
+
+        public function testShoutsGetNotLoggedIn() {
+            $this->generate('Api.ApiShouts');
+            $this->setExpectedException('Saito\Api\ApiAuthException');
+            $this->testAction($this->_apiRoot . 'shouts.json', ['method' => 'GET']);
+        }
+
+        public function testShoutsPost() {
+            $this->generate('Api.ApiShouts');
+            $this->_loginUser(3);
+
+            $data = [
+                'text' => 'test < shout'
+            ];
+            $result = $this->testAction($this->_apiRoot . 'shouts.json',
+                [
+                    'method' => 'POST',
+                    'data' => $data,
+                    'return' => 'contents'
+                ]);
+            $result = json_decode($result, true);
+            $_newEntry = array_shift($result);
+
+            $_newEntryTime = strtotime($_newEntry['time']);
+            $this->assertGreaterThanOrEqual(time() - 1, $_newEntryTime);
+            unset($_newEntry['time']);
+
+            $expected = [
+                'id' => 5,
+                'text' => 'test < shout',
+                'html' => 'test &lt; shout',
+                'user_id' => 3,
+                'user_name' => 'Ulysses',
+            ];
+            $this->assertEqual($_newEntry, $expected);
+
+            $expected = $this->_fixtureResult;
+            $this->assertEqual($result, $expected);
+        }
+
+        public function testShoutsPostTextMissing() {
+            $this->generate('Api.ApiShouts');
+            $this->_loginUser(3);
+
+            $this->setExpectedException('BadRequestException', 'Missing text.');
+            $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']);
+        }
+
+    }

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

Spacing +24 added lines, -24 removed lines

@@ -44,7 +44,7 @@ 
 
 			$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 @@ 
 		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 @@ 
 			$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 @@ 
 		public function testThreadsDisallowedRequestTypes() {
 			$this->_checkDisallowedRequestType(
 				['POST', 'PUT', 'DELETE'],
-					$this->_apiRoot . 'threads'
+					$this->_apiRoot.'threads'
 			);
 		}
 
@@ -121,7 +121,7 @@ 
 			$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 @@ 
 			$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 @@ 
 
 		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 @@ 
 			$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 @@ 
 			$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 @@ 
 			$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 @@ 
 			$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 @@ 
 				->method('update')
 				->will($this->returnValue(false));
 			$this->testAction(
-				$this->_apiRoot . 'entries/' . $id,
+				$this->_apiRoot.'entries/'.$id,
 				[
 					'method' => 'PUT',
 					'data' => [
@@ -306,20 +306,20 @@ 
 		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 @@ 
 
 		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 @@ 
 		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 @@ 
 			$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 @@ 
 		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 @@ 
 
 			$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 @@ 
 			$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 @@ 
 		public function testThreadsItemDisallowedRequestTypes() {
 			$this->_checkDisallowedRequestType(
 				['PUT', 'POST', 'DELETE'],
-					$this->_apiRoot . 'threads/1'
+					$this->_apiRoot.'threads/1'
 			);
 		}
 

Indentation +318 added lines, -318 removed lines

@@ -1,53 +1,53 @@ 
 <?php
 
-	App::uses('ApiControllerTestCase', 'Api.Lib');
+    App::uses('ApiControllerTestCase', 'Api.Lib');
 
 /**
  * ApiEntriesController Test Case
  *
  */
-	class ApiEntriesControllerTest extends ApiControllerTestCase {
+    class ApiEntriesControllerTest extends ApiControllerTestCase {
 
-		protected $_apiRoot = 'api/v1/';
+        protected $_apiRoot = 'api/v1/';
 
 /**
  * Fixtures
  *
  * @var array
  */
-		public $fixtures = array(
-			'plugin.api.entry',
-			'plugin.api.category',
-			'plugin.api.user',
-			'plugin.api.user_block',
-			'plugin.api.user_ignore',
-			'plugin.api.user_online',
-			'plugin.api.user_read',
-			'plugin.api.bookmark',
-			'plugin.api.esnotification',
-			'plugin.api.esevent',
-			'plugin.api.upload',
-			'plugin.api.setting',
-			'plugin.api.smiley',
-			'plugin.api.smiley_code'
-		);
+        public $fixtures = array(
+            'plugin.api.entry',
+            'plugin.api.category',
+            'plugin.api.user',
+            'plugin.api.user_block',
+            'plugin.api.user_ignore',
+            'plugin.api.user_online',
+            'plugin.api.user_read',
+            'plugin.api.bookmark',
+            'plugin.api.esnotification',
+            'plugin.api.esevent',
+            'plugin.api.upload',
+            'plugin.api.setting',
+            'plugin.api.smiley',
+            'plugin.api.smiley_code'
+        );
 
 /**
  * testThreads method
  *
  * @return void
  */
-		public function testThreads() {
-			$this->generate('Api.ApiEntries');
+        public function testThreads() {
+            $this->generate('Api.ApiEntries');
 
-			$this->_loginUser(1);
+            $this->_loginUser(1);
 
-			$data = ['limit' => 2, 'offset' => 1, 'order' => 'answer'];
-			$result = $this->testAction(
-				$this->_apiRoot . 'threads.json',
-				['return' => 'contents', 'method' => 'GET', 'data' => $data]
-			);
-			$expected = json_decode('
+            $data = ['limit' => 2, 'offset' => 1, 'order' => 'answer'];
+            $result = $this->testAction(
+                $this->_apiRoot . 'threads.json',
+                ['return' => 'contents', 'method' => 'GET', 'data' => $data]
+            );
+            $expected = json_decode('
 			[
 				{
 					"id": 4,
@@ -74,182 +74,182 @@ 
 					"category_name": "Admin"
 				}
 			]');
-			$this->assertEqual(json_decode($result), $expected);
-		}
+            $this->assertEqual(json_decode($result), $expected);
+        }
 
 /**
  * Tests that anon doesn't see user and admin categories
  */
-		public function testThreadsNoAdminAnon() {
-			$data = ['limit' => 3];
-			$result = $this->testAction(
-				$this->_apiRoot . 'threads.json',
-				['return' => 'contents', 'method' => 'GET', 'data' => $data]
-			);
-			$result = json_decode($result, true);
-			$this->assertEqual(count($result), 3);
-			$this->assertEqual($result[0]['id'], 1);
-			$this->assertEqual($result[1]['id'], 10);
-		}
+        public function testThreadsNoAdminAnon() {
+            $data = ['limit' => 3];
+            $result = $this->testAction(
+                $this->_apiRoot . 'threads.json',
+                ['return' => 'contents', 'method' => 'GET', 'data' => $data]
+            );
+            $result = json_decode($result, true);
+            $this->assertEqual(count($result), 3);
+            $this->assertEqual($result[0]['id'], 1);
+            $this->assertEqual($result[1]['id'], 10);
+        }
 
 /**
  * Tests that user doesn't see admin category
  */
-		public function testThreadsNoAdminUser() {
-			$this->generate('ApiEntries');
-			$this->_loginUser(3);
-			$data = ['limit' => 2, 'offset' => 1, 'order' => 'answer'];
-			$result = $this->testAction(
-				$this->_apiRoot . 'threads.json',
-				['return' => 'contents', 'method' => 'GET', 'data' => $data]
-			);
-			$result = json_decode($result, true);
-			$this->assertEqual($result[0]['id'], 4);
-			$this->assertEqual($result[1]['id'], 10);
-		}
-
-		public function testThreadsDisallowedRequestTypes() {
-			$this->_checkDisallowedRequestType(
-				['POST', 'PUT', 'DELETE'],
-					$this->_apiRoot . 'threads'
-			);
-		}
-
-		public function testEntriesItemPostEmptySubject() {
-			$this->generate('Api.ApiEntries');
-			$this->_loginUser(3);
-			$this->setExpectedException('Saito\Api\ApiValidationError',
-				'Subject must not be empty.');
-			$this->testAction(
-				$this->_apiRoot . 'entries.json',
-				[
-					'method' => 'POST',
-					'data' => [
-						'subject' => '',
-						'parent_id' => 0,
-						'category_id' => 2
-					]
-				]
-			);
-		}
-
-		public function testEntriesItemPostSuccess() {
-			$this->generate('Api.ApiEntries');
-			$this->_loginUser(3);
-			$result = $this->testAction(
-				$this->_apiRoot . 'entries.json',
-				[
-					'return' => 'view',
-					'method' => 'POST',
-					'data' => [
-						'subject' => 'subject',
-						'parent_id' => 0,
-						'category_id' => 2
-					]
-				]
-			);
-			$statusCode = $this->controller->response->statusCode();
-			$this->assertEquals(200, $statusCode);
-		}
-
-		public function testEntriesItemPutOnlyAuthenticatedUsers() {
-			$this->generate('ApiEntries', ['methods' => 'entriesItemPut']);
-			$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']);
-		}
-
-		public function testEntriesItemPutEntryMustExist() {
-			$this->setExpectedException('NotFoundException', 'Entry with id `999` not found.');
-			$this->testAction($this->_apiRoot . 'entries/999', ['method' => 'PUT']);
-		}
-
-		public function testEntriesItemPutForbiddenTime() {
-			$this->generate('Api.ApiEntries');
-			$this->_loginUser(3);
-			$this->setExpectedException('ForbiddenException', 'The editing time ran out.');
-			$this->testAction(
-				$this->_apiRoot . 'entries/1',
-				[
-					'method' => 'PUT',
-					'data' => [
-						'subject' => 'foo',
-						'text' => 'bar'
-					]
-				]
-			);
-		}
-
-		public function testEntriesItemPutForbiddenUser() {
-			$ApiEntries = $this->generate('Api.ApiEntries');
-			$this->_loginUser(3);
-			$this->setExpectedException('ForbiddenException', 'The user `Ulysses` is not allowed to edit.');
-			$id = 2;
-			$ApiEntries->Entry->save(['id' => $id, 'time' => bdate()]);
-			$this->testAction(
-				$this->_apiRoot . 'entries/' . $id,
-				[
-					'method' => 'PUT',
-					'data' => [
-						'subject' => 'foo',
-						'text' => 'bar'
-					]
-				]
-			);
-		}
-
-		public function testEntriesItemPutForbiddenJustTrue() {
-			$ApiEntries = $this->generate(
-				'Api.ApiEntries',
-				['models' => ['Entry' => ['get']]]
-			);
-
-			$entry = [
-				'Entry' => [
-					'id' => 1,
-					'locked' => true,
-					'time' => bDate(time() + 9999),
-					'user_id' => 3
-				]
-			];
-
-			$ApiEntries->Entry->expects($this->once())
-					->method('get')
-					->will($this->returnValue($entry));
-			$this->_loginUser(3);
-			$this->setExpectedException('ForbiddenException', 'Editing is forbidden for unknown reason.');
-			$this->testAction(
-				$this->_apiRoot . 'entries/1',
-				[
-					'method' => 'PUT',
-					'data' => [
-						'subject' => 'foo',
-						'text' => 'bar'
-					]
-				]
-			);
-		}
-
-		public function testEntriesItemPutSuccess() {
-			$this->generate('Api.ApiEntries');
-			$this->_loginUser(1);
-			$id = 1;
-			$result = $this->testAction(
-				$this->_apiRoot . 'entries/' . $id . '.json',
-				[
-					'method' => 'PUT',
-					'data' => [
-						'subject' => 'foo',
-						'text' => 'bar'
-					],
-					'return' => 'contents'
-				]
-			);
-			$expected = json_decode('
+        public function testThreadsNoAdminUser() {
+            $this->generate('ApiEntries');
+            $this->_loginUser(3);
+            $data = ['limit' => 2, 'offset' => 1, 'order' => 'answer'];
+            $result = $this->testAction(
+                $this->_apiRoot . 'threads.json',
+                ['return' => 'contents', 'method' => 'GET', 'data' => $data]
+            );
+            $result = json_decode($result, true);
+            $this->assertEqual($result[0]['id'], 4);
+            $this->assertEqual($result[1]['id'], 10);
+        }
+
+        public function testThreadsDisallowedRequestTypes() {
+            $this->_checkDisallowedRequestType(
+                ['POST', 'PUT', 'DELETE'],
+                    $this->_apiRoot . 'threads'
+            );
+        }
+
+        public function testEntriesItemPostEmptySubject() {
+            $this->generate('Api.ApiEntries');
+            $this->_loginUser(3);
+            $this->setExpectedException('Saito\Api\ApiValidationError',
+                'Subject must not be empty.');
+            $this->testAction(
+                $this->_apiRoot . 'entries.json',
+                [
+                    'method' => 'POST',
+                    'data' => [
+                        'subject' => '',
+                        'parent_id' => 0,
+                        'category_id' => 2
+                    ]
+                ]
+            );
+        }
+
+        public function testEntriesItemPostSuccess() {
+            $this->generate('Api.ApiEntries');
+            $this->_loginUser(3);
+            $result = $this->testAction(
+                $this->_apiRoot . 'entries.json',
+                [
+                    'return' => 'view',
+                    'method' => 'POST',
+                    'data' => [
+                        'subject' => 'subject',
+                        'parent_id' => 0,
+                        'category_id' => 2
+                    ]
+                ]
+            );
+            $statusCode = $this->controller->response->statusCode();
+            $this->assertEquals(200, $statusCode);
+        }
+
+        public function testEntriesItemPutOnlyAuthenticatedUsers() {
+            $this->generate('ApiEntries', ['methods' => 'entriesItemPut']);
+            $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']);
+        }
+
+        public function testEntriesItemPutEntryMustExist() {
+            $this->setExpectedException('NotFoundException', 'Entry with id `999` not found.');
+            $this->testAction($this->_apiRoot . 'entries/999', ['method' => 'PUT']);
+        }
+
+        public function testEntriesItemPutForbiddenTime() {
+            $this->generate('Api.ApiEntries');
+            $this->_loginUser(3);
+            $this->setExpectedException('ForbiddenException', 'The editing time ran out.');
+            $this->testAction(
+                $this->_apiRoot . 'entries/1',
+                [
+                    'method' => 'PUT',
+                    'data' => [
+                        'subject' => 'foo',
+                        'text' => 'bar'
+                    ]
+                ]
+            );
+        }
+
+        public function testEntriesItemPutForbiddenUser() {
+            $ApiEntries = $this->generate('Api.ApiEntries');
+            $this->_loginUser(3);
+            $this->setExpectedException('ForbiddenException', 'The user `Ulysses` is not allowed to edit.');
+            $id = 2;
+            $ApiEntries->Entry->save(['id' => $id, 'time' => bdate()]);
+            $this->testAction(
+                $this->_apiRoot . 'entries/' . $id,
+                [
+                    'method' => 'PUT',
+                    'data' => [
+                        'subject' => 'foo',
+                        'text' => 'bar'
+                    ]
+                ]
+            );
+        }
+
+        public function testEntriesItemPutForbiddenJustTrue() {
+            $ApiEntries = $this->generate(
+                'Api.ApiEntries',
+                ['models' => ['Entry' => ['get']]]
+            );
+
+            $entry = [
+                'Entry' => [
+                    'id' => 1,
+                    'locked' => true,
+                    'time' => bDate(time() + 9999),
+                    'user_id' => 3
+                ]
+            ];
+
+            $ApiEntries->Entry->expects($this->once())
+                    ->method('get')
+                    ->will($this->returnValue($entry));
+            $this->_loginUser(3);
+            $this->setExpectedException('ForbiddenException', 'Editing is forbidden for unknown reason.');
+            $this->testAction(
+                $this->_apiRoot . 'entries/1',
+                [
+                    'method' => 'PUT',
+                    'data' => [
+                        'subject' => 'foo',
+                        'text' => 'bar'
+                    ]
+                ]
+            );
+        }
+
+        public function testEntriesItemPutSuccess() {
+            $this->generate('Api.ApiEntries');
+            $this->_loginUser(1);
+            $id = 1;
+            $result = $this->testAction(
+                $this->_apiRoot . 'entries/' . $id . '.json',
+                [
+                    'method' => 'PUT',
+                    'data' => [
+                        'subject' => 'foo',
+                        'text' => 'bar'
+                    ],
+                    'return' => 'contents'
+                ]
+            );
+            $expected = json_decode('
 			{
 				"id": 1,
 				"parent_id": 0,
@@ -270,59 +270,59 @@ 
 			}
 			', true);
 
-			$result = json_decode($result, true);
-			$_editTime = $result['edit_time'];
-			unset($result['edit_time']);
-
-			$this->assertGreaterThan(time() - 5, strtotime($_editTime));
-
-			$this->assertEqual($result, $expected);
-		}
-
-		public function testEntriesItemPutErrorOnUpdate() {
-			$ApiEntries = $this->generate(
-				'Api.ApiEntries',
-				['models' => ['Entry' => ['update']]]
-			);
-			$this->_loginUser(1);
-			$this->setExpectedException('BadRequestException', 'Tried to save entry but failed for unknown reason.');
-			$id = 1;
-			$ApiEntries->Entry->save(['id' => $id, 'time' => bdate()]);
-			$ApiEntries->Entry->expects($this->once())
-				->method('update')
-				->will($this->returnValue(false));
-			$this->testAction(
-				$this->_apiRoot . 'entries/' . $id,
-				[
-					'method' => 'PUT',
-					'data' => [
-						'subject' => 'foo',
-						'text' => 'bar'
-					]
-				]
-			);
-		}
-
-		public function testEntriesItemDisallowedRequestTypes() {
-			$this->_checkDisallowedRequestType(
-				['GET', 'POST', 'DELETE'],
-					$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']);
-		}
-
-		public function testThreadsItemGet() {
-			$this->generate('ApiEntries');
-			$this->_loginUser(3);
-			$result = $this->testAction(
-				$this->_apiRoot . 'threads/1.json',
-				['method' => 'GET', 'return' => 'contents']
-			);
-			$json = <<< EOF
+            $result = json_decode($result, true);
+            $_editTime = $result['edit_time'];
+            unset($result['edit_time']);
+
+            $this->assertGreaterThan(time() - 5, strtotime($_editTime));
+
+            $this->assertEqual($result, $expected);
+        }
+
+        public function testEntriesItemPutErrorOnUpdate() {
+            $ApiEntries = $this->generate(
+                'Api.ApiEntries',
+                ['models' => ['Entry' => ['update']]]
+            );
+            $this->_loginUser(1);
+            $this->setExpectedException('BadRequestException', 'Tried to save entry but failed for unknown reason.');
+            $id = 1;
+            $ApiEntries->Entry->save(['id' => $id, 'time' => bdate()]);
+            $ApiEntries->Entry->expects($this->once())
+                ->method('update')
+                ->will($this->returnValue(false));
+            $this->testAction(
+                $this->_apiRoot . 'entries/' . $id,
+                [
+                    'method' => 'PUT',
+                    'data' => [
+                        'subject' => 'foo',
+                        'text' => 'bar'
+                    ]
+                ]
+            );
+        }
+
+        public function testEntriesItemDisallowedRequestTypes() {
+            $this->_checkDisallowedRequestType(
+                ['GET', 'POST', 'DELETE'],
+                    $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']);
+        }
+
+        public function testThreadsItemGet() {
+            $this->generate('ApiEntries');
+            $this->_loginUser(3);
+            $result = $this->testAction(
+                $this->_apiRoot . 'threads/1.json',
+                ['method' => 'GET', 'return' => 'contents']
+            );
+            $json = <<< EOF
 				[
 					{
 						"id": 3,
@@ -345,93 +345,93 @@ 
 				}
 			]
 EOF;
-			$expected = json_decode($json, true);
-			$result = json_decode($result, true);
-			$this->assertCount(6, $result);
-			$this->assertEqual($result[2], $expected[0]);
-		}
-
-		public function testThreadsItemGetNotLoggedIn() {
-			$result = $this->testAction(
-				$this->_apiRoot . 'threads/10.json',
-				['method' => 'GET', 'return' => 'contents']
-			);
-			$result = json_decode($result, true);
-			$this->assertFalse(
-				isset($result[0]['is_locked']),
-				'Property `is_locked` should not be visible to anon user.'
-			);
-		}
+            $expected = json_decode($json, true);
+            $result = json_decode($result, true);
+            $this->assertCount(6, $result);
+            $this->assertEqual($result[2], $expected[0]);
+        }
+
+        public function testThreadsItemGetNotLoggedIn() {
+            $result = $this->testAction(
+                $this->_apiRoot . 'threads/10.json',
+                ['method' => 'GET', 'return' => 'contents']
+            );
+            $result = json_decode($result, true);
+            $this->assertFalse(
+                isset($result[0]['is_locked']),
+                'Property `is_locked` should not be visible to anon user.'
+            );
+        }
 
 /**
  * Tests that anon can't see user category
  */
-		public function testThreadsItemGetNotLoggedInCategory() {
-			$this->setExpectedException('NotFoundException', 'Thread with id `4` not found.');
-			$this->testAction(
-				$this->_apiRoot . 'threads/4.json',
-				['method' => 'GET', 'return' => 'contents']
-			);
-		}
+        public function testThreadsItemGetNotLoggedInCategory() {
+            $this->setExpectedException('NotFoundException', 'Thread with id `4` not found.');
+            $this->testAction(
+                $this->_apiRoot . 'threads/4.json',
+                ['method' => 'GET', 'return' => 'contents']
+            );
+        }
 
 /**
  * Tests that user can see user category
  */
-		public function testThreadsItemGetLoggedInCategory() {
-			$this->generate('ApiEntries');
-			$this->_loginUser(3);
-			$result = $this->testAction(
-				$this->_apiRoot . 'threads/4.json',
-				['method' => 'GET', 'return' => 'contents']
-			);
-			$result = json_decode($result, true);
-			$this->assertEqual($result[0]['id'], 4);
-		}
+        public function testThreadsItemGetLoggedInCategory() {
+            $this->generate('ApiEntries');
+            $this->_loginUser(3);
+            $result = $this->testAction(
+                $this->_apiRoot . 'threads/4.json',
+                ['method' => 'GET', 'return' => 'contents']
+            );
+            $result = json_decode($result, true);
+            $this->assertEqual($result[0]['id'], 4);
+        }
 
 /**
  * Tests that anon can't see admin category
  */
-		public function testThreadsItemGetNotAdminAnonCategory() {
-			$this->setExpectedException('NotFoundException', 'Thread with id `6` not found.');
-			$this->testAction(
-				$this->_apiRoot . 'threads/6.json',
-				['method' => 'GET', 'return' => 'contents']
-			);
-		}
+        public function testThreadsItemGetNotAdminAnonCategory() {
+            $this->setExpectedException('NotFoundException', 'Thread with id `6` not found.');
+            $this->testAction(
+                $this->_apiRoot . 'threads/6.json',
+                ['method' => 'GET', 'return' => 'contents']
+            );
+        }
 
 /**
  * Tests that user can't see admin category
  */
-		public function testThreadsItemGetNotAdminUserCategory() {
-			$this->generate('ApiEntries');
-			$this->_loginUser(3);
+        public function testThreadsItemGetNotAdminUserCategory() {
+            $this->generate('ApiEntries');
+            $this->_loginUser(3);
 
-			$this->setExpectedException('NotFoundException', 'Thread with id `6` not found.');
-			$this->testAction(
-				$this->_apiRoot . 'threads/6.json',
-				['method' => 'GET', 'return' => 'contents']
-			);
-		}
+            $this->setExpectedException('NotFoundException', 'Thread with id `6` not found.');
+            $this->testAction(
+                $this->_apiRoot . 'threads/6.json',
+                ['method' => 'GET', 'return' => 'contents']
+            );
+        }
 
 /**
  * Tests that admin can see admin category.
  */
-		public function testThreadsItemGetAdminCategory() {
-			$this->generate('ApiEntries');
-			$this->_loginUser(1);
-			$result = $this->testAction(
-				$this->_apiRoot . 'threads/6.json',
-				['method' => 'GET', 'return' => 'contents']
-			);
-			$result = json_decode($result, true);
-			$this->assertEqual($result[0]['id'], 6);
-		}
-
-		public function testThreadsItemDisallowedRequestTypes() {
-			$this->_checkDisallowedRequestType(
-				['PUT', 'POST', 'DELETE'],
-					$this->_apiRoot . 'threads/1'
-			);
-		}
-
-	}
+        public function testThreadsItemGetAdminCategory() {
+            $this->generate('ApiEntries');
+            $this->_loginUser(1);
+            $result = $this->testAction(
+                $this->_apiRoot . 'threads/6.json',
+                ['method' => 'GET', 'return' => 'contents']
+            );
+            $result = json_decode($result, true);
+            $this->assertEqual($result[0]['id'], 6);
+        }
+
+        public function testThreadsItemDisallowedRequestTypes() {
+            $this->_checkDisallowedRequestType(
+                ['PUT', 'POST', 'DELETE'],
+                    $this->_apiRoot . 'threads/1'
+            );
+        }
+
+    }

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

Spacing +2 added lines, -2 removed lines

@@ -3,9 +3,9 @@
 	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;
 		}
 

Indentation +8 added lines, -8 removed lines

@@ -1,13 +1,13 @@
 <?php
 
-	class AllApiTest extends CakeTestSuite {
+    class AllApiTest extends CakeTestSuite {
 
-		public static function suite() {
-			$testPath = CakePlugin::path('Api') . 'Test' . DS;
-			$suite = new CakeTestSuite('All Api tests.');
-			$suite->addTestDirectoryRecursive($testPath . 'Case' . DS . 'Controller');
-			return $suite;
-		}
+        public static function suite() {
+            $testPath = CakePlugin::path('Api') . 'Test' . DS;
+            $suite = new CakeTestSuite('All Api tests.');
+            $suite->addTestDirectoryRecursive($testPath . 'Case' . DS . 'Controller');
+            return $suite;
+        }
 
-	}
+    }
 

app/Plugin/Api/Config/bootstrap.php

Spacing +2 added lines, -2 removed lines

@@ -1,8 +1,8 @@
 <?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'])) {

Indentation +23 added lines, -23 removed lines

@@ -1,28 +1,28 @@
 <?php
 
-	include CakePlugin::path('Api') . 'Lib' . DS . 'exceptions.php';
+    include CakePlugin::path('Api') . 'Lib' . DS . 'exceptions.php';
 
-	$getUri = function () {
-		if (!empty($_SERVER['PATH_INFO'])) {
-			$uri = $_SERVER['PATH_INFO'];
-		} elseif (isset($_SERVER['REQUEST_URI'])) {
-				$uri = $_SERVER['REQUEST_URI'];
-		} elseif (isset($_SERVER['PHP_SELF']) && isset($_SERVER['SCRIPT_NAME'])) {
-			$uri = str_replace($_SERVER['SCRIPT_NAME'], '', $_SERVER['PHP_SELF']);
-		} elseif (isset($_SERVER['HTTP_X_REWRITE_URL'])) {
-			$uri = $_SERVER['HTTP_X_REWRITE_URL'];
-		} elseif ($var = env('argv')) {
-			$uri = $var[0];
-		}
-		return $uri;
-	};
+    $getUri = function () {
+        if (!empty($_SERVER['PATH_INFO'])) {
+            $uri = $_SERVER['PATH_INFO'];
+        } elseif (isset($_SERVER['REQUEST_URI'])) {
+                $uri = $_SERVER['REQUEST_URI'];
+        } elseif (isset($_SERVER['PHP_SELF']) && isset($_SERVER['SCRIPT_NAME'])) {
+            $uri = str_replace($_SERVER['SCRIPT_NAME'], '', $_SERVER['PHP_SELF']);
+        } elseif (isset($_SERVER['HTTP_X_REWRITE_URL'])) {
+            $uri = $_SERVER['HTTP_X_REWRITE_URL'];
+        } elseif ($var = env('argv')) {
+            $uri = $var[0];
+        }
+        return $uri;
+    };
 
-	if (strstr($getUri(), 'api/v1')) {
-		Configure::write(
-			'Exception',
-			[
-				'renderer' => 'Api.ApiExceptionRenderer'
-			]
-		);
-	}
+    if (strstr($getUri(), 'api/v1')) {
+        Configure::write(
+            'Exception',
+            [
+                'renderer' => 'Api.ApiExceptionRenderer'
+            ]
+        );
+    }
 

app/Plugin/Api/Lib/exceptions.php

Spacing +1 added lines, -1 removed lines

@@ -49,7 +49,7 @@
 	class ApiValidationError extends GenericApiError {
 
 		public function __construct($field, $rule) {
-			$lookup = $field . ' ' . $rule;
+			$lookup = $field.' '.$rule;
 			\Configure::write('Config.language', 'eng');
 			$message = __d('api', $lookup);
 			$_noExplanation = $lookup === $message;

Indentation +43 added lines, -43 removed lines

@@ -1,62 +1,62 @@
 <?php
 
 
-	// @codingStandardsIgnoreStart
-	namespace Saito\Api;
-	// @codingStandardsIgnoreEnd
+    // @codingStandardsIgnoreStart
+    namespace Saito\Api;
+    // @codingStandardsIgnoreEnd
 
 
-	class GenericApiError extends \BadRequestException {
+    class GenericApiError extends \BadRequestException {
 
-		public function __construct($message = '') {
-			if (empty($message)) {
-				$message = 'Api Error. Check URL, request type and headers.';
-			}
-			parent::__construct($message);
-		}
+        public function __construct($message = '') {
+            if (empty($message)) {
+                $message = 'Api Error. Check URL, request type and headers.';
+            }
+            parent::__construct($message);
+        }
 
-	}
+    }
 
-	class ApiDisabledException extends GenericApiError {
+    class ApiDisabledException extends GenericApiError {
 
-		public function __construct($message = '') {
-			$message = 'API is disabled.';
-			parent::__construct($message);
-		}
+        public function __construct($message = '') {
+            $message = 'API is disabled.';
+            parent::__construct($message);
+        }
 
-	}
+    }
 
-	class ApiAuthException extends GenericApiError {
+    class ApiAuthException extends GenericApiError {
 
-		public function __construct($message = '') {
-			$message = 'Route or action is not authorized.';
-			parent::__construct($message);
-		}
+        public function __construct($message = '') {
+            $message = 'Route or action is not authorized.';
+            parent::__construct($message);
+        }
 
-	}
+    }
 
-	class UnknownRouteException extends GenericApiError {
+    class UnknownRouteException extends GenericApiError {
 
-		public function __construct($message = '') {
-			if (empty($message)) {
-				$message = 'Unknown REST route. Check URL and request type (GET, POST, …).';
-			}
-			parent::__construct($message);
-		}
+        public function __construct($message = '') {
+            if (empty($message)) {
+                $message = 'Unknown REST route. Check URL and request type (GET, POST, …).';
+            }
+            parent::__construct($message);
+        }
 
-	}
+    }
 
-	class ApiValidationError extends GenericApiError {
+    class ApiValidationError extends GenericApiError {
 
-		public function __construct($field, $rule) {
-			$lookup = $field . ' ' . $rule;
-			\Configure::write('Config.language', 'eng');
-			$message = __d('api', $lookup);
-			$_noExplanation = $lookup === $message;
-			if ($_noExplanation) {
-				$message = "Internal validation error. Field: `$field` Rule: `$rule`.";
-			}
-			parent::__construct($message);
-		}
+        public function __construct($field, $rule) {
+            $lookup = $field . ' ' . $rule;
+            \Configure::write('Config.language', 'eng');
+            $message = __d('api', $lookup);
+            $_noExplanation = $lookup === $message;
+            if ($_noExplanation) {
+                $message = "Internal validation error. Field: `$field` Rule: `$rule`.";
+            }
+            parent::__construct($message);
+        }
 
-	}
\ No newline at end of file
+    }
\ No newline at end of file

app/index.php

Spacing +1 added lines, -1 removed lines

@@ -16,4 +16,4 @@
  * @license       http://www.opensource.org/licenses/mit-license.php MIT License
  */
 
-require 'webroot' . DIRECTORY_SEPARATOR . 'index.php';
+require 'webroot'.DIRECTORY_SEPARATOR.'index.php';