Merge pull request #51 from s-nakajima/master

1行、100文字に修正
NetCommons3 · Apr 17, 2016 · 8ee31ff · 8ee31ff
2 parents c9b256e + 8048b89
commit 8ee31ff
Show file tree

Hide file tree

Showing 6 changed files with 62 additions and 20 deletions.
diff --git a/Controller/BbsArticlesController.php b/Controller/BbsArticlesController.php
@@ -291,10 +291,13 @@ public function reply() {
 		if ($this->request->is('post')) {
 			$data = $this->data;
 			$data['BbsArticle']['status'] = $this->Workflow->parseStatus();
-			$data['BbsArticleTree']['article_no'] = $this->BbsArticleTree->getMaxNo($data['BbsArticleTree']['root_id']) + 1;
+
+			$articleNo = $this->BbsArticleTree->getMaxNo($data['BbsArticleTree']['root_id']) + 1;
+			$data['BbsArticleTree']['article_no'] = $articleNo;
 			unset($data['BbsArticle']['id']);
 
-			if ($bbsArticle = $this->BbsArticle->saveBbsArticle($data)) {
+			$bbsArticle = $this->BbsArticle->saveBbsArticle($data);
+			if ($bbsArticle) {
 				// キューからメール送信
 				MailSend::send();
 
@@ -478,7 +481,9 @@ public function approve() {
 		}
 
 		if ($this->BbsArticle->saveCommentAsPublish($data)) {
-			$this->NetCommons->setFlashNotification(__d('net_commons', 'Successfully saved.'), array('class' => 'success'));
+			$this->NetCommons->setFlashNotification(
+				__d('net_commons', 'Successfully saved.'), array('class' => 'success')
+			);
 
 			$url = NetCommonsUrl::actionUrl(array(
 				'controller' => $this->params['controller'],

diff --git a/Controller/BbsBlockRolePermissionsController.php b/Controller/BbsBlockRolePermissionsController.php
@@ -80,7 +80,10 @@ public function edit() {
 		}
 
 		$permissions = $this->Workflow->getBlockRolePermissions(
-			array('content_creatable', 'content_publishable', 'content_comment_creatable', 'content_comment_publishable')
+			array(
+				'content_creatable', 'content_publishable',
+				'content_comment_creatable', 'content_comment_publishable'
+			)
 		);
 		$this->set('roles', $permissions['Roles']);
 

diff --git a/Controller/BbsBlocksController.php b/Controller/BbsBlocksController.php
@@ -111,7 +111,9 @@ public function add() {
 		} else {
 			//表示処理(初期データセット)
 			$this->request->data = $this->Bbs->createBbs();
-			$this->request->data = Hash::merge($this->request->data, $this->BbsFrameSetting->getBbsFrameSetting(true));
+			$this->request->data = Hash::merge(
+				$this->request->data, $this->BbsFrameSetting->getBbsFrameSetting(true)
+			);
 			$this->request->data['Frame'] = Current::read('Frame');
 		}
 	}
@@ -135,7 +137,9 @@ public function edit() {
 				return $this->throwBadRequest();
 			}
 			$this->request->data = Hash::merge($this->request->data, $bbs);
-			$this->request->data = Hash::merge($this->request->data, $this->BbsFrameSetting->getBbsFrameSetting(true));
+			$this->request->data = Hash::merge(
+				$this->request->data, $this->BbsFrameSetting->getBbsFrameSetting(true)
+			);
 			$this->request->data['Frame'] = Current::read('Frame');
 		}
 	}

diff --git a/Model/Bbs.php b/Model/Bbs.php
@@ -141,15 +141,19 @@ public function beforeValidate($options = array()) {
 		if (isset($this->data['BbsSetting'])) {
 			$this->BbsSetting->set($this->data['BbsSetting']);
 			if (! $this->BbsSetting->validates()) {
-				$this->validationErrors = Hash::merge($this->validationErrors, $this->BbsSetting->validationErrors);
+				$this->validationErrors = Hash::merge(
+					$this->validationErrors, $this->BbsSetting->validationErrors
+				);
 				return false;
 			}
 		}
 
 		if (isset($this->data['BbsFrameSetting']) && ! $this->data['BbsFrameSetting']['id']) {
 			$this->BbsFrameSetting->set($this->data['BbsFrameSetting']);
 			if (! $this->BbsFrameSetting->validates()) {
-				$this->validationErrors = Hash::merge($this->validationErrors, $this->BbsFrameSetting->validationErrors);
+				$this->validationErrors = Hash::merge(
+					$this->validationErrors, $this->BbsFrameSetting->validationErrors
+				);
 				return false;
 			}
 		}
@@ -179,7 +183,9 @@ public function afterSave($created, $options = array()) {
 		}
 
 		//BbsFrameSetting登録
-		if (isset($this->BbsFrameSetting->data['BbsFrameSetting']) && ! $this->BbsFrameSetting->data['BbsFrameSetting']['id']) {
+		if (isset($this->BbsFrameSetting->data['BbsFrameSetting']) &&
+				! $this->BbsFrameSetting->data['BbsFrameSetting']['id']) {
+
 			if (! $this->BbsFrameSetting->save(null, false)) {
 				throw new InternalErrorException(__d('net_commons', 'Internal Server Error'));
 			}
@@ -305,15 +311,18 @@ public function deleteBbs($data) {
 				throw new InternalErrorException(__d('net_commons', 'Internal Server Error'));
 			}
 
-			if (! $this->BbsSetting->deleteAll(array($this->BbsSetting->alias . '.bbs_key' => $data['Bbs']['key']), false, false)) {
+			$conditions = array($this->BbsSetting->alias . '.bbs_key' => $data['Bbs']['key']);
+			if (! $this->BbsSetting->deleteAll($conditions, false, false)) {
 				throw new InternalErrorException(__d('net_commons', 'Internal Server Error'));
 			}
 
-			if (! $this->BbsArticle->deleteAll(array($this->BbsArticle->alias . '.bbs_id' => $bbsIds), false, false)) {
+			$conditions = array($this->BbsArticle->alias . '.bbs_id' => $bbsIds);
+			if (! $this->BbsArticle->deleteAll($conditions, false, false)) {
 				throw new InternalErrorException(__d('net_commons', 'Internal Server Error'));
 			}
 
-			if (! $this->BbsArticleTree->deleteAll(array($this->BbsArticleTree->alias . '.bbs_key' => $data['Bbs']['key']), false, false)) {
+			$conditions = array($this->BbsArticleTree->alias . '.bbs_key' => $data['Bbs']['key']);
+			if (! $this->BbsArticleTree->deleteAll($conditions, false, false)) {
 				throw new InternalErrorException(__d('net_commons', 'Internal Server Error'));
 			}
 

diff --git a/Model/BbsArticle.php b/Model/BbsArticle.php
@@ -142,7 +142,9 @@ public function beforeValidate($options = array()) {
 		if (isset($this->data['BbsArticleTree'])) {
 			$this->BbsArticleTree->set($this->data['BbsArticleTree']);
 			if (! $this->BbsArticleTree->validates()) {
-				$this->validationErrors = Hash::merge($this->validationErrors, $this->BbsArticleTree->validationErrors);
+				$this->validationErrors = Hash::merge(
+					$this->validationErrors, $this->BbsArticleTree->validationErrors
+				);
 				return false;
 			}
 		}
@@ -164,7 +166,8 @@ public function afterSave($created, $options = array()) {
 		//BbsArticleTree登録
 		if (isset($this->BbsArticleTree->data['BbsArticleTree'])) {
 			if (! $this->BbsArticleTree->data['BbsArticleTree']['bbs_article_key']) {
-				$this->BbsArticleTree->data['BbsArticleTree']['bbs_article_key'] = $this->data[$this->alias]['key'];
+				$key = $this->data[$this->alias]['key'];
+				$this->BbsArticleTree->data['BbsArticleTree']['bbs_article_key'] = $key;
 			}
 			if (! $this->BbsArticleTree->save(null, false)) {
 				throw new InternalErrorException(__d('net_commons', 'Internal Server Error'));
@@ -173,12 +176,18 @@ public function afterSave($created, $options = array()) {
 
 		//Bbsのbbs_article_count、bbs_article_modified
 		if (isset($this->data['Bbs']['id']) && isset($this->data['Bbs']['key'])) {
-			$this->updateBbsByBbsArticle($this->data['Bbs']['id'], $this->data['Bbs']['key'], $this->data[$this->alias]['language_id']);
+			$this->updateBbsByBbsArticle(
+				$this->data['Bbs']['id'],
+				$this->data['Bbs']['key'], $this->data[$this->alias]['language_id']
+			);
 		}
 
 		//コメント数の更新
 		if (isset($this->data['BbsArticleTree']['root_id']) && $this->data['BbsArticleTree']['root_id']) {
-			$this->updateBbsArticleChildCount($this->data['BbsArticleTree']['root_id'], $this->data[$this->alias]['language_id']);
+			$this->updateBbsArticleChildCount(
+				$this->data['BbsArticleTree']['root_id'],
+				$this->data[$this->alias]['language_id']
+			);
 		}
 
 		parent::afterSave($created, $options);
@@ -253,7 +262,9 @@ public function deleteBbsArticle($data) {
 
 		try {
 			//Treeデータの削除
-			$conditions = array($this->BbsArticleTree->alias . '.bbs_article_key' => $this->data['BbsArticle']['key']);
+			$conditions = array(
+				$this->BbsArticleTree->alias . '.bbs_article_key' => $this->data['BbsArticle']['key']
+			);
 			if (! $this->BbsArticleTree->deleteAll($conditions, false, true)) {
 				throw new InternalErrorException(__d('net_commons', 'Internal Server Error'));
 			}
@@ -267,10 +278,16 @@ public function deleteBbsArticle($data) {
 			$this->deleteCommentsByContentKey($this->data['BbsArticle']['key']);
 
 			//Bbsのbbs_article_count、bbs_article_modified
-			$this->updateBbsByBbsArticle($this->data['Bbs']['id'], $data['Bbs']['key'], $this->data['BbsArticle']['language_id']);
+			$this->updateBbsByBbsArticle(
+				$this->data['Bbs']['id'], $data['Bbs']['key'],
+				$this->data['BbsArticle']['language_id']
+			);
 
 			//コメント数の更新
-			$this->updateBbsArticleChildCount($this->data['BbsArticleTree']['root_id'], $this->data['BbsArticle']['language_id']);
+			$this->updateBbsArticleChildCount(
+				$this->data['BbsArticleTree']['root_id'],
+				$this->data['BbsArticle']['language_id']
+			);
 
 			//トランザクションCommit
 			$this->commit();
@@ -306,7 +323,10 @@ public function saveCommentAsPublish($data) {
 			}
 
 			//コメント数の更新
-			$this->updateBbsArticleChildCount($data['BbsArticleTree']['root_id'], $data['BbsArticle']['language_id']);
+			$this->updateBbsArticleChildCount(
+				$data['BbsArticleTree']['root_id'],
+				$data['BbsArticle']['language_id']
+			);
 
 			//トランザクションCommit
 			$this->commit();

diff --git a/Test/Case/Controller/BbsArticlesController/ApproveTest.php b/Test/Case/Controller/BbsArticlesController/ApproveTest.php
@@ -263,6 +263,7 @@ public function testApprovePut($data, $role, $urlOptions, $exception = null, $re
 		if ($exception === 'BadRequestException' && array_key_exists('save_3', $data)) {
 			$this->_mockForReturnFalse('Bbses.BbsArticle', 'saveCommentAsPublish');
 		}
+		$this->controller->BbsArticle->Behaviors->unload('Mails.MailQueue');
 
 		//テスト実施
 		$this->_testPostAction('put', $data, Hash::merge(array('action' => 'approve'), $urlOptions), $exception, $return);