Nemmo / yii2-attachments

src/behaviors/FileBehavior.php

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

@@ -8,8 +8,8 @@
 
 namespace nemmo\attachments\behaviors;
 
-use nemmo\attachments\models\File;
 use nemmo\attachments\ModuleTrait;
+use nemmo\attachments\models\File;
 use yii\base\Behavior;
 use yii\db\ActiveRecord;
 use yii\helpers\FileHelper;

Spacing +9 added lines, -9 removed lines

@@ -36,7 +36,7 @@ 
 
         if (!empty($files)) {
             foreach ($files as $file) {
-                if (!$file->saveAs($this->getModule()->getUserDirPath() . $file->name)) {
+                if (!$file->saveAs($this->getModule()->getUserDirPath().$file->name)) {
                     throw new \Exception(\Yii::t('yii', 'File upload failed.'));
                 }
             }
@@ -83,10 +83,10 @@ 
             if (substr(FileHelper::getMimeType($file), 0, 5) === 'image') {
                 $initialPreview[] = Html::img(['/attachments/file/download-temp', 'filename' => basename($file)], ['class' => 'file-preview-image']);
             } else {
-                $initialPreview[] = Html::beginTag('div', ['class' => 'file-preview-other']) .
-                    Html::beginTag('h2') .
-                    Html::tag('i', '', ['class' => 'glyphicon glyphicon-file']) .
-                    Html::endTag('h2') .
+                $initialPreview[] = Html::beginTag('div', ['class' => 'file-preview-other']).
+                    Html::beginTag('h2').
+                    Html::tag('i', '', ['class' => 'glyphicon glyphicon-file']).
+                    Html::endTag('h2').
                     Html::endTag('div');
             }
         }
@@ -95,10 +95,10 @@ 
             if (substr($file->mime, 0, 5) === 'image') {
                 $initialPreview[] = Html::img($file->getUrl(), ['class' => 'file-preview-image']);
             } else {
-                $initialPreview[] = Html::beginTag('div', ['class' => 'file-preview-other']) .
-                    Html::beginTag('h2') .
-                    Html::tag('i', '', ['class' => 'glyphicon glyphicon-file']) .
-                    Html::endTag('h2') .
+                $initialPreview[] = Html::beginTag('div', ['class' => 'file-preview-other']).
+                    Html::beginTag('h2').
+                    Html::tag('i', '', ['class' => 'glyphicon glyphicon-file']).
+                    Html::endTag('h2').
                     Html::endTag('div');
             }
         }

src/components/AttachmentsTable.php

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

@@ -2,9 +2,9 @@
 
 namespace nemmo\attachments\components;
 
-use nemmo\attachments\behaviors\FileBehavior;
-use nemmo\attachments\ModuleTrait;
 use Yii;
+use nemmo\attachments\ModuleTrait;
+use nemmo\attachments\behaviors\FileBehavior;
 use yii\bootstrap\Widget;
 use yii\data\ArrayDataProvider;
 use yii\db\ActiveRecord;

Spacing +2 added lines, -2 removed lines

@@ -74,7 +74,7 @@ 
                 [
                     'label' => $this->getModule()->t('attachments', 'File name'),
                     'format' => 'raw',
-                    'value' => function ($model) {
+                    'value' => function($model) {
                         return Html::a("$model->name.$model->type", $model->getUrl());
                     }
                 ],
@@ -82,7 +82,7 @@ 
                     'class' => 'yii\grid\ActionColumn',
                     'template' => '{delete}',
                     'buttons' => [
-                        'delete' => function ($url, $model, $key) {
+                        'delete' => function($url, $model, $key) {
                             return Html::a('<span class="glyphicon glyphicon-trash"></span>',
                                 [
                                     '/attachments/file/delete',

src/components/AttachmentsTableWithPreview.php

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

@@ -2,10 +2,10 @@
 
 namespace nemmo\attachments\components;
 
+use Yii;
 use himiklab\colorbox\Colorbox;
-use nemmo\attachments\behaviors\FileBehavior;
 use nemmo\attachments\ModuleTrait;
-use Yii;
+use nemmo\attachments\behaviors\FileBehavior;
 use yii\bootstrap\Widget;
 use yii\data\ArrayDataProvider;
 use yii\db\ActiveRecord;

Spacing +8 added lines, -8 removed lines

@@ -38,7 +38,7 @@ 
         if (!$this->model) {
             return Html::tag('div',
                 Html::tag('b',
-                    Yii::t('yii', 'Error')) . ': ' . $this->getModule()->t('attachments', 'The model cannot be empty.'
+                    Yii::t('yii', 'Error')).': '.$this->getModule()->t('attachments', 'The model cannot be empty.'
                 ),
                 [
                     'class' => 'alert alert-danger'
@@ -55,7 +55,7 @@ 
         if (!$hasFileBehavior) {
             return Html::tag('div',
                 Html::tag('b',
-                    Yii::t('yii', 'Error')) . ': ' . $this->getModule()->t('attachments', 'The behavior FileBehavior has not been attached to the model.'
+                    Yii::t('yii', 'Error')).': '.$this->getModule()->t('attachments', 'The behavior FileBehavior has not been attached to the model.'
                 ),
                 [
                     'class' => 'alert alert-danger'
@@ -75,9 +75,9 @@ 
                 [
                     'label' => $this->getModule()->t('attachments', 'File name'),
                     'format' => 'raw',
-                    'value' => function ($model) {
+                    'value' => function($model) {
                         return Html::a("$model->name.$model->type", $model->getUrl(), [
-                            'class' => ' group' . $model->itemId,
+                            'class' => ' group'.$model->itemId,
                             'onclick' => 'return false;',
                         ]);
                     }
@@ -86,7 +86,7 @@ 
                     'class' => 'yii\grid\ActionColumn',
                     'template' => '{delete}',
                     'buttons' => [
-                        'delete' => function ($url, $model, $key) {
+                        'delete' => function($url, $model, $key) {
                             return Html::a('<span class="glyphicon glyphicon-trash"></span>',
                                 [
                                     '/attachments/file/delete',
@@ -102,11 +102,11 @@ 
                     ]
                 ],
             ],
-        ]) .
+        ]).
         Colorbox::widget([
             'targets' => [
-                '.group' . $this->model->id => [
-                    'rel' => '.group' . $this->model->id,
+                '.group'.$this->model->id => [
+                    'rel' => '.group'.$this->model->id,
                     'photo' => true,
                     'scalePhotos' => true,
                     'width' => '100%',

src/Module.php

Doc Comments +5 added lines, -1 removed lines

@@ -44,6 +44,10 @@ 
         ];
     }
 
+    /**
+     * @param string $category
+     * @param string $message
+     */
     public static function t($category, $message, $params = [], $language = null)
     {
         return \Yii::t('nemmo/' . $category, $message, $params, $language);
@@ -109,7 +113,7 @@ 
 
     /**
      * @param $filePath string
-     * @param $owner
+     * @param \yii\base\Component $owner
      * @return bool|File
      * @throws \Exception
      * @throws \yii\base\InvalidConfigException

Braces +6 added lines, -2 removed lines

@@ -81,7 +81,9 @@ 
         for ($i = 0; $i < $depth; $i++) {
             $folder = substr($fileHash, $i * 3, 2);
             $path .= $folder;
-            if ($i != $depth - 1) $path .= DIRECTORY_SEPARATOR;
+            if ($i != $depth - 1) {
+                $path .= DIRECTORY_SEPARATOR;
+            }
         }
 
         return $path;
@@ -167,7 +169,9 @@ 
     {
         /** @var File $file */
         $file = File::findOne(['id' => $id]);
-        if (empty($file)) return false;
+        if (empty($file)) {
+            return false;
+        }
         $filePath = $this->getFilesDirPath($file->hash) . DIRECTORY_SEPARATOR . $file->hash . '.' . $file->type;
 
         return unlink($filePath) && $file->delete();

Spacing +7 added lines, -7 removed lines

@@ -47,7 +47,7 @@ 
 
     public static function t($category, $message, $params = [], $language = null)
     {
-        return \Yii::t('nemmo/' . $category, $message, $params, $language);
+        return \Yii::t('nemmo/'.$category, $message, $params, $language);
     }
 
     public function getStorePath()
@@ -66,7 +66,7 @@ 
      */
     public function getFilesDirPath($fileHash)
     {
-        $path = $this->getStorePath() . DIRECTORY_SEPARATOR . $this->getSubDirs($fileHash);
+        $path = $this->getStorePath().DIRECTORY_SEPARATOR.$this->getSubDirs($fileHash);
 
         FileHelper::createDirectory($path);
 
@@ -91,12 +91,12 @@ 
     {
         \Yii::$app->session->open();
 
-        $userDirPath = $this->getTempPath() . DIRECTORY_SEPARATOR . \Yii::$app->session->id;
+        $userDirPath = $this->getTempPath().DIRECTORY_SEPARATOR.\Yii::$app->session->id;
         FileHelper::createDirectory($userDirPath);
 
         \Yii::$app->session->close();
 
-        return $userDirPath . DIRECTORY_SEPARATOR;
+        return $userDirPath.DIRECTORY_SEPARATOR;
     }
 
     public function getShortClass($obj)
@@ -124,11 +124,11 @@ 
             throw new Exception("File $filePath not exists");
         }
 
-        $fileHash = md5(microtime(true) . $filePath);
+        $fileHash = md5(microtime(true).$filePath);
         $fileType = pathinfo($filePath, PATHINFO_EXTENSION);
         $newFileName = "$fileHash.$fileType";
         $fileDirPath = $this->getFilesDirPath($fileHash);
-        $newFilePath = $fileDirPath . DIRECTORY_SEPARATOR . $newFileName;
+        $newFilePath = $fileDirPath.DIRECTORY_SEPARATOR.$newFileName;
 
         if (!copy($filePath, $newFilePath)) {
             throw new Exception("Cannot copy file! $filePath  to $newFilePath");
@@ -156,7 +156,7 @@ 
         /** @var File $file */
         $file = File::findOne(['id' => $id]);
         if (empty($file)) return false;
-        $filePath = $this->getFilesDirPath($file->hash) . DIRECTORY_SEPARATOR . $file->hash . '.' . $file->type;
+        $filePath = $this->getFilesDirPath($file->hash).DIRECTORY_SEPARATOR.$file->hash.'.'.$file->type;
 
         return unlink($filePath) && $file->delete();
     }

src/controllers/FileController.php

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

@@ -2,10 +2,10 @@
 
 namespace nemmo\attachments\controllers;
 
+use Yii;
+use nemmo\attachments\ModuleTrait;
 use nemmo\attachments\models\File;
 use nemmo\attachments\models\UploadForm;
-use nemmo\attachments\ModuleTrait;
-use Yii;
 use yii\helpers\FileHelper;
 use yii\helpers\Url;
 use yii\web\Controller;

Spacing +5 added lines, -5 removed lines

@@ -28,12 +28,12 @@ 
             $result['uploadedFiles'] = [];
             if (is_array($model->file)) {
                 foreach ($model->file as $file) {
-                    $path = $this->getModule()->getUserDirPath() . DIRECTORY_SEPARATOR . $file->name;
+                    $path = $this->getModule()->getUserDirPath().DIRECTORY_SEPARATOR.$file->name;
                     $file->saveAs($path);
                     $result['uploadedFiles'][] = $file->name;
                 }
             } else {
-                $path = $this->getModule()->getUserDirPath() . DIRECTORY_SEPARATOR . $model->file->name;
+                $path = $this->getModule()->getUserDirPath().DIRECTORY_SEPARATOR.$model->file->name;
                 $model->file->saveAs($path);
                 $result['uploadedFiles'][] = $model->file->name;
             }
@@ -50,7 +50,7 @@ 
     public function actionDownload($id)
     {
         $file = File::findOne(['id' => $id]);
-        $filePath = $this->getModule()->getFilesDirPath($file->hash) . DIRECTORY_SEPARATOR . $file->hash . '.' . $file->type;
+        $filePath = $this->getModule()->getFilesDirPath($file->hash).DIRECTORY_SEPARATOR.$file->hash.'.'.$file->type;
 
         return Yii::$app->response->sendFile($filePath, "$file->name.$file->type");
     }
@@ -66,7 +66,7 @@ 
 
     public function actionDownloadTemp($filename)
     {
-        $filePath = $this->getModule()->getUserDirPath() . DIRECTORY_SEPARATOR . $filename;
+        $filePath = $this->getModule()->getUserDirPath().DIRECTORY_SEPARATOR.$filename;
 
         return Yii::$app->response->sendFile($filePath, $filename);
     }
@@ -74,7 +74,7 @@ 
     public function actionDeleteTemp($filename)
     {
         $userTempDir = $this->getModule()->getUserDirPath();
-        $filePath = $userTempDir . DIRECTORY_SEPARATOR . $filename;
+        $filePath = $userTempDir.DIRECTORY_SEPARATOR.$filename;
         unlink($filePath);
         if (!sizeof(FileHelper::findFiles($userTempDir))) {
             rmdir($userTempDir);

src/migrations/m150127_040544_add_attachments.php

Spacing +7 added lines, -7 removed lines

@@ -11,13 +11,13 @@
     {
         $this->createTable($this->getModule()->tableName, [
             'id' => Schema::TYPE_PK,
-            'name' => Schema::TYPE_STRING . ' not null',
-            'model' => Schema::TYPE_STRING . ' not null',
-            'itemId' => Schema::TYPE_INTEGER . ' not null',
-            'hash' => Schema::TYPE_STRING . ' not null',
-            'size' => Schema::TYPE_INTEGER . ' not null',
-            'type' => Schema::TYPE_STRING . ' not null',
-            'mime' => Schema::TYPE_STRING . ' not null'
+            'name' => Schema::TYPE_STRING.' not null',
+            'model' => Schema::TYPE_STRING.' not null',
+            'itemId' => Schema::TYPE_INTEGER.' not null',
+            'hash' => Schema::TYPE_STRING.' not null',
+            'size' => Schema::TYPE_INTEGER.' not null',
+            'type' => Schema::TYPE_STRING.' not null',
+            'mime' => Schema::TYPE_STRING.' not null'
         ]);
 
         $this->createIndex('file_model', $this->getModule()->tableName, 'model');

src/models/File.php

Spacing +1 added lines, -1 removed lines

@@ -67,6 +67,6 @@
 
     public function getPath()
     {
-        return $this->getModule()->getFilesDirPath($this->hash) . DIRECTORY_SEPARATOR . $this->hash . '.' . $this->type;
+        return $this->getModule()->getFilesDirPath($this->hash).DIRECTORY_SEPARATOR.$this->hash.'.'.$this->type;
     }
 }