Schlaefer / Saito

app/Test/Case/AllModelTest.php

Spacing +1 added lines, -1 removed lines

@@ -4,7 +4,7 @@
 
 		public static function suite() {
 			$suite = new CakeTestSuite('All model tests.');
-			$suite->addTestDirectory(TESTS . 'Case' . DS . 'Model');
+			$suite->addTestDirectory(TESTS.'Case'.DS.'Model');
 			return $suite;
 		}
 

app/Test/Case/Model/UserTest.php

Spacing +3 added lines, -3 removed lines

@@ -187,7 +187,7 @@ 
 			 * but within one second time diff
 			 */
 			$diff = $now->diff($_lastLogin);
-			$result = (int)$diff->format("s");
+			$result = (int) $diff->format("s");
 			$expected = 1;
 			$this->assertLessThanOrEqual($expected, $result);
 			$this->assertGreaterThanOrEqual(0, $result);
@@ -204,7 +204,7 @@ 
 			 * but within one second time diff
 			 */
 			$diff = $now->diff($_lastLogin);
-			$result = (int)$diff->format("s");
+			$result = (int) $diff->format("s");
 			$expected = 1;
 			$this->assertLessThanOrEqual($expected, $result);
 			$this->assertGreaterThanOrEqual(0, $result);
@@ -395,7 +395,7 @@ 
 					'user_color_actual_posting' => '#',
 				),
 			);
-			$result = $this->User->read(array( 'user_color_new_postings', 'user_color_old_postings', 'user_color_actual_posting' ));
+			$result = $this->User->read(array('user_color_new_postings', 'user_color_old_postings', 'user_color_actual_posting'));
 			$this->assertEquals($expected, $result);
 		}
 

app/Test/Case/Model/EseventTest.php

Spacing +2 added lines, -2 removed lines

@@ -459,7 +459,7 @@ 
 		 */
 		public function testGetUsersForEventOnSubject() {
 			$expected = array(
-				(int)0 => array(
+				(int) 0 => array(
 					'id' => '1',
 					'username' => 'Alice',
 					'user_email' => 'alice@example.com',
@@ -470,7 +470,7 @@ 
 						'esevent_id' => '1'
 					)
 				),
-				(int)1 => array(
+				(int) 1 => array(
 					'id' => '3',
 					'username' => 'Ulysses',
 					'user_email' => 'ulysses@example.com',

app/Test/Case/Model/EntryTest.php

Spacing +9 added lines, -9 removed lines

@@ -84,7 +84,7 @@ 
 				'first',
 				['contain' => false, 'order' => ['Entry.id' => 'DESC']]
 			);
-			$expectedThreadId = (int)$lastEntry['Entry']['tid'] + 1 . '';
+			$expectedThreadId = (int) $lastEntry['Entry']['tid'] + 1.'';
 
 			$result = $this->Entry->createPosting($data);
 
@@ -191,19 +191,19 @@ 
 			// entry is not appended yet
 			$appendedEntry = $this->Entry->find(
 					'count', array(
-							'conditions' => array ('Entry.id' => 4, 'Entry.pid' => 2 )));
+							'conditions' => array('Entry.id' => 4, 'Entry.pid' => 2)));
 			$this->assertEquals($appendedEntry, 0);
 
 			// count both threads
-			$targetEntryCount = $this->Entry->find('count', array('conditions' => array ('tid' => '1')));
-			$sourceEntryCount = $this->Entry->find('count', array('conditions' => array ('tid' => '4')));
+			$targetEntryCount = $this->Entry->find('count', array('conditions' => array('tid' => '1')));
+			$sourceEntryCount = $this->Entry->find('count', array('conditions' => array('tid' => '4')));
 
 			// do the merge
 			$this->Entry->id = 4;
 			$this->Entry->threadMerge(2);
 
 			// target thread is contains now all entries
-			$targetEntryCountAfterMerge = $this->Entry->find('count', array('conditions' => array ('tid' => '1')));
+			$targetEntryCountAfterMerge = $this->Entry->find('count', array('conditions' => array('tid' => '1')));
 			$this->assertEquals($targetEntryCountAfterMerge, $sourceEntryCount + $targetEntryCount);
 
 			//appended entries have category of target thread
@@ -214,13 +214,13 @@ 
 			$this->assertEquals($targetCategoryCount, $targetEntryCount + $sourceEntryCount);
 
 			// source thread is gone
-			$sourceEntryCountAfterMerge = $this->Entry->find('count', array('conditions' => array ('tid' => '4')));
+			$sourceEntryCountAfterMerge = $this->Entry->find('count', array('conditions' => array('tid' => '4')));
 			$this->assertEquals($sourceEntryCountAfterMerge, 0);
 
 			// entry is appended now
 			$appendedEntry = $this->Entry->find(
 					'count', array(
-							'conditions' => array ('Entry.id' => 4, 'Entry.pid' => '2' )));
+							'conditions' => array('Entry.id' => 4, 'Entry.pid' => '2')));
 			$this->assertEquals($appendedEntry, 1);
 		}
 
@@ -366,7 +366,7 @@ 
 		public function testDeleteNodeCompleteThread() {
 			//* test thread exists before we delete it
 			$countBeforeDelete = $this->Entry->find('count',
-					array('conditions' => array('tid' => '1') ) );
+					array('conditions' => array('tid' => '1')));
 			$expected = 6;
 			$this->assertEquals($countBeforeDelete, $expected);
 
@@ -404,7 +404,7 @@ 
 			$this->assertTrue($result);
 
 			$result = $this->Entry->find('count',
-					array( 'conditions' => array( 'tid' => '1' ) ));
+					array('conditions' => array('tid' => '1')));
 			$expected = 0;
 			$this->assertEquals($result, $expected);
 

app/Test/Case/Model/UserOnlineTest.php

Spacing +2 added lines, -2 removed lines

@@ -28,7 +28,7 @@ 
 			$this->_startUsersOnline[0]['UserOnline'] = [
 					'uuid' => '5',
 					'user_id' => 5,
-					'time' => (string)time(),
+					'time' => (string) time(),
 					'logged_in' => true
 			];
 			$this->UserOnline->setOnline($_userId, true);
@@ -48,7 +48,7 @@ 
 			$this->_startUsersOnline[1]['UserOnline'] = [
 					'uuid' => substr(($_userId), 0, 32),
 					'user_id' => null,
-					'time' => (string)time(),
+					'time' => (string) time(),
 					'logged_in' => 0
 			];
 			$this->UserOnline->setOnline($_userId, false);

app/Test/Case/Model/CategoryTest.php

Spacing +1 added lines, -1 removed lines

@@ -4,7 +4,7 @@
 
 	class CategoryTest extends CakeTestCase {
 
-		public $fixtures = array( 'app.category', 'app.user', 'app.upload', 'app.user_online', 'app.entry' );
+		public $fixtures = array('app.category', 'app.user', 'app.upload', 'app.user_online', 'app.entry');
 
 		public function testGetCategoriesSelectForAccession() {
 			$result = $this->Category->getCategoriesForAccession(0);

app/Test/Case/Controller/UploadsControllerTest.php

Spacing +1 added lines, -1 removed lines

@@ -110,7 +110,7 @@
 
 			$this->generate('Uploads');
 			$this->_loginUser(3);
-			$result = $this->testAction( '/uploads/index', ['method' => 'GET', 'return' => 'contents']
+			$result = $this->testAction('/uploads/index', ['method' => 'GET', 'return' => 'contents']
 			);
 			$result = json_decode($result);
 			$this->assertCount(1, $result);

app/Test/Case/Controller/UsersControllerTest.php

Spacing +1 added lines, -1 removed lines

@@ -325,7 +325,7 @@
 		public function testRegisterCheckboxOnPageCustomTosUrl() {
 			Configure::write('Saito.Settings.tos_url', '');
 			$result = $this->testAction('users/register', array('return' => 'view'));
-			$this->assertContains($this->controller->request->webroot . 'pages/eng/tos', $result);
+			$this->assertContains($this->controller->request->webroot.'pages/eng/tos', $result);
 		}
 
 		/**

app/Test/Case/Controller/EntriesControllerTest.php

Spacing +8 added lines, -8 removed lines

@@ -122,7 +122,7 @@ 
 		}
 
 		public function testAddSubjectToLong() {
-			$Entries = $this->generate( 'Entries');
+			$Entries = $this->generate('Entries');
 			$this->_loginUser(1);
 
 			// maxlength attribute is set for textfield
@@ -158,7 +158,7 @@ 
 					['data' => $data, 'method' => 'POST']
 			);
 
-			$this->assertRedirectedTo('entries/view/' . $id);
+			$this->assertRedirectedTo('entries/view/'.$id);
 		}
 
 		public function testNoDirectCallOfAnsweringFormWithId() {
@@ -717,7 +717,7 @@ 
 			$Entries->Entry->expects($this->once())
 				->method('incrementViews')
 				->with($id);
-			$this->testAction('/entries/view/' . $id);
+			$this->testAction('/entries/view/'.$id);
 		}
 
 		public function testViewIncreaseViewCounterLoggedIn() {
@@ -729,7 +729,7 @@ 
 				->method('incrementViews')
 				->with($id);
 			$this->_loginUser(1);
-			$this->testAction('/entries/view/' . $id);
+			$this->testAction('/entries/view/'.$id);
 		}
 
 		/**
@@ -744,7 +744,7 @@ 
 
 			$Entries->Entry->expects($this->never())
 				->method('incrementViews');
-			$this->testAction('/entries/view/' . $id);
+			$this->testAction('/entries/view/'.$id);
 		}
 
 		/**
@@ -760,7 +760,7 @@ 
 			$Entries->Entry->expects($this->never())
 				->method('incrementViews');
 
-			$this->testAction('/entries/view/' . $id);
+			$this->testAction('/entries/view/'.$id);
 		}
 
 		public function testViewBoxFooter() {
@@ -947,8 +947,8 @@ 
 			$result = $this->testAction('/entries/index',
 				['method' => 'GET', 'return' => 'contents']);
 			$this->assertTextNotContains('noindex', $result);
-			$expected = '<link rel="canonical" href="' . Router::url('/',
-							true) . '"/>';
+			$expected = '<link rel="canonical" href="'.Router::url('/',
+							true).'"/>';
 			$this->assertTextContains($expected, $result);
 
 			Configure::write('Saito.Settings.topics_per_page', 2);