yuncms / framework

src/user/migrations/m180223_102826Create_user_profile_table.php

Spacing +1 added lines, -1 removed lines

@@ -30,7 +30,7 @@
             'location' => $this->string()->comment('Location'),
             'address' => $this->string()->comment('Address'),
             'website' => $this->string()->comment('Website'),
-            'timezone' => $this->string(100)->comment('Timezone'),//默认格林威治时间
+            'timezone' => $this->string(100)->comment('Timezone'), //默认格林威治时间
             'birthday' => $this->string(15)->comment('Birthday'),
             'current' => $this->smallInteger(1)->comment('Current'),
             'qq' => $this->string(11)->comment('QQ'),

src/db/jobs/CreateActiveRecordJob.php

Spacing +1 added lines, -1 removed lines

@@ -42,7 +42,7 @@
     {
         /** @var ActiveRecord $class */
         $class = $this->modelClass;
-        $class::create($this->attributes,$this->runValidation);
+        $class::create($this->attributes, $this->runValidation);
     }
 
     /**

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/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

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;
+}
+?>
     }
 
     /**

Spacing +2 added lines, -2 removed lines

@@ -33,7 +33,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, '\\') ?>;
@@ -74,7 +74,7 @@ 
             'searchModel' => $searchModel,
             'dataProvider' => $dataProvider,
         ]);
-<?php else: ?>
+<?php else : ?>
         $dataProvider = new ActiveDataProvider([
             'query' => <?= $modelClass ?>::find(),
         ]);

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

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>

Spacing +2 added lines, -2 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([

src/admin/controllers/AttachmentController.php

Spacing +2 added lines, -2 removed lines

@@ -83,7 +83,7 @@ 
     public function actionDelete($id)
     {
         $this->findModel($id)->delete();
-        Yii::$app->getSession()->setFlash('success', Yii::t('yuncms','Delete success.'));
+        Yii::$app->getSession()->setFlash('success', Yii::t('yuncms', 'Delete success.'));
         return $this->redirect(['index']);
     }
 
@@ -119,7 +119,7 @@ 
         if (($model = Attachment::findOne($id)) !== null) {
             return $model;
         } else {
-            throw new NotFoundHttpException (Yii::t('yuncms', 'The requested page does not exist.'));
+            throw new NotFoundHttpException(Yii::t('yuncms', 'The requested page does not exist.'));
         }
     }
 }

src/user/models/AvatarForm.php

Spacing +1 added lines, -1 removed lines

@@ -81,7 +81,7 @@
     {
         if ($this->validate()) {
             $user = $this->getUser();
-            if(AvatarHelper::save($user, $this->getOriginalImage())){
+            if (AvatarHelper::save($user, $this->getOriginalImage())) {
                 return true;
             } else {
                 return false;

src/rest/models/UserEmailRegistrationForm.php

Spacing +1 added lines, -1 removed lines

@@ -81,7 +81,7 @@
             $user = new User();
             $user->setScenario(User::SCENARIO_EMAIL_REGISTER);
             $this->loadAttributes($user);
-            if($user->createUser()){
+            if ($user->createUser()) {
                 return $user;
             }
         }