satthi / Contents-file

src/Controller/ContentsFileController.php

Doc Comments +6 added lines

@@ -84,6 +84,9 @@ 
 
     }
     
+    /**
+     * @param string $ext
+     */
     private function getFileType($ext){
         $aContentTypes = [
         'txt'=>'text/plain',
@@ -142,6 +145,9 @@ 
         return $sContentType;
     }
     
+    /**
+     * @param string $filepath
+     */
     private function __resizeSet($filepath, $resize){
         if (empty($resize['width'])){
             $resize['width'] = 0;

Unused Use Statements -2 removed lines

@@ -2,8 +2,6 @@
 namespace ContentsFile\Controller;
 
 use ContentsFile\Controller\AppController;
-use Cake\Event\Event;
-use Cake\Core\Configure;
 use Cake\ORM\TableRegistry;
 use Cake\Utility\Inflector;
 

Spacing +20 added lines, -20 removed lines

@@ -12,7 +12,7 @@ 
     private $__baseModel;
     private $__attachmentModel;
     
-    public function loader(){
+    public function loader() {
         $this->autoRender = false;
 
         $model = $this->request->query['model'];
@@ -23,13 +23,13 @@ 
 
         $contentsFileConfig = $entity->contentsFileConfig;
         
-        if (!empty($this->request->query['tmp_file_name'])){
+        if (!empty($this->request->query['tmp_file_name'])) {
             $filename = $this->request->query['tmp_file_name'];
             $filepath = $contentsFileConfig['fields'][$field_name]['cacheTempDir'] . $filename;
-        } elseif (!empty($this->request->query['model_id'])){
+        } elseif (!empty($this->request->query['model_id'])) {
             //表示条件をチェックする
             $check_method_name = 'contentsFileCheck' . Inflector::camelize($field_name);
-            if (method_exists($this->__baseModel, $check_method_name)){
+            if (method_exists($this->__baseModel, $check_method_name)) {
                 //エラーなどの処理はTableに任せる
                 $this->__baseModel->{$check_method_name}($this->request->query['model_id']);
             }
@@ -41,22 +41,22 @@ 
                 ->where(['field_name' => $this->request->query['field_name']])
                 ->first()
             ;
-            if (empty($attachmentData)){
+            if (empty($attachmentData)) {
                 //404
             }
             $filename = $attachmentData->file_name;
             $filepath = $contentsFileConfig['fields'][$field_name]['filePath'] . $attachmentData->model . '/' . $attachmentData->model_id . '/' . $attachmentData->field_name;
             
             //通常のセットの時のみresize設定があれば見る
-            if (!empty($this->request->query['resize'])){
+            if (!empty($this->request->query['resize'])) {
                 $filepath = $this->__resizeSet($filepath, $this->request->query['resize']);
             }
         
         }
         
         $file_ext = null;
-        if (preg_match('/\.([^\.]*)$/', $filename, $ext)){
-            if ($ext[1]){
+        if (preg_match('/\.([^\.]*)$/', $filename, $ext)) {
+            if ($ext[1]) {
                 $file_ext = strtolower($ext[1]);
             }
         }
@@ -65,10 +65,10 @@ 
         $file = $filepath;
 
         header('Content-Length: ' . filesize($file));
-        if(!empty($file_ext)){
+        if (!empty($file_ext)) {
             $fileContentType = $this->getFileType($file_ext);
             header('Content-Type: ' . $fileContentType);
-        }else{
+        } else {
             $fileContentType = $this->getMimeType($file);
             header('Content-Type: ' . $fileContentType);
         }
@@ -84,7 +84,7 @@ 
 
     }
     
-    private function getFileType($ext){
+    private function getFileType($ext) {
         $aContentTypes = [
         'txt'=>'text/plain',
         'htm'=>'text/html',
@@ -105,7 +105,7 @@ 
     ]; 
         $sContentType = 'application/octet-stream';
         
-        if (!empty($aContentTypes[$ext])){
+        if (!empty($aContentTypes[$ext])) {
             $sContentType = $aContentTypes[$ext];
         }
         return $sContentType;
@@ -134,34 +134,34 @@ 
         
         if (($pos = strrpos($filename, ".")) !== false) {
             // 拡張子がある場合
-            $ext = strtolower(substr($filename, $pos+1));
+            $ext = strtolower(substr($filename, $pos + 1));
             if (strlen($ext)) {
-                return $aContentTypes[$ext]?$aContentTypes[$ext]:$sContentType;
+                return $aContentTypes[$ext] ? $aContentTypes[$ext] : $sContentType;
             }
         }
         return $sContentType;
     }
     
-    private function __resizeSet($filepath, $resize){
-        if (empty($resize['width'])){
+    private function __resizeSet($filepath, $resize) {
+        if (empty($resize['width'])) {
             $resize['width'] = 0;
         }
-        if (empty($resize['height'])){
+        if (empty($resize['height'])) {
             $resize['height'] = 0;
         }
         //両方ゼロの場合はそのまま返す
-        if ($resize['width'] == 0 && $resize['height'] == 0){
+        if ($resize['width'] == 0 && $resize['height'] == 0) {
             return $filepath;
         }
         $imagepathinfo = $this->__baseModel->getPathinfo($filepath, $resize);
         
         //ファイルの存在チェック
-        if (file_exists($imagepathinfo['resize_filepath'])){
+        if (file_exists($imagepathinfo['resize_filepath'])) {
             return $imagepathinfo['resize_filepath'];
         }
         
         //ない場合はリサイズを実行
-        if (!$this->__baseModel->imageResize($filepath, $resize)){
+        if (!$this->__baseModel->imageResize($filepath, $resize)) {
             //失敗時はそのままのパスを返す(画像以外の可能性あり)
             return $filepath;
         }

Braces +1 added lines, -1 removed lines

@@ -68,7 +68,7 @@
         if(!empty($file_ext)){
             $fileContentType = $this->getFileType($file_ext);
             header('Content-Type: ' . $fileContentType);
-        }else{
+        } else{
             $fileContentType = $this->getMimeType($file);
             header('Content-Type: ' . $fileContentType);
         }

src/Model/Behavior/ContentsFileBehavior.php

Doc Comments +19 added lines, -1 removed lines

@@ -92,6 +92,10 @@ 
      * imageResize
      * 画像のリサイズ処理(外からでもたたけるようにpublicにする
      */
+
+    /**
+     * @param string $imagePath
+     */
     public function imageResize($imagePath, $baseSize) {
         if (file_exists($imagePath) === false) {
             return false;
@@ -213,6 +217,11 @@ 
      * __fileMove
      * ファイルの移動(元ファイルがいたときのことを考えてbackupファイルを作成する
      */
+
+    /**
+     * @param string $tmpFile
+     * @param string $new_filepath
+     */
     private function __fileMove($tmpFile, $new_filepath){
         if (file_exists($new_filepath)){
             $pathinfo = $this->getPathInfo($new_filepath);
@@ -226,6 +235,10 @@ 
      * __resizeDirRemove
      * リサイズディレクトリの削除
      */
+
+    /**
+     * @param string $new_filepath
+     */
     private function __resizeDirRemove($new_filepath){
         $imagepathinfo = $this->getPathInfo($new_filepath);
         $this->__recursiveRemoveDir($imagepathinfo['resize_dir']);
@@ -238,7 +251,7 @@ 
      *
      * @param $dir
      * @return
-     * @access protected
+     boolean @access protected
      */
     private function __recursiveRemoveDir($dir) {
         if (is_dir($dir)) {
@@ -349,6 +362,11 @@ 
      * __mkdir
      * ディレクトリの作成(パーミッションの設定のため
      */
+
+    /**
+     * @param integer $permission
+     * @param boolean $recursive
+     */
     private function __mkdir($path, $permission, $recursive){
         if (is_dir($path)){
             return true;

Spacing +27 added lines, -27 removed lines

@@ -21,14 +21,14 @@ 
         //設定値をentityから取得
         $contentsFileConfig = $entity->contentsFileConfig;
         $this->__attachmentModel = TableRegistry::get('Attachments');
-        foreach ($contentsFileConfig['fields'] as $field => $field_settings){
+        foreach ($contentsFileConfig['fields'] as $field => $field_settings) {
             //contents_file_の方に入ったentityをベースに処理する
             $file_info = $entity->{'contents_file_' . $field};
             if (
                 !empty($file_info) &&
                 //tmp_file_nameがある=アップロードしたファイルがある
                 array_key_exists('tmp_file_name', $file_info)
-            ){
+            ) {
                 $attachmentSaveData = [
                     'model' => $this->_table->alias(),
                     'model_id' => $entity->id,
@@ -43,9 +43,9 @@ 
                 $new_filepath = $new_filedir . $file_info['field_name'];
                 if (
                     !$this->__mkdir($new_filedir, 0777, true) || 
-                    $this->__fileMove($field_settings['cacheTempDir'] . $file_info['tmp_file_name'] , $new_filepath)
+                    $this->__fileMove($field_settings['cacheTempDir'] . $file_info['tmp_file_name'], $new_filepath)
                     
-                ){
+                ) {
                     //失敗時はロールバック
                     $this->__fileRollback($contentsFileConfig, $entity->id);
                     return false;
@@ -55,9 +55,9 @@ 
                 $this->__resizeDirRemove($new_filepath);
                 
                 //リサイズ画像作成
-                if (!empty($field_settings['resize'])){
-                    foreach ($field_settings['resize'] as $resize_settings){
-                        if (!$this->imageResize($new_filepath, $resize_settings)){
+                if (!empty($field_settings['resize'])) {
+                    foreach ($field_settings['resize'] as $resize_settings) {
+                        if (!$this->imageResize($new_filepath, $resize_settings)) {
                             //失敗時はロールバック
                             $this->__fileRollback($contentsFileConfig, $entity->id);
                             return false;
@@ -71,7 +71,7 @@ 
                     ->where(['model_id' => $entity->id])
                     ->where(['field_name' => $file_info['field_name']])
                     ->first(1);
-                if (!empty($attachmentDataCheck)){
+                if (!empty($attachmentDataCheck)) {
                     $attachmentEntity->id = $attachmentDataCheck->id;
                 }
                 if (!$this->__attachmentModel->save($attachmentEntity)) {
@@ -186,7 +186,7 @@ 
         //resizeファイルを格納するディレクトリを作成
         if (
             !$this->__mkdir($imagepathinfo['resize_dir'], 0777, true)
-        ){
+        ) {
             return false;
         }
         
@@ -213,20 +213,20 @@ 
      * __fileMove
      * ファイルの移動(元ファイルがいたときのことを考えてbackupファイルを作成する
      */
-    private function __fileMove($tmpFile, $new_filepath){
-        if (file_exists($new_filepath)){
+    private function __fileMove($tmpFile, $new_filepath) {
+        if (file_exists($new_filepath)) {
             $pathinfo = $this->getPathInfo($new_filepath);
             //旧ファイルをバックアップとしてとっておく
-            rename($new_filepath,$pathinfo['backup_filepath']);
+            rename($new_filepath, $pathinfo['backup_filepath']);
         }
-        return !rename($tmpFile , $new_filepath);
+        return !rename($tmpFile, $new_filepath);
     }
     
     /*
      * __resizeDirRemove
      * リサイズディレクトリの削除
      */
-    private function __resizeDirRemove($new_filepath){
+    private function __resizeDirRemove($new_filepath) {
         $imagepathinfo = $this->getPathInfo($new_filepath);
         $this->__recursiveRemoveDir($imagepathinfo['resize_dir']);
     }
@@ -260,14 +260,14 @@ 
      * __fileCommit
      * 保存成功時の処理(backupファイルを削除)
      */
-    private function __fileCommit($contentsFileConfig, $target_id){
+    private function __fileCommit($contentsFileConfig, $target_id) {
         //back削除する
-        foreach ($contentsFileConfig['fields'] as $field => $fieldSetting){
+        foreach ($contentsFileConfig['fields'] as $field => $fieldSetting) {
             $new_filedir = $fieldSetting['filePath'] . $this->_table->alias() . '/' . $target_id . '/';
             $new_filepath = $new_filedir . $field;
             $new_filepath_pathinfo = $this->getPathInfo($new_filepath);
             
-            if (file_exists($new_filepath_pathinfo['backup_filepath'])){
+            if (file_exists($new_filepath_pathinfo['backup_filepath'])) {
                 //旧ファイルを元に戻す
                 unlink($new_filepath_pathinfo['backup_filepath']);
             }
@@ -279,21 +279,21 @@ 
      * __fileRollback
      * 保存失敗時の処理 アップロードファイルを削除しバックアップファイルを元に戻す
      */
-    private function __fileRollback($contentsFileConfig, $target_id){
+    private function __fileRollback($contentsFileConfig, $target_id) {
         //backを元に戻す
-        foreach ($contentsFileConfig['fields'] as $field => $fieldSetting){
+        foreach ($contentsFileConfig['fields'] as $field => $fieldSetting) {
             $new_filedir = $fieldSetting['filePath'] . $this->_table->alias() . '/' . $target_id . '/';
             $new_filepath = $new_filedir . $field;
             $new_filepath_pathinfo = $this->getPathInfo($new_filepath);
             $backup_file = $new_filepath_pathinfo['backup_filepath'];
-            if (file_exists($new_filepath)){
+            if (file_exists($new_filepath)) {
                 //新規に登録したファイルを削除
                 unlink($new_filepath);
                 //resizeDirも削除(これはアクセス時に復元可能なため
                 $this->__resizeDirRemove($new_filepath);
             }
             
-            if (file_exists($new_filepath_pathinfo['backup_filepath'])){
+            if (file_exists($new_filepath_pathinfo['backup_filepath'])) {
                 //旧ファイルを元に戻す
                 rename($new_filepath_pathinfo['backup_filepath'], $new_filepath);
             }
@@ -349,8 +349,8 @@ 
      * __mkdir
      * ディレクトリの作成(パーミッションの設定のため
      */
-    private function __mkdir($path, $permission, $recursive){
-        if (is_dir($path)){
+    private function __mkdir($path, $permission, $recursive) {
+        if (is_dir($path)) {
             return true;
         }
         $oldumask = umask(0);
@@ -363,17 +363,17 @@ 
      * getPathInfo
      * 通常のpathinfoに加えてContentsFile独自のpathも一緒に設定する
      */
-    public function getPathInfo($imagePath, $resize = []){
+    public function getPathInfo($imagePath, $resize = []) {
         $pathinfo = pathinfo($imagePath);
         $pathinfo['resize_dir'] = $pathinfo['dirname'] . '/contents_file_resize_' . $pathinfo['filename'];
         $pathinfo['backup_filepath'] = $pathinfo['dirname'] . '/contents_file_back_' . $pathinfo['filename'];
         //一旦ベースのパスを通しておく
         $pathinfo['resize_filepath'] = $imagePath;
-        if (!empty($resize)){
-            if (!isset($resize['width'])){
+        if (!empty($resize)) {
+            if (!isset($resize['width'])) {
                 $resize['width'] = 0;
             }
-            if (!isset($resize['height'])){
+            if (!isset($resize['height'])) {
                 $resize['height'] = 0;
             }
             $pathinfo['resize_filepath'] = $pathinfo['resize_dir'] . '/' . $resize['width'] . '_' . $resize['height'];

Braces +8 added lines, -5 removed lines

@@ -245,9 +245,11 @@ 
             $objects = scandir($dir);
             foreach ($objects as $object) {
                 if ($object != "." && $object != "..") {
-                    if (filetype($dir . "/" . $object) == "dir")
-                        $this->_recursiveRemoveDir($dir . "/" . $object); else
-                        @unlink($dir . "/" . $object);
+                    if (filetype($dir . "/" . $object) == "dir") {
+                                            $this->_recursiveRemoveDir($dir . "/" . $object);
+                    } else {
+                                                @unlink($dir . "/" . $object);
+                        }
                 }
             }
             reset($objects);
@@ -333,8 +335,9 @@ 
                     break;
                 }
             }
-            if (!isset($tp) || $tp !== null)
-                break;
+            if (!isset($tp) || $tp !== null) {
+                            break;
+            }
         }
         // 透過GIF
         if (isset($tp) && is_array($tp)) {

src/Model/Entity/ContentsFileTrait.php

Unused Use Statements +2 added lines, -2 removed lines

@@ -2,8 +2,8 @@
 

 namespace ContentsFile\Model\Entity;

 

-use Cake\Utility\Security;

-use Cake\ORM\TableRegistry;

+use Cake\Utility\Security;
+use Cake\ORM\TableRegistry;
 use Cake\I18n\Time;

 

 trait ContentsFileTrait

Spacing +14 added lines, -14 removed lines

@@ -19,20 +19,20 @@ 
         //設定値はまとめる

         $settings = $this->contentsFileConfig;

         

-        $this->__contentsFileSettings = array_merge($default,$settings);

+        $this->__contentsFileSettings = array_merge($default, $settings);

     }

     

-    public function getContentsFile($property, $value){

+    public function getContentsFile($property, $value) {

         $this->__contentsFileSettings();

         if (

             //attachmentにデータが登録時のみ

             !empty($this->id) && 

             //設定値に設定されているとき

             preg_match('/^contents_file_(.*)$/', $property, $match) &&

-            array_key_exists($match[1] , $this->__contentsFileSettings['fields'])// &&

-        ){

+            array_key_exists($match[1], $this->__contentsFileSettings['fields'])// &&

+        ) {

             //何もセットされていないとき

-            if (empty($this->_properties[$property])){

+            if (empty($this->_properties[$property])) {

                 //attachmentからデータを探しに行く

                 $this->__attachmentModel = TableRegistry::get('Attachments');

                 $attachmentData = $this->__attachmentModel->find('all')

@@ -41,7 +41,7 @@ 
                     ->where(['field_name' => $match[1]])

                     ->first()

                 ;

-                if (!empty($attachmentData)){

+                if (!empty($attachmentData)) {

                     $value = [

                         'model' => $attachmentData->model,

                         'model_id' => $attachmentData->model_id,

@@ -59,9 +59,9 @@ 
         return $value;

     }

     

-    public function setContentsFile(){

+    public function setContentsFile() {

         $this->__contentsFileSettings();

-        foreach ($this->__contentsFileSettings['fields'] as $field => $field_setting){

+        foreach ($this->__contentsFileSettings['fields'] as $field => $field_setting) {

             $file_info = $this->{$field};

             if (

                 //ファイルの情報がある

@@ -82,13 +82,13 @@ 
                 ];

                 

                 //$file_infoにtmp_nameがいるときはtmpディレクトリへのファイルのコピーを行う

-                if (!empty($file_info['tmp_name'])){

+                if (!empty($file_info['tmp_name'])) {

                     $tmp_file_name = Security::hash(rand() . Time::now()->i18nFormat('YYYY/MM/dd HH:ii:ss') . $file_info['name']);

                     

-                    if ($this->__getExt($file_info['name']) !== null ){

+                    if ($this->__getExt($file_info['name']) !== null) {

                         $tmp_file_name .= '.' . $this->__getExt($file_info['name']);

                     }

-                    if (!copy($file_info['tmp_name'], $field_setting['cacheTempDir'] . $tmp_file_name)){

+                    if (!copy($file_info['tmp_name'], $field_setting['cacheTempDir'] . $tmp_file_name)) {

                         //エラー

                     }

                     $file_set['tmp_file_name'] = $tmp_file_name;

@@ -103,10 +103,10 @@ 
         return $this;

     }

     

-    private function __getExt($file){

-        $file_explode = explode('.',$file);

+    private function __getExt($file) {

+        $file_explode = explode('.', $file);

         //この場合拡張子なし

-        if (count($file_explode) == 1){

+        if (count($file_explode) == 1) {

             return null;

         }

         return $file_explode[(count($file_explode) - 1)];

config/routes.php

Spacing +1 added lines, -1 removed lines

@@ -1,6 +1,6 @@
 <?php
 use Cake\Routing\Router;
 
-Router::plugin('ContentsFile', function ($routes) {
+Router::plugin('ContentsFile', function($routes) {
     $routes->fallbacks('InflectedRoute');
 });

src/Validation/ContentsFileValidation.php

Indentation +1 added lines, -1 removed lines

@@ -13,7 +13,7 @@
     
     
     public static function uploadMaxSizeCheck ($value,$context){
-       return $value['error'] != UPLOAD_ERR_INI_SIZE;
+        return $value['error'] != UPLOAD_ERR_INI_SIZE;
     }
     
     /**

Spacing +2 added lines, -2 removed lines

@@ -6,13 +6,13 @@
 
 class ContentsFileValidation extends Validation
 {
-    public static function checkMaxSize ($value, $max, $context){
+    public static function checkMaxSize($value, $max, $context) {
         $max_value = ContentsFileValidation::__calcFileSizeUnit($max);
         return $max_value >= $value['size'];
     }
     
     
-    public static function uploadMaxSizeCheck ($value,$context){
+    public static function uploadMaxSizeCheck($value, $context) {
        return $value['error'] != UPLOAD_ERR_INI_SIZE;
     }
     

src/View/Helper/ContentsFileHelper.php

Spacing +11 added lines, -11 removed lines

@@ -14,10 +14,10 @@ 
 
     public function link($file_info, $options = [], $title = null) {
         //一時パス用の設定
-        if ($title === null){
+        if ($title === null) {
             $title = $file_info['file_name'];
         }
-        if (isset($options['resize'])){
+        if (isset($options['resize'])) {
             $file_info['resize'] = $options['resize'];
             unset($options['resize']);
         }
@@ -34,25 +34,25 @@ 
     }
     
     public function image($file_info, $options = []) {
-        if (!empty($file_info)){
-            if (isset($options['resize'])){
+        if (!empty($file_info)) {
+            if (isset($options['resize'])) {
                 $file_info['resize'] = $options['resize'];
                 unset($options['resize']);
             }
-            return $this->Html->image($this->__urlArray($file_info) ,$options);
+            return $this->Html->image($this->__urlArray($file_info), $options);
         }
         return '';
     }
 
-    public function url($file_info, $full = false){
-        if (!isset($file_info['resize'])){
+    public function url($file_info, $full = false) {
+        if (!isset($file_info['resize'])) {
             $file_info['resize'] = false;
         }
-        return $this->Url->build($this->__urlArray($file_info),$full);
+        return $this->Url->build($this->__urlArray($file_info), $full);
     }
     
-    private function __urlArray($file_info){
-        if (!empty($file_info['tmp_file_name'])){
+    private function __urlArray($file_info) {
+        if (!empty($file_info['tmp_file_name'])) {
             return [
                 'controller' => 'contents_file',
                 'action' => 'loader',
@@ -62,7 +62,7 @@ 
                 'tmp_file_name' => $file_info['tmp_file_name'],
             ];
         } else {
-            if (!isset($file_info['resize'])){
+            if (!isset($file_info['resize'])) {
                 $file_info['resize'] = false;
             }
             return [