Completed
Pull Request — master (#42)
by Masaya
05:57
created
src/Model/Behavior/Traits/S3ContentsFileBehaviorTrait.php 1 patch
Indentation   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -120,7 +120,7 @@
 block discarded – undo
120 120
             $deleteField = $attachmentData->field_name;
121 121
         }
122 122
 
123
-       $S3 = new S3();
123
+        $S3 = new S3();
124 124
         // リサイズのディレクトリ
125 125
         $resizeDir = Configure::read('ContentsFile.Setting.S3.fileDir') . $modelName . '/' . $modelId . '/' . 'contents_file_resize_' . $deleteField . '/';
126 126
         if (!$S3->deleteRecursive($resizeDir)) {
Please login to merge, or discard this patch.
src/Model/Entity/ContentsFileTrait.php 1 patch
Braces   +8 added lines, -8 removed lines patch added patch discarded remove patch
@@ -302,29 +302,29 @@
 block discarded – undo
302 302
                 // 未定義
303 303
                 if($orientation == 0) {
304 304
                     // 通常
305
-                }else if($orientation == 1) {
305
+                } else if($orientation == 1) {
306 306
                     // 左右反転
307
-                }else if($orientation == 2) {
307
+                } else if($orientation == 2) {
308 308
                     $image = $this->imageFlop($image);
309 309
                     // 180°回転
310
-                }else if($orientation == 3) {
310
+                } else if($orientation == 3) {
311 311
                     $image = $this->imageRotate($image,180, 0);
312 312
                     // 上下反転
313
-                }else if($orientation == 4) {
313
+                } else if($orientation == 4) {
314 314
                     $image = $this->imageFlip($image);
315 315
                     // 反時計回りに90°回転 上下反転
316
-                }else if($orientation == 5) {
316
+                } else if($orientation == 5) {
317 317
                     $image = $this->imageRotate($image,90, 0);
318 318
                     $image = $this->imageFlip($image);
319 319
                     // 時計回りに90°回転
320
-                }else if($orientation == 6) {
320
+                } else if($orientation == 6) {
321 321
                     $image = $this->imageRotate($image,-90, 0);
322 322
                     // 時計回りに90°回転 上下反転
323
-                }else if($orientation == 7) {
323
+                } else if($orientation == 7) {
324 324
                     $image = $this->imageRotate($image,-90, 0);
325 325
                     $image = $this->imageFlip($image);
326 326
                 // 反時計回りに90°回転
327
-                }else if($orientation == 8) {
327
+                } else if($orientation == 8) {
328 328
                     $image = $this->imageRotate($image,90, 0);
329 329
                 }
330 330
             }
Please login to merge, or discard this patch.
src/Controller/ContentsFileController.php 1 patch
Indentation   +2 added lines, -2 removed lines patch added patch discarded remove patch
@@ -125,7 +125,7 @@  discard block
 block discarded – undo
125 125
             'mp3' => 'audio/mpeg',
126 126
             'wav' => 'audio/wav',
127 127
             'mp4' => 'video/mp4',
128
-	    'pptx' => 'application/vnd.openxmlformats-officedocument.presentationml.presentation',
128
+        'pptx' => 'application/vnd.openxmlformats-officedocument.presentationml.presentation',
129 129
             'docs' => 'application/vnd.openxmlformats-officedocument.wordprocessingml.document',
130 130
             'xlsx' => 'application/vnd.openxmlformats-officedocument.spreadsheetml.sheet',
131 131
         ];
@@ -167,7 +167,7 @@  discard block
 block discarded – undo
167 167
             'pptx' => 'application/vnd.openxmlformats-officedocument.presentationml.presentation',
168 168
             'docs' => 'application/vnd.openxmlformats-officedocument.wordprocessingml.document',
169 169
             'xlsx' => 'application/vnd.openxmlformats-officedocument.spreadsheetml.sheet',
170
-	];
170
+    ];
171 171
         $sContentType = 'application/octet-stream';
172 172
 
173 173
         if (($pos = strrpos($filename, ".")) !== false) {
Please login to merge, or discard this patch.