Currentライブラリを使用せずに、CurrentBaseライブラリを指定したため修正

NetCommons3 · Mar 5, 2019 · 80c659e · 80c659e
1 parent 29e3f14
commit 80c659e
Show file tree

Hide file tree

Showing 21 changed files with 69 additions and 69 deletions.
diff --git a/Model/Behavior/Nc2ToNc3BaseBehavior.php b/Model/Behavior/Nc2ToNc3BaseBehavior.php
@@ -667,7 +667,7 @@ protected function _writeCurrent($frameMap, $pluginKey) {
 
 		// @see https://github.com/NetCommons3/Workflow/blob/3.1.0/Model/Behavior/WorkflowBehavior.php#L171-L175
 		Current::write('Room.id', $nc3RoomId);
-		CurrentBase::$permission[$nc3RoomId]['Permission']['content_publishable']['value'] = true;
+		Current::$permission[$nc3RoomId]['Permission']['content_publishable']['value'] = true;
 	}
 
 /**

diff --git a/Model/Nc2ToNc3AccessCounter.php b/Model/Nc2ToNc3AccessCounter.php
@@ -110,7 +110,7 @@ private function __saveAccessCounterFromNc2($nc2Counters) {
 			$nc3RoomId = $nc3Frame['Frame']['room_id'];
 			Current::write('Plugin.key', 'access_counters');
 			Current::write('Room.id', $nc3RoomId);
-			CurrentBase::$permission[$nc3RoomId]['Permission']['content_publishable']['value'] = true;
+			Current::$permission[$nc3RoomId]['Permission']['content_publishable']['value'] = true;
 
 			// Model::idを初期化しないとUpdateになってしまう。
 			$AccessCounter->create();
@@ -129,7 +129,7 @@ private function __saveAccessCounterFromNc2($nc2Counters) {
 				continue;
 			}
 
-			unset(CurrentBase::$permission[$nc3RoomId]['Permission']['content_publishable']['value']);
+			unset(Current::$permission[$nc3RoomId]['Permission']['content_publishable']['value']);
 
 			$data = $this->__generateNc3AccessCounterFrameSettingData($nc2Counter, $nc3Frame, $AccessCounter->id);
 			$CounterFrameSetting->create();

diff --git a/Model/Nc2ToNc3Announcement.php b/Model/Nc2ToNc3Announcement.php
@@ -120,7 +120,7 @@ public function migrate() {
 			//Announcement テーブルの移行を実施。AVE前にCurrentのデータを書き換えが必要なため
 			Current::write('Plugin.key', 'announcements');
 			Current::write('Room.id', $nc3RoomId);
-			CurrentBase::$permission[$nc3RoomId]['Permission']['content_publishable']['value'] = true;
+			Current::$permission[$nc3RoomId]['Permission']['content_publishable']['value'] = true;
 
 			// Model::idを初期化しないとUpdateになってしまう。
 			$Announcement->create();
@@ -139,7 +139,7 @@ public function migrate() {
 				continue;
 			}
 
-			unset(CurrentBase::$permission[$nc3RoomId]['Permission']['content_publishable']['value']);
+			unset(Current::$permission[$nc3RoomId]['Permission']['content_publishable']['value']);
 
 			$idMap = [
 				$nc2Blockld => $Announcement->id

diff --git a/Model/Nc2ToNc3Bbs.php b/Model/Nc2ToNc3Bbs.php
@@ -158,7 +158,7 @@ private function __saveNc3BbsFromNc2($nc2Bbses) {
 				$nc3Room = $Nc2ToNc3Room->getMap($nc2Bbs['Nc2Bb']['room_id']);
 				$nc3RoomId = $nc3Room['Room']['id'];
 				Current::write('Room.id', $nc3RoomId);
-				CurrentBase::$permission[$nc3RoomId]['Permission']['content_publishable']['value'] = true;
+				Current::$permission[$nc3RoomId]['Permission']['content_publishable']['value'] = true;
 
 				$BlocksLanguage->create();
 				$Bbs->create();
@@ -181,7 +181,7 @@ private function __saveNc3BbsFromNc2($nc2Bbses) {
 					continue;
 				}
 
-				unset(CurrentBase::$permission[$nc3RoomId]['Permission']['content_publishable']['value']);
+				unset(Current::$permission[$nc3RoomId]['Permission']['content_publishable']['value']);
 
 				$nc2BbsId = $nc2Bbs['Nc2Bb']['bbs_id'];
 				$idMap = [
@@ -257,7 +257,7 @@ private function __saveNc3BbsArticleFromNc2($nc2BbsPosts) {
 				$Block->create();
 				$Topic->create();
 
-				CurrentBase::$permission[$nc3RoomId]['Permission']['content_publishable']['value'] = true;
+				Current::$permission[$nc3RoomId]['Permission']['content_publishable']['value'] = true;
 
 				// Hash::merge で BbsArticle::validate['publish_start']['datetime']['rule']が
 				// ['datetime','datetime'] になってしまうので初期化
@@ -280,7 +280,7 @@ private function __saveNc3BbsArticleFromNc2($nc2BbsPosts) {
 					continue;
 				}
 
-				unset(CurrentBase::$permission[$nc3RoomId]['Permission']['content_publishable']['value']);
+				unset(Current::$permission[$nc3RoomId]['Permission']['content_publishable']['value']);
 
 				$nc2PostId = $nc2BbsPost['Nc2BbsPost']['post_id'];
 				$idMap = [

diff --git a/Model/Nc2ToNc3Blog.php b/Model/Nc2ToNc3Blog.php
@@ -141,7 +141,7 @@ private function __saveNc3BlogFromNc2($nc2Journals) {
 				// いる？
 				$nc3RoomId = $data['Block']['room_id'];
 				Current::write('Room.id', $nc3RoomId);
-				CurrentBase::$permission[$nc3RoomId]['Permission']['content_publishable']['value'] = true;
+				Current::$permission[$nc3RoomId]['Permission']['content_publishable']['value'] = true;
 
 				$BlocksLanguage->create();
 				$Blog->create();
@@ -161,7 +161,7 @@ private function __saveNc3BlogFromNc2($nc2Journals) {
 					continue;
 				}
 
-				unset(CurrentBase::$permission[$nc3RoomId]['Permission']['content_publishable']['value']);
+				unset(Current::$permission[$nc3RoomId]['Permission']['content_publishable']['value']);
 
 				$nc2JournalId = $nc2Journal['Nc2Journal']['journal_id'];
 				$idMap = [
@@ -326,7 +326,7 @@ private function __saveNc3BlogEntryFromNc2($nc2JournalPosts) {
 
 				// @see https://github.com/NetCommons3/Workflow/blob/3.1.0/Model/Behavior/WorkflowBehavior.php#L171-L175
 				$nc3Status = $data['BlogEntry']['status'];
-				CurrentBase::$permission[$nc3RoomId]['Permission']['content_publishable']['value'] = ($nc3Status != 2);
+				Current::$permission[$nc3RoomId]['Permission']['content_publishable']['value'] = ($nc3Status != 2);
 
 				// Hash::merge で BlogEntry::validate['publish_start']['datetime']['rule']が
 				// ['datetime','datetime'] になってしまうので初期化
@@ -349,7 +349,7 @@ private function __saveNc3BlogEntryFromNc2($nc2JournalPosts) {
 					continue;
 				}
 
-				unset(CurrentBase::$permission[$nc3RoomId]['Permission']['content_publishable']['value']);
+				unset(Current::$permission[$nc3RoomId]['Permission']['content_publishable']['value']);
 
 				$nc2PostId = $nc2JournalPost['Nc2JournalPost']['post_id'];
 				$idMap = [
@@ -407,7 +407,7 @@ private function __saveNc3ContentCommentFromNc2($nc2JournalPosts) {
 
 				// @see https://github.com/NetCommons3/Workflow/blob/3.1.0/Model/Behavior/WorkflowBehavior.php#L171-L175
 				Current::write('Room.id', $nc3RoomId);
-				CurrentBase::$permission[$nc3RoomId]['Permission']['content_publishable']['value'] = ($nc3Status != 2);
+				Current::$permission[$nc3RoomId]['Permission']['content_publishable']['value'] = ($nc3Status != 2);
 
 				$ContentComment->create();
 				// 一応Model::validatの初期化
@@ -424,7 +424,7 @@ private function __saveNc3ContentCommentFromNc2($nc2JournalPosts) {
 					continue;
 				}
 
-				unset(CurrentBase::$permission[$nc3RoomId]['Permission']['content_publishable']['value']);
+				unset(Current::$permission[$nc3RoomId]['Permission']['content_publishable']['value']);
 
 				$nc2PostId = $nc2JournalPost['Nc2JournalPost']['post_id'];
 				$idMap = [

diff --git a/Model/Nc2ToNc3Cabinet.php b/Model/Nc2ToNc3Cabinet.php
@@ -139,7 +139,7 @@ private function __saveNc3CabinetFromNc2($nc2CabinetManages) {
 				$Cabinet->create();
 				$Block->create();
 
-				CurrentBase::$permission[$nc3RoomId]['Permission']['content_publishable']['value'] = true;
+				Current::$permission[$nc3RoomId]['Permission']['content_publishable']['value'] = true;
 
 				//error_log(print_r($data, true)."\n\n", 3, LOGS."/debug.log");
 				if (!$Cabinet->saveCabinet($data)) {
@@ -158,7 +158,7 @@ private function __saveNc3CabinetFromNc2($nc2CabinetManages) {
 					continue;
 				}
 
-				unset(CurrentBase::$permission[$nc3RoomId]['Permission']['content_publishable']['value']);
+				unset(Current::$permission[$nc3RoomId]['Permission']['content_publishable']['value']);
 
 				$nc2CabinetId = $nc2CabinetManage['Nc2CabinetManage']['cabinet_id'];
 
@@ -226,7 +226,7 @@ private function __saveNc3CabinetFileNc2($nc2CabinetFiles) {
 				$nc3RoomId = $Blocks['Block']['room_id'];
 				Current::write('Plugin.key', 'cabinets');
 				Current::write('Room.id', $nc3RoomId);
-				CurrentBase::$permission[$nc3RoomId]['Permission']['content_publishable']['value'] = true;
+				Current::$permission[$nc3RoomId]['Permission']['content_publishable']['value'] = true;
 
 				$BlocksLanguage->create();
 				$CabinetFile->create();
@@ -244,7 +244,7 @@ private function __saveNc3CabinetFileNc2($nc2CabinetFiles) {
 					continue;
 				}
 
-				unset(CurrentBase::$permission[$nc3RoomId]['Permission']['content_publishable']['value']);
+				unset(Current::$permission[$nc3RoomId]['Permission']['content_publishable']['value']);
 
 				$nc2CabinetFileId = $nc2CabinetFile['Nc2CabinetFile']['file_id'];
 
@@ -353,4 +353,4 @@ private function __saveFrameFromNc2($nc2CabinetBlocks) {
 		return true;
 	}
 
-}
+}
diff --git a/Model/Nc2ToNc3CircularNotice.php b/Model/Nc2ToNc3CircularNotice.php
@@ -132,7 +132,7 @@ private function __saveNc3CircularNoticeFrameSettingFromNc2($nc2CircularBlocks)
 				//$Nc2ToNc3Room = ClassRegistry::init('Nc2ToNc3.Nc2ToNc3Room');
 				$nc3RoomId = $data['Block']['room_id'];
 				Current::write('Room.id', $nc3RoomId);
-				CurrentBase::$permission[$nc3RoomId]['Permission']['content_publishable']['value'] = true;
+				Current::$permission[$nc3RoomId]['Permission']['content_publishable']['value'] = true;
 				Current::write('Plugin.key', 'circular_notices');
 
 				$BlocksLanguage->create();
@@ -154,7 +154,7 @@ private function __saveNc3CircularNoticeFrameSettingFromNc2($nc2CircularBlocks)
 					continue;
 				}
 
-				unset(CurrentBase::$permission[$nc3RoomId]['Permission']['content_publishable']['value']);
+				unset(Current::$permission[$nc3RoomId]['Permission']['content_publishable']['value']);
 
 				$nc2CircularBlockId = $nc2CircularBlock['Nc2CircularBlock']['block_id'];
 				$idMap = [];
@@ -235,7 +235,7 @@ private function __saveNc3CircularNoticeContentFromNc2($nc2Circulars) {
 				$Block->create();
 				$Topic->create();
 
-				CurrentBase::$permission[$nc3RoomId]['Permission']['content_publishable']['value'] = true;
+				Current::$permission[$nc3RoomId]['Permission']['content_publishable']['value'] = true;
 
 				// Hash::merge で BlogEntry::validate['publish_start']['datetime']['rule']が
 				// ['datetime','datetime'] になってしまうので初期化
@@ -258,7 +258,7 @@ private function __saveNc3CircularNoticeContentFromNc2($nc2Circulars) {
 					continue;
 				}
 
-				unset(CurrentBase::$permission[$nc3RoomId]['Permission']['content_publishable']['value']);
+				unset(Current::$permission[$nc3RoomId]['Permission']['content_publishable']['value']);
 
 				$nc2CircularId = $nc2Circular['Nc2Circular']['circular_id'];
 				$idMap = [
@@ -281,4 +281,4 @@ private function __saveNc3CircularNoticeContentFromNc2($nc2Circulars) {
 		return true;
 	}
 
-}
+}
diff --git a/Model/Nc2ToNc3Faq.php b/Model/Nc2ToNc3Faq.php
@@ -174,7 +174,7 @@ private function __saveFaqFromNc2($nc2Faqs) {
 
 				// 登録処理で使用しているデータを空に戻す
 				$nc3RoomId = $frameMap['Frame']['room_id'];
-				unset(CurrentBase::$permission[$nc3RoomId]['Permission']['content_publishable']['value']);
+				unset(Current::$permission[$nc3RoomId]['Permission']['content_publishable']['value']);
 
 				$nc2FaqId = $nc2Faq['Nc2Faq']['faq_id'];
 				$idMap = [
@@ -246,7 +246,7 @@ private function __saveFaqQuestionFromNc2($nc2Questions) {
 				$nc3RoomId = $mapIdList[$nc2RoomId];
 				// @see https://github.com/NetCommons3/Workflow/blob/3.1.0/Model/Behavior/WorkflowBehavior.php#L171-L175
 				Current::write('Room.id', $nc3RoomId);
-				CurrentBase::$permission[$nc3RoomId]['Permission']['content_publishable']['value'] = true;
+				Current::$permission[$nc3RoomId]['Permission']['content_publishable']['value'] = true;
 
 				// 一応Model::validatの初期化
 				$FaqQuestion->validate = [];
@@ -264,7 +264,7 @@ private function __saveFaqQuestionFromNc2($nc2Questions) {
 					continue;
 				}
 
-				unset(CurrentBase::$permission[$nc3RoomId]['Permission']['content_publishable']['value']);
+				unset(Current::$permission[$nc3RoomId]['Permission']['content_publishable']['value']);
 
 				$nc2FaqQuestionId = $nc2Question['Nc2FaqQuestion']['question_id'];
 				$idMap = [

diff --git a/Model/Nc2ToNc3Iframe.php b/Model/Nc2ToNc3Iframe.php
@@ -145,7 +145,7 @@ private function __saveIframeFromNc2($nc2Iframes) {
 
 				// 登録処理で使用しているデータを空に戻す
 				$nc3RoomId = $frameMap['Frame']['room_id'];
-				unset(CurrentBase::$permission[$nc3RoomId]['Permission']['content_publishable']['value']);
+				unset(Current::$permission[$nc3RoomId]['Permission']['content_publishable']['value']);
 
 				$nc2IframeId = $nc2Iframe['Nc2Iframe']['block_id'];
 				$idMap = [

diff --git a/Model/Nc2ToNc3Link.php b/Model/Nc2ToNc3Link.php
@@ -194,7 +194,7 @@ private function __saveLinkBlockFromNc2($nc2Linklists) {
 
 				// 登録処理で使用しているデータを空に戻す
 				//$nc3RoomId = $frameMap['Frame']['room_id'];
-				unset(CurrentBase::$permission[$nc3RoomId]['Permission']['content_publishable']['value']);
+				unset(Current::$permission[$nc3RoomId]['Permission']['content_publishable']['value']);
 
 				$nc2LinklistId = $nc2Linklist['Nc2Linklist']['linklist_id'];
 				$idMap = [
@@ -274,7 +274,7 @@ private function __saveLinkFromNc2($nc2LinklistLinks) {
 				$nc3RoomId = $mapIdList[$nc2RoomId];
 				// @see https://github.com/NetCommons3/Workflow/blob/3.1.0/Model/Behavior/WorkflowBehavior.php#L171-L175
 				Current::write('Room.id', $nc3RoomId);
-				CurrentBase::$permission[$nc3RoomId]['Permission']['content_publishable']['value'] = true;
+				Current::$permission[$nc3RoomId]['Permission']['content_publishable']['value'] = true;
 
 				// 一応Model::validatの初期化
 				$Link->validate = [];
@@ -292,7 +292,7 @@ private function __saveLinkFromNc2($nc2LinklistLinks) {
 					continue;
 				}
 
-				unset(CurrentBase::$permission[$nc3RoomId]['Permission']['content_publishable']['value']);
+				unset(Current::$permission[$nc3RoomId]['Permission']['content_publishable']['value']);
 
 				$nc2LinkId = $nc2LinklistLink['Nc2LinklistLink']['link_id'];
 				$idMap = [
@@ -415,7 +415,7 @@ private function __writeCurrent($frameMap, $pluginKey, $nc3RoomId) {
 		Current::write('Plugin.key', $pluginKey);
 		// @see https://github.com/NetCommons3/Workflow/blob/3.1.0/Model/Behavior/WorkflowBehavior.php#L171-L175
 		Current::write('Room.id', $nc3RoomId);
-		CurrentBase::$permission[$nc3RoomId]['Permission']['content_publishable']['value'] = true;
+		Current::$permission[$nc3RoomId]['Permission']['content_publishable']['value'] = true;
 	}
 }
 
diff --git a/Model/Nc2ToNc3Multidatabase.php b/Model/Nc2ToNc3Multidatabase.php
@@ -182,7 +182,7 @@ private function __saveNc3MultidatabaseFromNc2($nc2Multidatabases) {
 				// いる？
 				$nc3RoomId = $data['Block']['room_id'];
 				Current::write('Room.id', $nc3RoomId);
-				CurrentBase::$permission[$nc3RoomId]['Permission']['content_publishable']['value'] = true;
+				Current::$permission[$nc3RoomId]['Permission']['content_publishable']['value'] = true;
 
 				$BlocksLanguage->create();
 				$Multidatabase->create();
@@ -255,7 +255,7 @@ private function __saveNc3MultidatabaseFromNc2($nc2Multidatabases) {
 					continue;
 				}
 
-				unset(CurrentBase::$permission[$nc3RoomId]['Permission']['content_publishable']['value']);
+				unset(Current::$permission[$nc3RoomId]['Permission']['content_publishable']['value']);
 
 				$nc2MultidatabaseId = $nc2Multidatabase['Nc2Multidatabase']['multidatabase_id'];
 				$idMap = [
@@ -489,7 +489,7 @@ private function __saveNc3MultidbContentFromNc2($nc2MultidbContents) {
 
 				// @see https://github.com/NetCommons3/Workflow/blob/3.1.0/Model/Behavior/WorkflowBehavior.php#L171-L175
 				$nc3Status = $data['MultidatabaseContent']['status'];
-				CurrentBase::$permission[$nc3RoomId]['Permission']['content_publishable']['value'] = ($nc3Status != 2);
+				Current::$permission[$nc3RoomId]['Permission']['content_publishable']['value'] = ($nc3Status != 2);
 
 				// Hash::merge で BlogEntry::validate['publish_start']['datetime']['rule']が
 				// ['datetime','datetime'] になってしまうので初期化
@@ -553,7 +553,7 @@ private function __saveNc3MultidbContentFromNc2($nc2MultidbContents) {
 					$Like->save($data);
 				}
 
-				//unset(CurrentBase::$permission[$nc3RoomId]['Permission']['content_publishable']['value']);
+				//unset(Current::$permission[$nc3RoomId]['Permission']['content_publishable']['value']);
 
 				$nc2PostId = $nc2MultidbContent['Nc2MultidatabaseContent']['content_id'];
 				$idMap = [
@@ -612,7 +612,7 @@ private function __saveNc3ContentCommentFromNc2($nc2MultidbComments) {
 
 				// @see https://github.com/NetCommons3/Workflow/blob/3.1.0/Model/Behavior/WorkflowBehavior.php#L171-L175
 				Current::write('Room.id', $nc3RoomId);
-				CurrentBase::$permission[$nc3RoomId]['Permission']['content_publishable']['value'] = ($nc3Status != 2);
+				Current::$permission[$nc3RoomId]['Permission']['content_publishable']['value'] = ($nc3Status != 2);
 
 				$ContentComment->create();
 				// 一応Model::validatの初期化
@@ -629,7 +629,7 @@ private function __saveNc3ContentCommentFromNc2($nc2MultidbComments) {
 					continue;
 				}
 
-				unset(CurrentBase::$permission[$nc3RoomId]['Permission']['content_publishable']['value']);
+				unset(Current::$permission[$nc3RoomId]['Permission']['content_publishable']['value']);
 
 				$nc2PostId = $nc2MultidbComment['Nc2MultidatabaseComment']['comment_id'];
 				$idMap = [

diff --git a/Model/Nc2ToNc3PhotoAlbum.php b/Model/Nc2ToNc3PhotoAlbum.php
@@ -160,7 +160,7 @@ private function __savePhotoAlbumFrameSettingFromNc2($nc2PhotoalbumBlocks) {
 				}
 
 				// 登録処理で使用しているデータを空に戻す
-				unset(CurrentBase::$permission[$nc3RoomId]['Permission']['content_publishable']['value']);
+				unset(Current::$permission[$nc3RoomId]['Permission']['content_publishable']['value']);
 
 				$idMap = [
 					$nc2BlockId => $FrameSetting->id,
@@ -317,8 +317,8 @@ private function __savePhotoAlbumFromNc2($nc2PhotoalbumIdList) {
 					}
 
 					// 登録処理で使用しているデータを空に戻す
-					//unset(CurrentBase::$permission[$frameMap['Frame']['room_id']]['Permission']['content_publishable']['value']);
-					unset(CurrentBase::$permission[$nc3RoomId]['Permission']['content_publishable']['value']);
+					//unset(Current::$permission[$frameMap['Frame']['room_id']]['Permission']['content_publishable']['value']);
+					unset(Current::$permission[$nc3RoomId]['Permission']['content_publishable']['value']);
 
 					$idMap = [
 						$nc2PhotoalbumAlbum['Nc2PhotoalbumAlbum']['album_id'] => $PhotoAlbum->id,
@@ -391,7 +391,7 @@ private function __writeCurrent($frameMap, $pluginKey, $nc3RoomId) {
 		Current::write('Plugin.key', $pluginKey);
 		// @see https://github.com/NetCommons3/Workflow/blob/3.1.0/Model/Behavior/WorkflowBehavior.php#L171-L175
 		Current::write('Room.id', $nc3RoomId);
-		CurrentBase::$permission[$nc3RoomId]['Permission']['content_publishable']['value'] = true;
+		Current::$permission[$nc3RoomId]['Permission']['content_publishable']['value'] = true;
 	}
 }
 
diff --git a/Model/Nc2ToNc3Questionnaire.php b/Model/Nc2ToNc3Questionnaire.php
@@ -442,7 +442,7 @@ private function __setCurrentData($nc2QBlock) {
 
 		// @see https://github.com/NetCommons3/Workflow/blob/3.1.0/Model/Behavior/WorkflowBehavior.php#L171-L175
 		Current::write('Room.id', $nc3RoomId);
-		CurrentBase::$permission[$nc3RoomId]['Permission']['content_publishable']['value'] = true;
+		Current::$permission[$nc3RoomId]['Permission']['content_publishable']['value'] = true;
 
 		return true;
 	}
@@ -462,10 +462,10 @@ private function __unSetCurrentData() {
 		Current::remove('Room.id');
 
 		// Fatal error: Attempt to unset static property が発生。keyを指定した場合は発生しない。なんで？
-		//unset(CurrentBase::$permission);
-		$nc3RoomIds = array_keys(CurrentBase::$permission);
+		//unset(Current::$permission);
+		$nc3RoomIds = array_keys(Current::$permission);
 		foreach ($nc3RoomIds as $nc3RoomId) {
-			unset(CurrentBase::$permission[$nc3RoomId]);
+			unset(Current::$permission[$nc3RoomId]);
 		}
 	}
 }