yuncms / framework

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/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/models/Attachment.php

Spacing +1 added lines, -1 removed lines

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

src/admin/controllers/VolumesController.php

Spacing +1 added lines, -1 removed lines

@@ -29,7 +29,7 @@
         $variables = [];
         $variables['volumes'] = Yii::$app->getFilesystem()->getFilesystems();
 
-        print_r($variables);exit;
+        print_r($variables); exit;
         return $this->renderTemplate('settings/assets/volumes/_index', $variables);
     }
 }
\ No newline at end of file