yuncms / framework

src/user/models/User.php

Spacing +11 added lines, -11 removed lines

@@ -58,13 +58,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';
 
     /**
@@ -105,8 +105,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'], //只修改密码
         ]);
     }
 
@@ -318,7 +318,7 @@ 
         if ($this->balance < 0) {//计算后如果余额小于0，那么结果不合法。
             return false;
         }
-        $transaction = static::getDb()->beginTransaction();//开始事务
+        $transaction = static::getDb()->beginTransaction(); //开始事务
         try {
             if ($this->save()) {
                 $transaction->commit();
@@ -360,7 +360,7 @@ 
         if ($this->transfer_balance < 0) {//计算后如果余额小于0，那么结果不合法。
             return false;
         }
-        $transaction = static::getDb()->beginTransaction();//开始事务
+        $transaction = static::getDb()->beginTransaction(); //开始事务
         try {
             if ($this->save()) {
                 $transaction->commit();

src/user/models/UserToken.php

Spacing +3 added lines, -3 removed lines

@@ -77,14 +77,14 @@
             case self::TYPE_CONFIRMATION:
             case self::TYPE_CONFIRM_NEW_EMAIL:
             case self::TYPE_CONFIRM_OLD_EMAIL:
-                $expirationTime =Yii::$app->settings->get('confirmWithin','user');
+                $expirationTime = Yii::$app->settings->get('confirmWithin', 'user');
                 break;
             case self::TYPE_CONFIRM_NEW_MOBILE:
             case self::TYPE_CONFIRM_OLD_MOBILE:
-                $expirationTime = Yii::$app->settings->get('confirmWithin','user');
+                $expirationTime = Yii::$app->settings->get('confirmWithin', 'user');
                 break;
             case self::TYPE_RECOVERY:
-                $expirationTime = Yii::$app->settings->get('recoverWithin','user');
+                $expirationTime = Yii::$app->settings->get('recoverWithin', 'user');
                 break;
             default:
                 throw new \RuntimeException();

src/admin/controllers/VolumeController.php

Indentation +7 added lines, -7 removed lines

@@ -149,13 +149,13 @@
     }
 
     /**
-      * Batch Delete existing Volume model.
-      * If deletion is successful, the browser will be redirected to the 'index' page.
-      * @return mixed
-      * @throws NotFoundHttpException
-      * @throws \Throwable
-      * @throws \yii\db\StaleObjectException
-      */
+     * Batch Delete existing Volume model.
+     * If deletion is successful, the browser will be redirected to the 'index' page.
+     * @return mixed
+     * @throws NotFoundHttpException
+     * @throws \Throwable
+     * @throws \yii\db\StaleObjectException
+     */
     public function actionBatchDelete()
     {
         if (($ids = Yii::$app->request->post('ids', null)) != null) {

Spacing +1 added lines, -1 removed lines

@@ -182,7 +182,7 @@
         if (($model = Volume::findOne($id)) !== null) {
             return $model;
         } else {
-            throw new NotFoundHttpException (Yii::t('yii', 'The requested page does not exist.'));
+            throw new NotFoundHttpException(Yii::t('yii', 'The requested page does not exist.'));
         }
     }
 }

src/admin/views/volume/view.php

Spacing +1 added lines, -1 removed lines

@@ -69,7 +69,7 @@
                     'pub:boolean',
                     [
                         'attribute' => 'status',
-                        'value' => function ($model) {
+                        'value' => function($model) {
                             return $model->status == \yuncms\models\Volume::STATUS_ACTIVE ? Yii::t('yuncms', 'Active') : Yii::t('yuncms', 'Disable');
                         },
                         'label' => Yii::t('yuncms', 'Status'),

src/admin/views/volume/configuration.php

Spacing +1 added lines, -1 removed lines

@@ -38,7 +38,7 @@
                 </div>
             </div>
 
-            <?php $form = ActiveForm::begin(['layout' => 'horizontal', 'enableAjaxValidation' => true, 'enableClientValidation' => false,]); ?>
+            <?php $form = ActiveForm::begin(['layout' => 'horizontal', 'enableAjaxValidation' => true, 'enableClientValidation' => false, ]); ?>
             <?= $form->field($model, 'identity')->hiddenInput()->label(false) ?>
             <?= $form->field($model, 'name')->hiddenInput()->label(false) ?>
             <?= $form->field($model, 'class')->hiddenInput()->label(false) ?>

src/admin/views/volume/_form.php

Spacing +1 added lines, -1 removed lines

@@ -8,7 +8,7 @@
 /* @var yuncms\models\Volume $model */
 /* @var ActiveForm $form */
 ?>
-<?php $form = ActiveForm::begin(['layout' => 'horizontal', 'enableAjaxValidation' => true, 'enableClientValidation' => false,]); ?>
+<?php $form = ActiveForm::begin(['layout' => 'horizontal', 'enableAjaxValidation' => true, 'enableClientValidation' => false, ]); ?>
 
 <?= $form->field($model, 'identity')->textInput(['maxlength' => true]) ?>
 <div class="hr-line-dashed"></div>

src/admin/views/volume/index.php

Spacing +2 added lines, -2 removed lines

@@ -72,7 +72,7 @@ 
                     'pub:boolean',
                     [
                         'attribute' => 'status',
-                        'value' => function ($model) {
+                        'value' => function($model) {
                             return $model->status == Volume::STATUS_ACTIVE ? Yii::t('yuncms', 'Active') : Yii::t('yuncms', 'Disable');
                         },
                         'label' => Yii::t('yuncms', 'Status'),
@@ -98,7 +98,7 @@ 
                     [
                         'class' => 'yuncms\grid\ActionColumn',
                         'template' => '{configuration} {view} {update} {delete}',
-                        'buttons' => ['configuration' => function ($url, $model, $key) {
+                        'buttons' => ['configuration' => function($url, $model, $key) {
                             return Html::a('<span class="glyphicon glyphicon-cog"></span>',
                                 Url::toRoute(['configuration', 'id' => $model->id]), [
                                     'title' => Yii::t('yuncms', 'Configuration'),

src/base/File.php

Spacing +1 added lines, -1 removed lines

@@ -84,7 +84,7 @@
         } elseif (!is_writable($directory)) {
             throw new FileException(sprintf('Unable to write in the "%s" directory', $directory));
         }
-        $target = rtrim($directory, '/\\').DIRECTORY_SEPARATOR.(null === $name ? $this->getBasename() : $this->getName($name));
+        $target = rtrim($directory, '/\\') . DIRECTORY_SEPARATOR . (null === $name ? $this->getBasename() : $this->getName($name));
         return new self($target, false);
     }