Skip to content

Y
yii2
Commit da07230a by Alexander Makarov
Options

Merge pull request #2535 from maximal/patch-1

Further coding standards fixes.
parents 413e71ff 5d14d788
Showing with 2 additions and 2 deletions
apps/basic/tests/unit/models/ContactFormTest.php
...@@ -42,7 +42,7 @@ class ContactFormTest extends TestCase ...@@ -42,7 +42,7 @@ class ContactFormTest extends TestCase
expect('email file should exist', file_exists($this->getMessageFile()))->true(); expect('email file should exist', file_exists($this->getMessageFile()))->true();
}); });
$this->specify('message should contain correct data', function () use($model) { $this->specify('message should contain correct data', function () use ($model) {
$emailMessage = file_get_contents($this->getMessageFile()); $emailMessage = file_get_contents($this->getMessageFile());
expect('email should contain user name', $emailMessage)->contains($model->name); expect('email should contain user name', $emailMessage)->contains($model->name);
......
apps/basic/views/layouts/main.php
...@@ -40,7 +40,7 @@ AppAsset::register($this); ...@@ -40,7 +40,7 @@ AppAsset::register($this);
['label' => 'Contact', 'url' => ['/site/contact']], ['label' => 'Contact', 'url' => ['/site/contact']],
Yii::$app->user->isGuest ? Yii::$app->user->isGuest ?
['label' => 'Login', 'url' => ['/site/login']] : ['label' => 'Login', 'url' => ['/site/login']] :
['label' => 'Logout (' . Yii::$app->user->identity->username . ')' , ['label' => 'Logout (' . Yii::$app->user->identity->username . ')',
'url' => ['/site/logout'], 'url' => ['/site/logout'],
'linkOptions' => ['data-method' => 'post']], 'linkOptions' => ['data-method' => 'post']],
], ],
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment