yuncms / framework

src/rest/controllers/PersonController.php

Spacing +1 added lines, -1 removed lines

@@ -78,7 +78,7 @@
             }
             return $model;
         } else {
-            throw new NotFoundHttpException ('User not found.');
+            throw new NotFoundHttpException('User not found.');
         }
     }
 

src/user/controllers/SettingsController.php

Spacing +3 added lines, -3 removed lines

@@ -49,7 +49,7 @@ 
                 'rules' => [
                     [
                         'allow' => true,
-                        'actions' => ['profile', 'account', 'privacy', 'avatar', 'confirm', 'networks', 'disconnect','follower-tag'],
+                        'actions' => ['profile', 'account', 'privacy', 'avatar', 'confirm', 'networks', 'disconnect', 'follower-tag'],
                         'roles' => ['@'],
                     ],
                 ],
@@ -129,7 +129,7 @@ 
         Yii::$app->response->format = Response::FORMAT_JSON;
         $tagId = Yii::$app->request->post('tag_id', null);
         if (($tag = Tag::findOne($tagId)) == null) {
-            throw new NotFoundHttpException ();
+            throw new NotFoundHttpException();
         } else {
             /** @var \yuncms\user\models\User $user */
             $user = Yii::$app->user->identity;
@@ -157,7 +157,7 @@ 
     public function actionConfirm($id, $code)
     {
         $user = User::findOne($id);
-        if ($user === null || Yii::$app->settings->get('emailChangeStrategy','user') == UserSettings::STRATEGY_INSECURE) {
+        if ($user === null || Yii::$app->settings->get('emailChangeStrategy', 'user') == UserSettings::STRATEGY_INSECURE) {
             throw new NotFoundHttpException();
         }
         $user->attemptEmailChange($code);

src/user/controllers/RegistrationController.php

Spacing +3 added lines, -3 removed lines

@@ -128,7 +128,7 @@ 
 
         if ($user->load(Yii::$app->request->post()) && $user->createUser()) {
             $account->connect($user);
-            Yii::$app->user->login($user, Yii::$app->settings->get('rememberFor','user'));
+            Yii::$app->user->login($user, Yii::$app->settings->get('rememberFor', 'user'));
             return $this->goBack();
         }
 
@@ -149,7 +149,7 @@ 
     public function actionConfirm($id, $code)
     {
         $user = User::findOne($id);
-        if ($user === null || Yii::$app->settings->get('enableConfirmation','user') == false) {
+        if ($user === null || Yii::$app->settings->get('enableConfirmation', 'user') == false) {
             return $this->goBack();
         }
         $user->attemptEmailConfirmation($code);
@@ -163,7 +163,7 @@ 
      */
     public function actionResend()
     {
-        if (Yii::$app->settings->get('enableConfirmation','user') == false) {
+        if (Yii::$app->settings->get('enableConfirmation', 'user') == false) {
             return $this->goBack();
         }
         /** @var ResendForm $model */

src/rest/models/User.php

Spacing +4 added lines, -4 removed lines

@@ -26,17 +26,17 @@
         return [
             'id',
             'nickname',
-            'faceUrl' => function () {
+            'faceUrl' => function() {
                 return $this->getAvatar(AvatarHelper::AVATAR_MIDDLE);
             },
             'identified',
-            "created_datetime" => function () {
+            "created_datetime" => function() {
                 return gmdate(DATE_ISO8601, $this->created_at);
             },
-            "updated_datetime" => function () {
+            "updated_datetime" => function() {
                 return gmdate(DATE_ISO8601, $this->updated_at);
             },
-            'blocked_datetime' => function () {
+            'blocked_datetime' => function() {
                 return gmdate(DATE_ISO8601, $this->blocked_at);
             }
         ];

src/rest/controllers/NotificationController.php

Spacing +1 added lines, -1 removed lines

@@ -69,7 +69,7 @@
         $filter = null;
         $dataFilter = Yii::createObject([
             'class' => ActiveDataFilter::class,
-            'searchModel' => function () {
+            'searchModel' => function() {
                 return (new DynamicModel(['verb' => null]))
                     ->addRule('verb', 'string');
             },

src/notifications/migrations/m180410_092555_create_notification_table.php

Spacing +9 added lines, -9 removed lines

@@ -24,15 +24,15 @@
         }
         // https://segmentfault.com/q/1010000000672529/a-1020000000679702
         $this->createTable($this->tableName, [
-            'id' => $this->char(24)->notNull()->comment('Id'),//通知ID
-            'verb' => $this->string(32),//执行了什么操作
-            'template' => $this->string(),//模板
-            'notifiable_id' => $this->unsignedInteger()->notNull()->comment('Entity'),//通知实体ID
-            'notifiable_class' => $this->string()->notNull()->comment('Entity'),//通知实体类名
-            'data' => $this->text(),//通知数据
-            'read_at' => $this->unixTimestamp()->comment('Read At'),//阅读时间
-            'created_at' => $this->unixTimestamp()->notNull()->comment('Created At'),//创建时间
-            'updated_at' => $this->integer(10)->unsigned()->notNull()->comment('Updated At'),//更新时间
+            'id' => $this->char(24)->notNull()->comment('Id'), //通知ID
+            'verb' => $this->string(32), //执行了什么操作
+            'template' => $this->string(), //模板
+            'notifiable_id' => $this->unsignedInteger()->notNull()->comment('Entity'), //通知实体ID
+            'notifiable_class' => $this->string()->notNull()->comment('Entity'), //通知实体类名
+            'data' => $this->text(), //通知数据
+            'read_at' => $this->unixTimestamp()->comment('Read At'), //阅读时间
+            'created_at' => $this->unixTimestamp()->notNull()->comment('Created At'), //创建时间
+            'updated_at' => $this->integer(10)->unsigned()->notNull()->comment('Updated At'), //更新时间
         ], $tableOptions);
         $this->addPrimaryKey('{{%notification_notifiable_pk}}', $this->tableName, 'id');
         $this->createIndex('notification_notifiable', $this->tableName, ['notifiable_id', 'notifiable_class']);

migrations/m180428_084537_create_tasks_table.php

Spacing +9 added lines, -9 removed lines

@@ -24,15 +24,15 @@
         }
         $this->createTable($this->tableName, [
             'id' => $this->primaryKey(),
-            'name' => $this->string(50)->notNull(),//定时任务名称
-            'route' => $this->string(100)->notNull(),//任务路由
-            'crontab_str' => $this->string(50)->notNull(),//crontab格式
-            'switch' => $this->boolean()->notNull()->defaultValue(false),//任务开关 0关闭 1开启
-            'status' => $this->boolean()->defaultValue(false),//任务运行状态 0正常 1任务报错
-            'last_rundate' => $this->dateTime()->null(),//任务上次运行时间
-            'next_rundate' => $this->dateTime()->null(),//任务下次运行时间
-            'execmemory' => $this->decimal(9,2)->defaultValue('0.00'),//任务执行消耗内存(单位/byte)
-            'exectime' => $this->decimal(9,2)->defaultValue('0.00'),//任务执行消耗时间
+            'name' => $this->string(50)->notNull(), //定时任务名称
+            'route' => $this->string(100)->notNull(), //任务路由
+            'crontab_str' => $this->string(50)->notNull(), //crontab格式
+            'switch' => $this->boolean()->notNull()->defaultValue(false), //任务开关 0关闭 1开启
+            'status' => $this->boolean()->defaultValue(false), //任务运行状态 0正常 1任务报错
+            'last_rundate' => $this->dateTime()->null(), //任务上次运行时间
+            'next_rundate' => $this->dateTime()->null(), //任务下次运行时间
+            'execmemory' => $this->decimal(9, 2)->defaultValue('0.00'), //任务执行消耗内存(单位/byte)
+            'exectime' => $this->decimal(9, 2)->defaultValue('0.00'), //任务执行消耗时间
         ], $tableOptions);
     }
 

src/admin/controllers/TaskController.php

Indentation +8 added lines, -8 removed lines

@@ -121,14 +121,14 @@
         Yii::$app->getSession()->setFlash('success', Yii::t('yuncms', 'Delete success.'));
         return $this->redirect(['index']);
     }
-     /**
-      * Batch Delete existing Task 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 Task 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

@@ -155,7 +155,7 @@
         if (($model = Task::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/task/_form.php

Spacing +1 added lines, -1 removed lines

@@ -7,7 +7,7 @@
 /* @var yuncms\models\Task $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, 'name')->textInput(['maxlength' => true]) ?>
 <div class="hr-line-dashed"></div>