@@ -50,7 +50,7 @@ discard block |
||
50 | 50 | |
51 | 51 | /** |
52 | 52 | * Lists all users. |
53 | - * @return mixed |
|
53 | + * @return string |
|
54 | 54 | */ |
55 | 55 | public function actionIndex() |
56 | 56 | { |
@@ -109,7 +109,7 @@ discard block |
||
109 | 109 | * Deletes an existing UserModel model. |
110 | 110 | * If deletion is successful, the browser will be redirected to the 'index' page. |
111 | 111 | * @param integer $id |
112 | - * @return mixed |
|
112 | + * @return \yii\web\Response |
|
113 | 113 | */ |
114 | 114 | public function actionDelete($id) |
115 | 115 | { |
@@ -1,5 +1,4 @@ |
||
1 | 1 | <?php |
2 | -use app\widgets\Alert; |
|
3 | 2 | use kartik\alert\AlertBlock; |
4 | 3 | use yii\helpers\Html; |
5 | 4 | use yii\bootstrap\Nav; |
@@ -52,7 +52,7 @@ |
||
52 | 52 | $menuItems[] = '<li>' |
53 | 53 | . Html::beginForm(['/site/logout'], 'post') |
54 | 54 | . Html::submitButton( |
55 | - 'Logout (' . Yii::$app->user->identity->username . ')', |
|
55 | + 'Logout ('.Yii::$app->user->identity->username.')', |
|
56 | 56 | ['class' => 'btn btn-link'] |
57 | 57 | ) |
58 | 58 | . Html::endForm() |
@@ -36,9 +36,9 @@ |
||
36 | 36 | 'mail' => [ |
37 | 37 | 'class' => 'yii\swiftmailer\Mailer', |
38 | 38 | 'transport' => [ |
39 | - 'class' => 'Swift_SmtpTransport', |
|
40 | - 'host' => 'host-here', |
|
41 | - ], |
|
39 | + 'class' => 'Swift_SmtpTransport', |
|
40 | + 'host' => 'host-here', |
|
41 | + ], |
|
42 | 42 | ], |
43 | 43 | 'i18n' => [ |
44 | 44 | 'translations' => [ |
@@ -1,6 +1,6 @@ |
||
1 | 1 | <?php |
2 | 2 | |
3 | -Yii::setAlias('@tests', dirname(__DIR__) . '/tests'); |
|
3 | +Yii::setAlias('@tests', dirname(__DIR__).'/tests'); |
|
4 | 4 | Yii::setAlias('@webroot', dirname(__DIR__)); |
5 | 5 | |
6 | 6 | $config = [ |
@@ -87,7 +87,7 @@ |
||
87 | 87 | 'options' => ['class' => 'navbar-nav navbar-right'], |
88 | 88 | 'items' => [ |
89 | 89 | ['label' => '<i class="glyphicon glyphicon-globe"></i> Public Area', 'url' => ['/']], |
90 | - ['label' => '<i class="glyphicon glyphicon-off"></i> Logout (' . Yii::$app->user->identity->username . ')', |
|
90 | + ['label' => '<i class="glyphicon glyphicon-off"></i> Logout ('.Yii::$app->user->identity->username.')', |
|
91 | 91 | 'url' => ['/site/logout'], |
92 | 92 | 'linkOptions' => ['data-method' => 'post'], |
93 | 93 | ] |
@@ -36,11 +36,11 @@ discard block |
||
36 | 36 | 'class' => EditableColumn::className(), |
37 | 37 | 'attribute' => 'status', |
38 | 38 | 'url' => ['edit-user'], |
39 | - 'value' => function ($model) { |
|
39 | + 'value' => function($model) { |
|
40 | 40 | return UserStatus::getLabel($model->status); |
41 | 41 | }, |
42 | 42 | 'type' => 'select', |
43 | - 'editableOptions' => function ($model) { |
|
43 | + 'editableOptions' => function($model) { |
|
44 | 44 | return [ |
45 | 45 | 'source' => Json::encode(UserStatus::listData()), |
46 | 46 | 'value' => $model->status, |
@@ -52,7 +52,7 @@ discard block |
||
52 | 52 | [ |
53 | 53 | 'attribute' => 'createdAt', |
54 | 54 | 'label' => 'Created date', |
55 | - 'value' => function ($model) { |
|
55 | + 'value' => function($model) { |
|
56 | 56 | return date("d-M-Y", $model->createdAt); |
57 | 57 | }, |
58 | 58 | 'filter' => false, |
@@ -11,16 +11,16 @@ discard block |
||
11 | 11 | */ |
12 | 12 | |
13 | 13 | // you may need to adjust this path to the correct Yii framework path |
14 | -$frameworkPath = dirname(__FILE__) . '/vendor/yiisoft/yii2'; |
|
14 | +$frameworkPath = dirname(__FILE__).'/vendor/yiisoft/yii2'; |
|
15 | 15 | |
16 | 16 | if (!is_dir($frameworkPath)) { |
17 | 17 | echo '<h1>Error</h1>'; |
18 | 18 | echo '<p><strong>The path to yii framework seems to be incorrect.</strong></p>'; |
19 | - echo '<p>You need to install Yii framework via composer or adjust the framework path in file <abbr title="' . __FILE__ . '">' . basename(__FILE__) . '</abbr>.</p>'; |
|
20 | - echo '<p>Please refer to the <abbr title="' . dirname(__FILE__) . '/README.md">README</abbr> on how to install Yii.</p>'; |
|
19 | + echo '<p>You need to install Yii framework via composer or adjust the framework path in file <abbr title="'.__FILE__.'">'.basename(__FILE__).'</abbr>.</p>'; |
|
20 | + echo '<p>Please refer to the <abbr title="'.dirname(__FILE__).'/README.md">README</abbr> on how to install Yii.</p>'; |
|
21 | 21 | } |
22 | 22 | |
23 | -require_once($frameworkPath . '/requirements/YiiRequirementChecker.php'); |
|
23 | +require_once($frameworkPath.'/requirements/YiiRequirementChecker.php'); |
|
24 | 24 | $requirementsChecker = new YiiRequirementChecker(); |
25 | 25 | |
26 | 26 | /** |
@@ -102,7 +102,7 @@ discard block |
||
102 | 102 | 'phpSmtp' => array( |
103 | 103 | 'name' => 'PHP mail SMTP', |
104 | 104 | 'mandatory' => false, |
105 | - 'condition' => strlen(ini_get('SMTP'))>0, |
|
105 | + 'condition' => strlen(ini_get('SMTP')) > 0, |
|
106 | 106 | 'by' => 'Email sending', |
107 | 107 | 'memo' => 'PHP mail SMTP server required', |
108 | 108 | ), |
@@ -10,13 +10,13 @@ |
||
10 | 10 | defined('YII_DEBUG') or define('YII_DEBUG', true); |
11 | 11 | defined('YII_ENV') or define('YII_ENV', 'test'); |
12 | 12 | |
13 | -require(__DIR__ . '/../vendor/autoload.php'); |
|
14 | -require(__DIR__ . '/../vendor/yiisoft/yii2/Yii.php'); |
|
13 | +require(__DIR__.'/../vendor/autoload.php'); |
|
14 | +require(__DIR__.'/../vendor/yiisoft/yii2/Yii.php'); |
|
15 | 15 | |
16 | 16 | include '../c3.php'; |
17 | 17 | |
18 | 18 | define('MY_APP_STARTED', true); |
19 | 19 | |
20 | -$config = require(__DIR__ . '/../tests/codeception/config/acceptance.php'); |
|
20 | +$config = require(__DIR__.'/../tests/codeception/config/acceptance.php'); |
|
21 | 21 | |
22 | 22 | (new yii\web\Application($config))->run(); |
@@ -53,17 +53,17 @@ |
||
53 | 53 | |
54 | 54 | $session = \Yii::$app->getSession(); |
55 | 55 | $flashes = $session->getAllFlashes(); |
56 | - $appendCss = isset($this->options['class']) ? ' ' . $this->options['class'] : ''; |
|
56 | + $appendCss = isset($this->options['class']) ? ' '.$this->options['class'] : ''; |
|
57 | 57 | |
58 | 58 | foreach ($flashes as $type => $data) { |
59 | 59 | if (isset($this->alertTypes[$type])) { |
60 | 60 | $data = (array) $data; |
61 | 61 | foreach ($data as $message) { |
62 | 62 | /* initialize css class for each alert box */ |
63 | - $this->options['class'] = $this->alertTypes[$type] . $appendCss; |
|
63 | + $this->options['class'] = $this->alertTypes[$type].$appendCss; |
|
64 | 64 | |
65 | 65 | /* assign unique id to each alert box */ |
66 | - $this->options['id'] = $this->getId() . '-' . $type; |
|
66 | + $this->options['id'] = $this->getId().'-'.$type; |
|
67 | 67 | |
68 | 68 | echo \yii\bootstrap\Alert::widget([ |
69 | 69 | 'body' => $message, |