yuncms / framework

src/user/Bootstrap.php

Spacing +2 added lines, -2 removed lines

@@ -30,7 +30,7 @@ 
         if ($app->hasModule('user') && ($module = $app->getModule('user')) instanceof Module) {
             //监听用户活动时间
             /** @var \yii\web\UserEvent $event */
-            $app->on(Application::EVENT_AFTER_REQUEST, function ($event) use ($app) {
+            $app->on(Application::EVENT_AFTER_REQUEST, function($event) use ($app) {
                 if (!$app->user->isGuest && Yii::$app->has('queue')) {
                     $user = UserExtra::findOne(['user_id' => $app->user->id]);
                     $user->updateAttributesAsync(['last_visit' => time()]);
@@ -39,7 +39,7 @@ 
 
             //监听用户登录事件
             /** @var \yii\web\UserEvent $event */
-            $app->user->on(User::EVENT_AFTER_LOGIN, function ($event) use ($app) {
+            $app->user->on(User::EVENT_AFTER_LOGIN, function($event) use ($app) {
                 //记录最后登录时间记录最后登录IP记录登录次数
                 $user = UserExtra::findOne(['user_id' => $app->user->id]);
                 $user->updateAttributesAsync(['login_at' => time(), 'login_ip' => Yii::$app->request->userIP]);

src/gii/generators/model/model.php

Spacing +14 added lines, -14 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,18 +53,18 @@ 
 <?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; ?>
  */
-class <?= $className ?> extends <?= '\\' . ltrim($generator->baseClass, '\\') ?><?php if(isset($labels['status'])): ?> implements ScanInterface<?php endif; ?>
+class <?= $className ?> extends <?= '\\' . ltrim($generator->baseClass, '\\') ?><?php if (isset($labels['status'])): ?> implements ScanInterface<?php endif; ?>
 {
 
     //场景定义
     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
@@ -396,7 +396,7 @@ 
         ]));
         return $total;
     }
-<?php if(isset($labels['created_at'])): ?>
+<?php if (isset($labels['created_at'])): ?>
 
     /**
      * 获取模型今日新增总数

src/gii/generators/model/query.php

Spacing +1 added lines, -1 removed lines

@@ -58,7 +58,7 @@
     {
         return parent::one($db);
     }
-<?php if(isset($labels['created_at'])): ?>
+<?php if (isset($labels['created_at'])): ?>
 
     /**
      * 热门模型

src/gii/generators/crud/controller.php

Spacing +7 added lines, -7 removed lines

@@ -36,7 +36,7 @@ 
 use <?= ltrim($generator->modelClass, '\\') ?>;
 <?php if (!empty($generator->searchModelClass)): ?>
 use <?= ltrim($generator->searchModelClass, '\\') . (isset($searchModelAlias) ? " as $searchModelAlias" : "") ?>;
-<?php else: ?>
+<?php else : ?>
 use yii\data\ActiveDataProvider;
 <?php endif; ?>
 use <?= ltrim($generator->baseControllerClass, '\\') ?>;
@@ -77,7 +77,7 @@ 
             'searchModel' => $searchModel,
             'dataProvider' => $dataProvider,
         ]);
-<?php else: ?>
+<?php else : ?>
         $dataProvider = new ActiveDataProvider([
             'query' => <?= $modelClass ?>::find(),
         ]);
@@ -114,7 +114,7 @@ 
             return ActiveForm::validate($model);
         }
         if ($model->load(Yii::$app->request->post()) && $model->save()) {
-            Yii::$app->getSession()->setFlash('success', <?= $generator->generateString('Create success.');?>);
+            Yii::$app->getSession()->setFlash('success', <?= $generator->generateString('Create success.'); ?>);
             return $this->redirect(['view', <?= $urlParams ?>]);
         } else {
             return $this->render('create', [
@@ -137,7 +137,7 @@ 
             return ActiveForm::validate($model);
         }
         if ($model->load(Yii::$app->request->post()) && $model->save()) {
-            Yii::$app->getSession()->setFlash('success', <?= $generator->generateString('Update success.');?>);
+            Yii::$app->getSession()->setFlash('success', <?= $generator->generateString('Update success.'); ?>);
             return $this->redirect(['view', <?= $urlParams ?>]);
         } else {
             return $this->render('update', [
@@ -155,7 +155,7 @@ 
     public function actionDelete(<?= $actionParams ?>)
     {
         $this->findModel(<?= $actionParams ?>)->delete();
-        Yii::$app->getSession()->setFlash('success', <?= $generator->generateString('Delete success.');?>);
+        Yii::$app->getSession()->setFlash('success', <?= $generator->generateString('Delete success.'); ?>);
         return $this->redirect(['index']);
     }
      /**
@@ -170,9 +170,9 @@ 
                 $model = $this->findModel($id);
                 $model->delete();
             }
-            Yii::$app->getSession()->setFlash('success', <?= $generator->generateString('Delete success.');?>);
+            Yii::$app->getSession()->setFlash('success', <?= $generator->generateString('Delete success.'); ?>);
         } else {
-            Yii::$app->getSession()->setFlash('success', <?= $generator->generateString('Delete failed.');?>);
+            Yii::$app->getSession()->setFlash('success', <?= $generator->generateString('Delete failed.'); ?>);
         }
         return $this->redirect(['index']);
     }

Braces +10 added lines, -4 removed lines

@@ -36,9 +36,12 @@ 
 use <?= ltrim($generator->modelClass, '\\') ?>;
 <?php if (!empty($generator->searchModelClass)): ?>
 use <?= ltrim($generator->searchModelClass, '\\') . (isset($searchModelAlias) ? " as $searchModelAlias" : "") ?>;
-<?php else: ?>
+<?php else {
+    : ?>
 use yii\data\ActiveDataProvider;
-<?php endif; ?>
+<?php endif;
+}
+?>
 use <?= ltrim($generator->baseControllerClass, '\\') ?>;
 use yuncms\web\Response;
 
@@ -77,7 +80,8 @@ 
             'searchModel' => $searchModel,
             'dataProvider' => $dataProvider,
         ]);
-<?php else: ?>
+<?php else {
+    : ?>
         $dataProvider = new ActiveDataProvider([
             'query' => <?= $modelClass ?>::find(),
         ]);
@@ -85,7 +89,9 @@ 
         return $this->render('index', [
             'dataProvider' => $dataProvider,
         ]);
-<?php endif; ?>
+<?php endif;
+}
+?>
     }
 
     /**

src/gii/generators/crud/views/_search.php

Spacing +2 added lines, -2 removed lines

@@ -36,8 +36,8 @@
 }
 ?>
     <div class="form-group">
-        <?= "<?= " ?>Html::submitButton(<?= $generator->generateString('Search');?>, ['class' => 'btn btn-primary']) ?>
-        <?= "<?= " ?>Html::resetButton(<?= $generator->generateString('Reset');?>, ['class' => 'btn btn-default']) ?>
+        <?= "<?= " ?>Html::submitButton(<?= $generator->generateString('Search'); ?>, ['class' => 'btn btn-primary']) ?>
+        <?= "<?= " ?>Html::resetButton(<?= $generator->generateString('Reset'); ?>, ['class' => 'btn btn-default']) ?>
     </div>
 
     <?= "<?php " ?>ActiveForm::end(); ?>

src/gii/generators/crud/views/_form.php

Spacing +1 added lines, -1 removed lines

@@ -33,7 +33,7 @@
 
 <div class="form-group">
     <div class="col-sm-4 col-sm-offset-2">
-        <?= "<?= " ?>Html::submitButton($model->isNewRecord ? <?= $generator->generateString('Create');?> : <?= $generator->generateString('Update');?>, ['class' => $model->isNewRecord ? 'btn btn-success' : 'btn btn-primary']) ?>
+        <?= "<?= " ?>Html::submitButton($model->isNewRecord ? <?= $generator->generateString('Create'); ?> : <?= $generator->generateString('Update'); ?>, ['class' => $model->isNewRecord ? 'btn btn-success' : 'btn btn-primary']) ?>
     </div>
 </div>
 

src/gii/generators/crud/views/index.php

Spacing +3 added lines, -3 removed lines

@@ -57,7 +57,7 @@ 
                         ],
                         [
                             'options' => ['id' => 'batch_deletion', 'class'=>'btn btn-sm btn-danger'],
-                            'label' => <?= $generator->generateString('Batch Deletion');?>,
+                            'label' => <?= $generator->generateString('Batch Deletion'); ?>,
                             'url' => 'javascript:void(0);',
                         ]
                     ]]); ?>
@@ -66,7 +66,7 @@ 
                     <?= "<?= " ?>$this->render('_search', ['model' => $searchModel]); ?>
                 </div>
             </div>
-<?php if(!empty($generator->searchModelClass)): ?>
+<?php if (!empty($generator->searchModelClass)): ?>
            <?= " <?php " . ($generator->indexWidgetType === 'grid' ? "// " : "") ?>echo $this->render('_search', ['model' => $searchModel]); ?>
 <?php endif; ?>
             <?= "<?= " ?>GridView::widget([
@@ -102,7 +102,7 @@ 
 ?>
                     [
                         'class' => 'yii\grid\ActionColumn',
-                        'header' => <?= $generator->generateString('Operation');?>,
+                        'header' => <?= $generator->generateString('Operation'); ?>,
                         'template' => '{view} {update} {delete}',
                         //'buttons' => [
                         //    'update' => function ($url, $model, $key) {

Braces +5 added lines, -2 removed lines

@@ -113,7 +113,8 @@ 
                 ],
             ]); ?>
             <?= "<?php " ?>Box::end(); ?>
-            <?php else: ?>
+            <?php else {
+    : ?>
                 <?= "<?= " ?>ListView::widget([
                     'dataProvider' => $dataProvider,
                     'layout' => "{items}\n{summary}\n{pager}",
@@ -122,7 +123,9 @@ 
                         return Html::a(Html::encode($model-><?= $nameAttribute ?>), ['view', <?= $urlParams ?>]);
                     },
                 ]) ?>
-            <?php endif; ?><?= $generator->enablePjax ? '<?php Pjax::end(); ?>' : '' ?>
+            <?php endif;
+}
+?><?= $generator->enablePjax ? '<?php Pjax::end(); ?>' : '' ?>
 
         </div>
     </div>

src/gii/generators/crud/views/update.php

Spacing +1 added lines, -1 removed lines

@@ -19,7 +19,7 @@
 /* @var $this yii\web\View */
 /* @var $model <?= ltrim($generator->modelClass, '\\') ?> */
 
-$this->title = <?= $generator->generateString('Update '.Inflector::camel2words(StringHelper::basename($generator->modelClass)))?> . ': ' . $model-><?= $generator->getNameAttribute() ?>;
+$this->title = <?= $generator->generateString('Update ' . Inflector::camel2words(StringHelper::basename($generator->modelClass)))?> . ': ' . $model-><?= $generator->getNameAttribute() ?>;
 $this->params['breadcrumbs'][] = ['label' => <?= $generator->generateString('Manage ' . Inflector::camel2words(StringHelper::basename($generator->modelClass))) ?>, 'url' => ['index']];
 $this->params['breadcrumbs'][] = ['label' => $model-><?= $generator->getNameAttribute() ?>, 'url' => ['view', <?= $urlParams ?>]];
 $this->params['breadcrumbs'][] = Yii::t('app', 'Update');

src/payment/migrations/m180315_104011_create_trade_charges_table.php

Spacing +19 added lines, -19 removed lines

@@ -22,29 +22,29 @@
 
         $this->createTable($this->tableName, [
             'id' => $this->bigPrimaryKey(),
-            'paid' => $this->boolean()->defaultValue(false),//boolean 是否已付款
-            'refunded' => $this->boolean()->defaultValue(false),//boolean 是否存在退款信息
-            'reversed' => $this->boolean()->defaultValue(false),//boolean 订单是否撤销
-            'channel' => $this->string(50)->notNull(),//付款渠道
-            'order_no' => $this->string()->notNull(),//商户订单号，适配每个渠道对此参数的要求，必须在商户的系统内唯一
-            'client_ip' => $this->ipAddress()->notNull(),//发起支付请求客户端的 IP 地址
-            'amount' => $this->unsignedInteger()->notNull(),//订单总金额（必须大于 0），单位为对应币种的最小货币单位，人民币为分
-            'amount_settle' => $this->unsignedInteger()->notNull(),//清算金额，单位为对应币种的最小货币单位，人民币为分。
-            'currency' => $this->string(3)->notNull(),//3 位 ISO 货币代码，人民币为  cny 。
-            'subject' => $this->string(32)->notNull(),//商品标题，该参数最长为 32 个 Unicode 字符
-            'body' => $this->string(128)->notNull(),//商品描述信息，该参数最长为 128 个 Unicode 字符
+            'paid' => $this->boolean()->defaultValue(false), //boolean 是否已付款
+            'refunded' => $this->boolean()->defaultValue(false), //boolean 是否存在退款信息
+            'reversed' => $this->boolean()->defaultValue(false), //boolean 订单是否撤销
+            'channel' => $this->string(50)->notNull(), //付款渠道
+            'order_no' => $this->string()->notNull(), //商户订单号，适配每个渠道对此参数的要求，必须在商户的系统内唯一
+            'client_ip' => $this->ipAddress()->notNull(), //发起支付请求客户端的 IP 地址
+            'amount' => $this->unsignedInteger()->notNull(), //订单总金额（必须大于 0），单位为对应币种的最小货币单位，人民币为分
+            'amount_settle' => $this->unsignedInteger()->notNull(), //清算金额，单位为对应币种的最小货币单位，人民币为分。
+            'currency' => $this->string(3)->notNull(), //3 位 ISO 货币代码，人民币为  cny 。
+            'subject' => $this->string(32)->notNull(), //商品标题，该参数最长为 32 个 Unicode 字符
+            'body' => $this->string(128)->notNull(), //商品描述信息，该参数最长为 128 个 Unicode 字符
             //'extra',
-            'time_paid' => $this->unixTimestamp(),//订单支付完成时的 Unix 时间戳。（银联支付成功时间为接收异步通知的时间）
-            'time_expire' => $this->unixTimestamp(),//订单失效时间
-            'time_settle' => $this->unixTimestamp(),//订单清算时间，用 Unix 时间戳表示。（暂不生效）
-            'transaction_no' => $this->string(64),//支付渠道返回的交易流水号。
+            'time_paid' => $this->unixTimestamp(), //订单支付完成时的 Unix 时间戳。（银联支付成功时间为接收异步通知的时间）
+            'time_expire' => $this->unixTimestamp(), //订单失效时间
+            'time_settle' => $this->unixTimestamp(), //订单清算时间，用 Unix 时间戳表示。（暂不生效）
+            'transaction_no' => $this->string(64), //支付渠道返回的交易流水号。
             //'refunds',//退款详情列表
-            'amount_refunded' => $this->unsignedInteger()->notNull(),//已退款总金额，单位为对应币种的最小货币单位，例如：人民币为分。
-            'failure_code' => $this->string(),//订单的错误码
-            'failure_msg' => $this->string(),//订单的错误消息的描述。
+            'amount_refunded' => $this->unsignedInteger()->notNull(), //已退款总金额，单位为对应币种的最小货币单位，例如：人民币为分。
+            'failure_code' => $this->string(), //订单的错误码
+            'failure_msg' => $this->string(), //订单的错误消息的描述。
             'metadata',
             //'credential',
-            'description' => $this->string(255),//订单附加说明，最多 255 个 Unicode 字符。
+            'description' => $this->string(255), //订单附加说明，最多 255 个 Unicode 字符。
             'created_at' => $this->unixTimestamp(),
         ], $tableOptions);
     }