satthi / Contents-file

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;
     }
     
     /**

src/Controller/Traits/NormalContentsFileControllerTrait.php

Doc Comments +1 added lines

@@ -76,6 +76,7 @@
      * normalResizeSet
      * 通常のリサイズ処理
      * @author hagiwara
+     * @param string $filepath
      */
     private function normalResizeSet($filepath, $resize)
     {

Spacing +1 added lines, -1 removed lines

@@ -61,7 +61,7 @@
         $file = $filepath;
 
         header('Content-Length: ' . filesize($file));
-        if(!empty($fileExt)) {
+        if (!empty($fileExt)) {
             $fileContentType = $this->getFileType($fileExt);
             header('Content-Type: ' . $fileContentType);
         } else {

src/Controller/Traits/S3ContentsFileControllerTrait.php

Doc Comments +1 added lines

@@ -73,6 +73,7 @@
      * s3ResizeSet
      * S3のリサイズ処理
      * @author hagiwara
+     * @param string $filepath
      */
     private function s3ResizeSet($filepath, $resize)
     {

src/Model/Behavior/ContentsFileBehavior.php

Doc Comments +2 added lines

@@ -321,6 +321,8 @@
      * mkdir
      * ディレクトリの作成(パーミッションの設定のため
      * @author hagiwara
+     * @param integer $permission
+     * @param boolean $recursive
      */
     private function mkdir($path, $permission, $recursive)
     {

Braces +3 added lines, -2 removed lines

@@ -283,8 +283,9 @@
                     break;
                 }
             }
-            if (!isset($tp) || $tp !== null)
-                break;
+            if (!isset($tp) || $tp !== null) {
+                            break;
+            }
         }
         // 透過GIF
         if (isset($tp) && is_array($tp)) {

src/Model/Behavior/Traits/NormalContentsFileBehaviorTrait.php

Doc Comments +3 added lines

@@ -85,6 +85,9 @@
         return true;
     }
 
+    /**
+     * @param string $newFilepath
+     */
     private function normalImageResize($newFilepath, $resizeSettings)
     {
         return $this->imageResize($newFilepath, $resizeSettings);

Unused Use Statements -3 removed lines

@@ -4,10 +4,7 @@
 
 use Cake\Core\Configure;
 use Cake\Filesystem\Folder;
-use Cake\I18n\Time;
 use Cake\Network\Exception\InternalErrorException;
-use Cake\ORM\TableRegistry;
-use Cake\Utility\Security;
 
 /**
  * NormalContentsFileBehaviorTrait

Spacing +1 added lines, -1 removed lines

@@ -41,7 +41,7 @@
         $newFilepath = $newFiledir . $fileInfo['field_name'];
         if (
             !$this->mkdir($newFiledir, 0777, true) ||
-            !rename(Configure::read('ContentsFile.Setting.Normal.tmpDir') . $fileInfo['tmp_file_name'] , $newFilepath)
+            !rename(Configure::read('ContentsFile.Setting.Normal.tmpDir') . $fileInfo['tmp_file_name'], $newFilepath)
         ) {
             return false;
         }

src/Model/Behavior/Traits/S3ContentsFileBehaviorTrait.php

Doc Comments +1 added lines

@@ -94,6 +94,7 @@
      * s3ImageResize
      * 画像のリサイズ処理(S3用)
      * @author hagiwara
+     * @param string $filepath
      */
     public function s3ImageResize($filepath, $resize)
     {

Unused Use Statements -1 removed lines

@@ -7,7 +7,6 @@
 use Cake\Filesystem\Folder;
 use Cake\I18n\Time;
 use Cake\Network\Exception\InternalErrorException;
-use Cake\ORM\TableRegistry;
 use Cake\Utility\Security;
 
 /**

src/Model/Entity/ContentsFileTrait.php

Doc Comments +1 added lines

@@ -159,6 +159,7 @@
      * tmpディレクトリへのアップロード
      *
      * @author hagiwara
+     * @param string $tmpFileName
      */
     private function tmpUpload($tmpName, $fieldSetting, $tmpFileName)
     {

Spacing +4 added lines, -4 removed lines

@@ -24,7 +24,7 @@ 
         $default = [];
         //設定値はまとめる
         $settings = $this->contentsFileConfig;
-        $this->contentsFileSettings = array_merge($default,$settings);
+        $this->contentsFileSettings = array_merge($default, $settings);
     }
 
     /**
@@ -55,7 +55,7 @@ 
             !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])) {
@@ -118,7 +118,7 @@ 
                 if (!empty($fileInfo['tmp_name'])) {
                     $tmpFileName = Security::hash(rand() . Time::now()->i18nFormat('YYYY/MM/dd HH:ii:ss') . $fileInfo['name']);
 
-                    if ($this->getExt($fileInfo['name']) !== null ) {
+                    if ($this->getExt($fileInfo['name']) !== null) {
                         $tmpFileName .= '.' . $this->getExt($fileInfo['name']);
                     }
 
@@ -146,7 +146,7 @@ 
      */
     private function getExt($file)
     {
-        $fileExplode = explode('.',$file);
+        $fileExplode = explode('.', $file);
         //この場合拡張子なし
         if (count($fileExplode) == 1) {
             return null;

src/Controller/ContentsFileController.php

Spacing +2 added lines, -2 removed lines

@@ -90,9 +90,9 @@
 
         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;

src/View/Helper/ContentsFileHelper.php

Spacing +2 added lines, -2 removed lines

@@ -49,7 +49,7 @@ 
                 $fileInfo['resize'] = $options['resize'];
                 unset($options['resize']);
             }
-            return $this->Html->image($this->urlArray($fileInfo) ,$options);
+            return $this->Html->image($this->urlArray($fileInfo), $options);
         }
         return '';
     }
@@ -63,7 +63,7 @@ 
         if (!isset($fileInfo['resize'])) {
             $fileInfo['resize'] = false;
         }
-        return $this->Url->build($this->urlArray($fileInfo),$full);
+        return $this->Url->build($this->urlArray($fileInfo), $full);
     }
 
     /**