yuncms / framework

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

src/web/Response.php

Spacing +1 added lines, -1 removed lines

@@ -92,7 +92,7 @@
     public function startBuffering($content)
     {
         $this->getHeaders()
-            ->set('Surrogate-Control','BigPipe/1.0')
+            ->set('Surrogate-Control', 'BigPipe/1.0')
             ->set('X-Accel-Buffering', 'no');
         $this->data = $content;
         $this->send();

src/oauth2/actions/QRCode.php

Spacing +1 added lines, -1 removed lines

@@ -45,7 +45,7 @@
         if (empty($code)) {
             $code = Yii::$app->security->generateRandomString(40);
         }
-        $attributes = Yii::$app->cache->getOrSet([self::CACHE_PREFIX, 'code' => $code], function ($cache) use ($code) {
+        $attributes = Yii::$app->cache->getOrSet([self::CACHE_PREFIX, 'code' => $code], function($cache) use ($code) {
             return [
                 'code' => $code,
                 'msg' => Yii::t('yuncms', 'Please use App Scan QR code to login.'),

src/oauth2/actions/Token.php

Spacing +4 added lines, -4 removed lines

@@ -32,10 +32,10 @@
     public $grantTypes = [
         'authorization_code' => 'yuncms\oauth2\grant\types\Authorization',
         'refresh_token' => 'yuncms\oauth2\grant\types\RefreshToken',
-        'client_credentials' => 'yuncms\oauth2\grant\types\ClientCredentials',//个人账户密码
-        'password' => 'yuncms\oauth2\grant\types\UserCredentials',//账户密码
-        'wechat' => 'yuncms\oauth2\grant\types\WechatCredentials',//微信
-        'qrcode' => 'yuncms\oauth2\grant\types\QRCode',//客户端扫码
+        'client_credentials' => 'yuncms\oauth2\grant\types\ClientCredentials', //个人账户密码
+        'password' => 'yuncms\oauth2\grant\types\UserCredentials', //账户密码
+        'wechat' => 'yuncms\oauth2\grant\types\WechatCredentials', //微信
+        'qrcode' => 'yuncms\oauth2\grant\types\QRCode', //客户端扫码
 //        'urn:ietf:params:oauth:grant-type:jwt-bearer' => 'yuncms\oauth2\grant\types\JwtBearer',//JWT 客户端签名
     ];