style: phpcsエラー修正

NetCommons3/NetCommons3#1468
NetCommons3 · Oct 5, 2019 · d45af33 · d45af33
1 parent 9fec14c
commit d45af33
Show file tree

Hide file tree

Showing 3 changed files with 62 additions and 20 deletions.
diff --git a/Model/PhotoAlbumPhoto.php b/Model/PhotoAlbumPhoto.php
@@ -1,4 +1,4 @@
-<?php /** @noinspection ALL */
+<?php
 /**
  * PhotoAlbumPhoto Model
  *
@@ -16,6 +16,8 @@
 
 /**
  * Summary for PhotoAlbumPhoto Model
+ *
+ * @noinspection ALL
  */
 class PhotoAlbumPhoto extends PhotoAlbumsAppModel {
 
@@ -309,10 +311,10 @@ private function __regenerateDataForZip($data) {
 /**
  * 隠しファイル除外
  *
- * @param array $files
+ * @param array $files ファイル
  * @return array
  */
-	private function __excludeHiddenFile(array $files) {
+	private function __excludeHiddenFile($files) {
 		$excludedFiles = [];
 		foreach ($files as $file) {
 			// "."はじまりのファイル（隠しファイル）は除外

diff --git a/Test/Case/Model/PhotoAlbumPhoto/GetWorkflowConditionsTest.php b/Test/Case/Model/PhotoAlbumPhoto/GetWorkflowConditionsTest.php
@@ -26,12 +26,35 @@ class PhotoAlbumPhotoGetWorkflowConditionsTest extends NetCommonsCakeTestCase {
 		'plugin.photo_albums.photo_album_photo',
 	);
 
-	private $originPublishablePermission;
-	private $originEditablePermission;
-	private $originPermissions = [];
-	private $originCurrent =[];
+/**
+ * 元の公開権限データを保持するための変数
+ *
+ * @var array
+ */
+	private $__originPublishablePermission;
 
-	/**
+/**
+ * 元の編集権限データを保持するための変数
+ *
+ * @var array
+ */
+	private $__originEditablePermission;
+
+/**
+ * 元の権限データを保持するための変数
+ *
+ * @var array
+ */
+	private $__originPermissions = [];
+
+/**
+ * 元のCurrentのデータ
+ *
+ * @var array
+ */
+	private $__originCurrent = [];
+
+/**
  * setUp method
  *
  * @return void
@@ -98,7 +121,6 @@ public function testHasPhotoCreatable() {
 		$this->__setCurrent('Language.id', 99);
 		$this->__setCurrent('User.id', 88);
 
-
 		$expected = array (
 			array(
 				'OR' => array(
@@ -183,10 +205,10 @@ private function __permissionEditable() {
  * @return void
  */
 	private function __restorePermission() {
-		Current::writePermission(null, 'content_publishable', $this->originPublishablePermission);
-		Current::writePermission(null, 'content_publishable', $this->originEditablePermission);
+		Current::writePermission(null, 'content_publishable', $this->__originPublishablePermission);
+		Current::writePermission(null, 'content_publishable', $this->__originEditablePermission);
 
-		foreach ($this->originPermissions as $permission => $permissionValue) {
+		foreach ($this->__originPermissions as $permission => $permissionValue) {
 			Current::writePermission(null, $permission, $permissionValue);
 		}
 	}
@@ -199,17 +221,29 @@ private function __restorePermission() {
  * @return void
  */
 	private function __setPermission($permissionKey, $allow) {
-		$this->originPermissions[$permissionKey] = Current::permission($permissionKey);
+		$this->__originPermissions[$permissionKey] = Current::permission($permissionKey);
 		Current::writePermission(null, $permissionKey, $allow);
 	}
 
+/**
+ * Currentにセットする
+ *
+ * @param string $key
+ * @param mixed $value
+ * @return void
+ */
 	private function __setCurrent($key, $value) {
-		$this->originCurrent[$key] = Current::read($key);
- 		Current::write($key, $value);
+		$this->__originCurrent[$key] = Current::read($key);
+		Current::write($key, $value);
 	}
 
+/**
+ * Currentの中身をリストアする
+ *
+ * @return void
+ */
 	private function __restoreCurrent() {
-		foreach ($this->originCurrent as $key => $value) {
+		foreach ($this->__originCurrent as $key => $value) {
 			Current::write($key, $value);
 		}
 	}

diff --git a/Test/Case/Model/PhotoAlbumPhoto/PublishTest.php b/Test/Case/Model/PhotoAlbumPhoto/PublishTest.php
@@ -31,9 +31,15 @@ class PhotoAlbumPhotoPublishTest extends NetCommonsCakeTestCase {
 		'plugin.users.user',
 		'plugin.workflow.workflow_comment',
 	);
-	private $originPermission;
 
-	/**
+/**
+ * 元のCurrentのデータ
+ *
+ * @var array
+ */
+	private $__originPermission;
+
+/**
  * setUp method
  *
  * @return void
@@ -120,7 +126,7 @@ public function testPublishException() {
  * @return void
  */
 	private function __permissionPublishable() {
-		$this->originPermission = Current::permission('content_publishable');
+		$this->__originPermission = Current::permission('content_publishable');
 		Current::writePermission(null, 'content_publishable', true);
 	}
 
@@ -130,7 +136,7 @@ private function __permissionPublishable() {
  * @return void
  */
 	private function __restorePermission() {
-		Current::writePermission(null, 'content_publishable', $this->originPermission);
+		Current::writePermission(null, 'content_publishable', $this->__originPermission);
 	}
 
 }