yuncms / framework

src/widgets/MultipleUpload.php

Braces +3 added lines, -2 removed lines

@@ -161,8 +161,9 @@
             return ['url' => $attachment, 'path' => $attachment,];
         } else if (is_array($attachment)) {
             return $attachment;
-        } else if ($attachment instanceof Arrayable)
-            return $attachment->toArray();
+        } else if ($attachment instanceof Arrayable) {
+                    return $attachment->toArray();
+        }
         return [];
     }
 

Spacing +3 added lines, -3 removed lines

@@ -95,7 +95,7 @@ 
         if (empty($this->url)) {
             if ($this->onlyImage === false) {
                 $this->url = $this->multiple ? ['/upload/files-upload'] : ['/upload/file-upload'];
-                $fileAllowFiles = Yii::$app->getSettings()->get('fileAllowFiles','attachment');
+                $fileAllowFiles = Yii::$app->getSettings()->get('fileAllowFiles', 'attachment');
                 $regExp = '/(\.|\/)(';
                 $extensions = explode(',', $fileAllowFiles);
                 foreach ($extensions as $extension) {
@@ -130,7 +130,7 @@ 
         }
         $this->fileInputName = md5($this->name);
         if (!array_key_exists('file_param', $this->url)) {
-            $this->url['file_param'] = $this->fileInputName;//服务器需要通过这个判断是哪一个input name上传的
+            $this->url['file_param'] = $this->fileInputName; //服务器需要通过这个判断是哪一个input name上传的
         }
 
         $this->clientOptions = ArrayHelper::merge($this->clientOptions, [
@@ -160,7 +160,7 @@ 
     protected function formatAttachment($attachment)
     {
         if (!empty($attachment) && is_string($attachment)) {
-            return ['url' => $attachment, 'path' => $attachment,];
+            return ['url' => $attachment, 'path' => $attachment, ];
         } else if (is_array($attachment)) {
             return $attachment;
         } else if ($attachment instanceof Arrayable)

src/helpers/UploadHelper.php

Spacing +6 added lines, -6 removed lines

@@ -46,7 +46,7 @@ 
      */
     public static function getImageMaxSizeByte()
     {
-        $imageMaxSize = Yii::$app->getSettings()->get('imageMaxSize','attachment');
+        $imageMaxSize = Yii::$app->getSettings()->get('imageMaxSize', 'attachment');
         return self::getMaxUploadByte($imageMaxSize);
     }
 
@@ -56,7 +56,7 @@ 
      */
     public static function getVideoMaxSizeByte()
     {
-        $videoMaxSize = Yii::$app->getSettings()->get('videoMaxSize','attachment');
+        $videoMaxSize = Yii::$app->getSettings()->get('videoMaxSize', 'attachment');
         return self::getMaxUploadByte($videoMaxSize);
     }
 
@@ -66,7 +66,7 @@ 
      */
     public static function getFileMaxSizeByte()
     {
-        $fileMaxSize = Yii::$app->getSettings()->get('fileMaxSize','attachment');
+        $fileMaxSize = Yii::$app->getSettings()->get('fileMaxSize', 'attachment');
         return self::getMaxUploadByte($fileMaxSize);
     }
 
@@ -76,9 +76,9 @@ 
      */
     public static function getAcceptImageMimeTypes()
     {
-        $imageAllowFiles = Yii::$app->getSettings()->get('imageAllowFiles','attachment');
+        $imageAllowFiles = Yii::$app->getSettings()->get('imageAllowFiles', 'attachment');
         $extensions = explode(',', $imageAllowFiles);
-        array_walk($extensions, function (&$value) {
+        array_walk($extensions, function(&$value) {
             $value = 'image/' . $value;
         });
         return $extensions;
@@ -93,7 +93,7 @@ 
     public static function normalizeExtension($extensions)
     {
         $extensions = explode(',', $extensions);
-        array_walk($extensions, function (&$value) {
+        array_walk($extensions, function(&$value) {
             $value = '.' . $value;
         });
         return $extensions;

src/user/models/User.php

Spacing +9 added lines, -9 removed lines

@@ -48,13 +48,13 @@ 
     const AFTER_REGISTER = 'afterRegister';
 
     //场景定义
-    const SCENARIO_CREATE = 'create';//后台或控制台创建用户
-    const SCENARIO_UPDATE = 'update';//后台或控制台修改用户
-    const SCENARIO_REGISTER = 'basic_create';//邮箱注册
-    const SCENARIO_EMAIL_REGISTER = 'email_create';//邮箱注册
-    const SCENARIO_MOBILE_REGISTER = 'mobile_create';//手机号注册
-    const SCENARIO_SETTINGS = 'settings';//更新
-    const SCENARIO_CONNECT = 'connect';//账户链接或自动注册新用户
+    const SCENARIO_CREATE = 'create'; //后台或控制台创建用户
+    const SCENARIO_UPDATE = 'update'; //后台或控制台修改用户
+    const SCENARIO_REGISTER = 'basic_create'; //邮箱注册
+    const SCENARIO_EMAIL_REGISTER = 'email_create'; //邮箱注册
+    const SCENARIO_MOBILE_REGISTER = 'mobile_create'; //手机号注册
+    const SCENARIO_SETTINGS = 'settings'; //更新
+    const SCENARIO_CONNECT = 'connect'; //账户链接或自动注册新用户
     const SCENARIO_PASSWORD = 'password';
 
     /**
@@ -95,8 +95,8 @@ 
             static::SCENARIO_EMAIL_REGISTER => ['nickname', 'email', 'password'],
             static::SCENARIO_MOBILE_REGISTER => ['mobile', 'password'],
             static::SCENARIO_SETTINGS => ['username', 'email', 'password'],
-            static::SCENARIO_CONNECT => ['nickname', 'email', 'password'],//链接账户密码可以为空邮箱可以为空
-            static::SCENARIO_PASSWORD => ['password'],//只修改密码
+            static::SCENARIO_CONNECT => ['nickname', 'email', 'password'], //链接账户密码可以为空邮箱可以为空
+            static::SCENARIO_PASSWORD => ['password'], //只修改密码
         ]);
     }
 

src/user/models/UserSupport.php

Spacing +1 added lines, -1 removed lines

@@ -64,7 +64,7 @@
     public function rules()
     {
         return [
-            [[ 'model_id'], 'required'],
+            [['model_id'], 'required'],
             [['user_id', 'model_id'], 'integer'],
             [['user_id'], 'exist', 'skipOnError' => true, 'targetClass' => User::class, 'targetAttribute' => ['user_id' => 'id']],
         ];

src/models/Attachment.php

Spacing +1 added lines, -1 removed lines

@@ -72,7 +72,7 @@
                 'attributes' => [
                     ActiveRecord::EVENT_BEFORE_INSERT => 'user_id'
                 ],
-                'value' => function () {
+                'value' => function() {
                     return Yii::$app->user->id;
                 }
             ],

config/console.php

Spacing +1 added lines, -1 removed lines

@@ -3,7 +3,7 @@
 $config = [
     'components' => [
         'cache' => [
-            'keyPrefix' => 'rest',       //前缀
+            'keyPrefix' => 'rest', //前缀
         ],
         'request' => [
             'class' => yuncms\console\Request::class,

src/gii/generators/model/model.php

Spacing +13 added lines, -13 removed lines

@@ -21,19 +21,19 @@ 
 use Yii;
 use <?= $generator->baseClass?>;
 use yii\db\Connection;
-<?php if(isset($labels['slug']) || isset($labels['uuid'])): ?>
+<?php if (isset($labels['slug']) || isset($labels['uuid'])): ?>
 use yii\helpers\Inflector;
 <?php endif; ?>
 
 use yii\caching\DbDependency;
 use yii\caching\ChainedDependency;
-<?php if(isset($labels['created_at'])): ?>
+<?php if (isset($labels['created_at'])): ?>
 use yii\behaviors\TimestampBehavior;
 <?php endif; ?>
-<?php if(isset($labels['user_id'])): ?>
+<?php if (isset($labels['user_id'])): ?>
 use yii\behaviors\BlameableBehavior;
 <?php endif; ?>
-<?php if(isset($labels['slug']) || isset($labels['uuid'])): ?>
+<?php if (isset($labels['slug']) || isset($labels['uuid'])): ?>
 use yii\behaviors\AttributeBehavior;
 <?php endif; ?>
 use yuncms\helpers\DateHelper;
@@ -53,7 +53,7 @@ 
 <?php endif; ?>
  *
  * @property-read boolean $isAuthor 是否是作者
-<?php if(isset($labels['status'])): ?>
+<?php if (isset($labels['status'])): ?>
  * @property-read boolean $isDraft 是否草稿
  * @property-read boolean $isPublished 是否发布
 <?php endif; ?>
@@ -64,7 +64,7 @@ 
     //场景定义
     const SCENARIO_CREATE = 'create';//创建
     const SCENARIO_UPDATE = 'update';//更新
-<?php if(isset($labels['status'])): ?>
+<?php if (isset($labels['status'])): ?>
     //状态定义
     const STATUS_DRAFT = 0b0;//草稿
     const STATUS_REVIEW = 0b1;//待审核
@@ -97,7 +97,7 @@ 
         $behaviors['timestamp'] = [
             'class' => TimestampBehavior::className()
         ];
-<?php elseif(isset($labels['created_at'])): ?>
+<?php elseif (isset($labels['created_at'])): ?>
         $behaviors['timestamp'] = [
             'class' => TimestampBehavior::className(),
             'attributes' => [
@@ -105,7 +105,7 @@ 
             ],
         ];
 <?php endif; ?>
-<?php if(isset($labels['user_id'])): ?>
+<?php if (isset($labels['user_id'])): ?>
         $behaviors['user'] = [
             'class' => BlameableBehavior::className(),
             'attributes' => [
@@ -113,7 +113,7 @@ 
             ],
         ];
 <?php endif; ?>
-<?php if(isset($labels['slug'])): ?>
+<?php if (isset($labels['slug'])): ?>
         $behaviors['slug'] = [
             'class' => AttributeBehavior::className(),
             'attributes' => [
@@ -124,7 +124,7 @@ 
             }
         ];
 <?php endif; ?>
-<?php if(isset($labels['uuid'])): ?>
+<?php if (isset($labels['uuid'])): ?>
         $behaviors['uuid'] = [
             'class' => AttributeBehavior::className(),
             'attributes' => [
@@ -166,7 +166,7 @@ 
      */
     public function rules()
     {
-        return [<?= "\n            " . implode(",\n            ", $rules) . ",\n        " ?>    <?php if(isset($labels['status'])): ?>// status rule
+        return [<?= "\n            " . implode(",\n            ", $rules) . ",\n        " ?>    <?php if (isset($labels['status'])): ?>// status rule
             ['status', 'default', 'value' => self::STATUS_REVIEW],
             ['status', 'in', 'range' => [self::STATUS_DRAFT, self::STATUS_REVIEW, self::STATUS_REJECTED, self::STATUS_PUBLISHED]],<?php endif; ?>
         ];
@@ -215,7 +215,7 @@ 
     {
         return $this->user_id == Yii::$app->user->id;
     }
-<?php if(isset($labels['status'])): ?>
+<?php if (isset($labels['status'])): ?>
     /**
      * 是否草稿状态
      * @return bool
@@ -364,7 +364,7 @@ 
         ]));
         return $total;
     }
-<?php if(isset($labels['created_at'])): ?>
+<?php if (isset($labels['created_at'])): ?>
 
     /**
      * 获取模型今日新增总数

src/rest/models/User.php

Spacing +4 added lines, -4 removed lines

@@ -26,16 +26,16 @@
         return [
             'id',
             'nickname',
-            'faceUrl' => function () {
+            'faceUrl' => function() {
                 return $this->getAvatar(AvatarHelper::AVATAR_MIDDLE);
             },
-            "created_datetime" => function () {
+            "created_datetime" => function() {
                 return gmdate(DATE_ISO8601, $this->created_at);
             },
-            "updated_datetime" => function () {
+            "updated_datetime" => function() {
                 return gmdate(DATE_ISO8601, $this->updated_at);
             },
-            'blocked_datetime' => function () {
+            'blocked_datetime' => function() {
                 return gmdate(DATE_ISO8601, $this->blocked_at);
             }
         ];

src/user/models/UserAuthItem.php

Spacing +1 added lines, -1 removed lines

@@ -68,7 +68,7 @@
         return [
             [['ruleName'], 'checkRule'],
             [['name', 'type'], 'required'],
-            [['name'], 'checkUnique', 'when' => function () {
+            [['name'], 'checkUnique', 'when' => function() {
                 return $this->isNewRecord || ($this->_item->name != $this->name);
             }],
             [['type'], 'integer'],