Skip to content

Y
yii2
Commit c2dabfa7 by Alexander Makarov
Options

Adjusted short tags

parent ee261d38
Showing with 244 additions and 244 deletions
apps/advanced/backend/views/layouts/main.php
...@@ -15,8 +15,8 @@ AppAsset::register($this); ...@@ -15,8 +15,8 @@ AppAsset::register($this);
<!DOCTYPE html> <!DOCTYPE html>
<html lang="en"> <html lang="en">
<head> <head>
<meta charset="<?=Yii::$app->charset; ?>"/> <meta charset="<?= Yii::$app->charset ?>"/>
<title><?=Html::encode($this->title); ?></title> <title><?= Html::encode($this->title) ?></title>
<?php $this->head(); ?> <?php $this->head(); ?>
</head> </head>
<body> <body>
...@@ -48,13 +48,13 @@ AppAsset::register($this); ...@@ -48,13 +48,13 @@ AppAsset::register($this);
<?=Breadcrumbs::widget([ <?=Breadcrumbs::widget([
'links' => isset($this->params['breadcrumbs']) ? $this->params['breadcrumbs'] : [], 'links' => isset($this->params['breadcrumbs']) ? $this->params['breadcrumbs'] : [],
]); ?> ]); ?>
<?=$content; ?> <?= $content ?>
</div> </div>
<footer class="footer"> <footer class="footer">
<div class="container"> <div class="container">
<p class="pull-left">&copy; My Company <?=date('Y'); ?></p> <p class="pull-left">&copy; My Company <?= date('Y') ?></p>
<p class="pull-right"><?=Yii::powered(); ?></p> <p class="pull-right"><?= Yii::powered() ?></p>
</div> </div>
</footer> </footer>
......
apps/advanced/backend/views/site/error.php
...@@ -13,10 +13,10 @@ $this->title = $name; ...@@ -13,10 +13,10 @@ $this->title = $name;
?> ?>
<div class="site-error"> <div class="site-error">
<h1><?=Html::encode($this->title); ?></h1> <h1><?= Html::encode($this->title) ?></h1>
<div class="alert alert-danger"> <div class="alert alert-danger">
<?=nl2br(Html::encode($message)); ?> <?= nl2br(Html::encode($message)) ?>
</div> </div>
<p> <p>
......
apps/advanced/backend/views/site/login.php
...@@ -11,18 +11,18 @@ $this->title = 'Login'; ...@@ -11,18 +11,18 @@ $this->title = 'Login';
$this->params['breadcrumbs'][] = $this->title; $this->params['breadcrumbs'][] = $this->title;
?> ?>
<div class="site-login"> <div class="site-login">
<h1><?=Html::encode($this->title); ?></h1> <h1><?= Html::encode($this->title) ?></h1>
<p>Please fill out the following fields to login:</p> <p>Please fill out the following fields to login:</p>
<div class="row"> <div class="row">
<div class="col-lg-5"> <div class="col-lg-5">
<?php $form = ActiveForm::begin(['id' => 'login-form']); ?> <?php $form = ActiveForm::begin(['id' => 'login-form']); ?>
<?=$form->field($model, 'username'); ?> <?= $form->field($model, 'username') ?>
<?=$form->field($model, 'password')->passwordInput(); ?> <?= $form->field($model, 'password')->passwordInput() ?>
<?=$form->field($model, 'rememberMe')->checkbox(); ?> <?= $form->field($model, 'rememberMe')->checkbox() ?>
<div class="form-group"> <div class="form-group">
<?=Html::submitButton('Login', ['class' => 'btn btn-primary']); ?> <?= Html::submitButton('Login', ['class' => 'btn btn-primary']) ?>
</div> </div>
<?php ActiveForm::end(); ?> <?php ActiveForm::end(); ?>
</div> </div>
......
apps/advanced/frontend/views/layouts/main.php
...@@ -16,8 +16,8 @@ AppAsset::register($this); ...@@ -16,8 +16,8 @@ AppAsset::register($this);
<!DOCTYPE html> <!DOCTYPE html>
<html lang="en"> <html lang="en">
<head> <head>
<meta charset="<?=Yii::$app->charset; ?>"/> <meta charset="<?= Yii::$app->charset ?>"/>
<title><?=Html::encode($this->title); ?></title> <title><?= Html::encode($this->title) ?></title>
<?php $this->head(); ?> <?php $this->head(); ?>
</head> </head>
<body> <body>
...@@ -53,13 +53,13 @@ AppAsset::register($this); ...@@ -53,13 +53,13 @@ AppAsset::register($this);
'links' => isset($this->params['breadcrumbs']) ? $this->params['breadcrumbs'] : [], 'links' => isset($this->params['breadcrumbs']) ? $this->params['breadcrumbs'] : [],
]); ?> ]); ?>
<?=Alert::widget()?> <?=Alert::widget()?>
<?=$content; ?> <?= $content ?>
</div> </div>
<footer class="footer"> <footer class="footer">
<div class="container"> <div class="container">
<p class="pull-left">&copy; My Company <?=date('Y'); ?></p> <p class="pull-left">&copy; My Company <?= date('Y') ?></p>
<p class="pull-right"><?=Yii::powered(); ?></p> <p class="pull-right"><?= Yii::powered() ?></p>
</div> </div>
</footer> </footer>
......
apps/advanced/frontend/views/site/about.php
...@@ -8,9 +8,9 @@ $this->title = 'About'; ...@@ -8,9 +8,9 @@ $this->title = 'About';
$this->params['breadcrumbs'][] = $this->title; $this->params['breadcrumbs'][] = $this->title;
?> ?>
<div class="site-about"> <div class="site-about">
<h1><?=Html::encode($this->title); ?></h1> <h1><?= Html::encode($this->title) ?></h1>
<p>This is the About page. You may modify the following file to customize its content:</p> <p>This is the About page. You may modify the following file to customize its content:</p>
<code><?=__FILE__; ?></code> <code><?= __FILE__ ?></code>
</div> </div>
apps/advanced/frontend/views/site/contact.php
...@@ -12,7 +12,7 @@ $this->title = 'Contact'; ...@@ -12,7 +12,7 @@ $this->title = 'Contact';
$this->params['breadcrumbs'][] = $this->title; $this->params['breadcrumbs'][] = $this->title;
?> ?>
<div class="site-contact"> <div class="site-contact">
<h1><?=Html::encode($this->title); ?></h1> <h1><?= Html::encode($this->title) ?></h1>
<p> <p>
If you have business inquiries or other questions, please fill out the following form to contact us. Thank you. If you have business inquiries or other questions, please fill out the following form to contact us. Thank you.
...@@ -21,16 +21,16 @@ $this->params['breadcrumbs'][] = $this->title; ...@@ -21,16 +21,16 @@ $this->params['breadcrumbs'][] = $this->title;
<div class="row"> <div class="row">
<div class="col-lg-5"> <div class="col-lg-5">
<?php $form = ActiveForm::begin(['id' => 'contact-form']); ?> <?php $form = ActiveForm::begin(['id' => 'contact-form']); ?>
<?=$form->field($model, 'name'); ?> <?= $form->field($model, 'name') ?>
<?=$form->field($model, 'email'); ?> <?= $form->field($model, 'email') ?>
<?=$form->field($model, 'subject'); ?> <?= $form->field($model, 'subject') ?>
<?=$form->field($model, 'body')->textArea(['rows' => 6]); ?> <?= $form->field($model, 'body')->textArea(['rows' => 6]) ?>
<?=$form->field($model, 'verifyCode')->widget(Captcha::className(), [ <?=$form->field($model, 'verifyCode')->widget(Captcha::className(), [
'options' => ['class' => 'form-control'], 'options' => ['class' => 'form-control'],
'template' => '<div class="row"><div class="col-lg-3">{image}</div><div class="col-lg-6">{input}</div></div>', 'template' => '<div class="row"><div class="col-lg-3">{image}</div><div class="col-lg-6">{input}</div></div>',
]); ?> ]); ?>
<div class="form-group"> <div class="form-group">
<?=Html::submitButton('Submit', ['class' => 'btn btn-primary']); ?> <?= Html::submitButton('Submit', ['class' => 'btn btn-primary']) ?>
</div> </div>
<?php ActiveForm::end(); ?> <?php ActiveForm::end(); ?>
</div> </div>
......
apps/advanced/frontend/views/site/error.php
...@@ -13,10 +13,10 @@ $this->title = $name; ...@@ -13,10 +13,10 @@ $this->title = $name;
?> ?>
<div class="site-error"> <div class="site-error">
<h1><?=Html::encode($this->title); ?></h1> <h1><?= Html::encode($this->title) ?></h1>
<div class="alert alert-danger"> <div class="alert alert-danger">
<?=nl2br(Html::encode($message)); ?> <?= nl2br(Html::encode($message)) ?>
</div> </div>
<p> <p>
......
apps/advanced/frontend/views/site/login.php
...@@ -11,21 +11,21 @@ $this->title = 'Login'; ...@@ -11,21 +11,21 @@ $this->title = 'Login';
$this->params['breadcrumbs'][] = $this->title; $this->params['breadcrumbs'][] = $this->title;
?> ?>
<div class="site-login"> <div class="site-login">
<h1><?=Html::encode($this->title); ?></h1> <h1><?= Html::encode($this->title) ?></h1>
<p>Please fill out the following fields to login:</p> <p>Please fill out the following fields to login:</p>
<div class="row"> <div class="row">
<div class="col-lg-5"> <div class="col-lg-5">
<?php $form = ActiveForm::begin(['id' => 'login-form']); ?> <?php $form = ActiveForm::begin(['id' => 'login-form']); ?>
<?=$form->field($model, 'username'); ?> <?= $form->field($model, 'username') ?>
<?=$form->field($model, 'password')->passwordInput(); ?> <?= $form->field($model, 'password')->passwordInput() ?>
<?=$form->field($model, 'rememberMe')->checkbox(); ?> <?= $form->field($model, 'rememberMe')->checkbox() ?>
<div style="color:#999;margin:1em 0"> <div style="color:#999;margin:1em 0">
If you forgot your password you can <?=Html::a('reset it', ['site/request-password-reset'])?>. If you forgot your password you can <?=Html::a('reset it', ['site/request-password-reset'])?>.
</div> </div>
<div class="form-group"> <div class="form-group">
<?=Html::submitButton('Login', ['class' => 'btn btn-primary']); ?> <?= Html::submitButton('Login', ['class' => 'btn btn-primary']) ?>
</div> </div>
<?php ActiveForm::end(); ?> <?php ActiveForm::end(); ?>
</div> </div>
......
apps/advanced/frontend/views/site/requestPasswordResetToken.php
...@@ -11,16 +11,16 @@ $this->title = 'Request password reset'; ...@@ -11,16 +11,16 @@ $this->title = 'Request password reset';
$this->params['breadcrumbs'][] = $this->title; $this->params['breadcrumbs'][] = $this->title;
?> ?>
<div class="site-request-password-reset"> <div class="site-request-password-reset">
<h1><?=Html::encode($this->title); ?></h1> <h1><?= Html::encode($this->title) ?></h1>
<p>Please fill out your email. A link to reset password will be sent there.</p> <p>Please fill out your email. A link to reset password will be sent there.</p>
<div class="row"> <div class="row">
<div class="col-lg-5"> <div class="col-lg-5">
<?php $form = ActiveForm::begin(['id' => 'request-password-reset-form']); ?> <?php $form = ActiveForm::begin(['id' => 'request-password-reset-form']); ?>
<?=$form->field($model, 'email'); ?> <?= $form->field($model, 'email') ?>
<div class="form-group"> <div class="form-group">
<?=Html::submitButton('Send', ['class' => 'btn btn-primary']); ?> <?= Html::submitButton('Send', ['class' => 'btn btn-primary']) ?>
</div> </div>
<?php ActiveForm::end(); ?> <?php ActiveForm::end(); ?>
</div> </div>
......
apps/advanced/frontend/views/site/resetPassword.php
...@@ -11,16 +11,16 @@ $this->title = 'Reset password'; ...@@ -11,16 +11,16 @@ $this->title = 'Reset password';
$this->params['breadcrumbs'][] = $this->title; $this->params['breadcrumbs'][] = $this->title;
?> ?>
<div class="site-reset-password"> <div class="site-reset-password">
<h1><?=Html::encode($this->title); ?></h1> <h1><?= Html::encode($this->title) ?></h1>
<p>Please choose your new password:</p> <p>Please choose your new password:</p>
<div class="row"> <div class="row">
<div class="col-lg-5"> <div class="col-lg-5">
<?php $form = ActiveForm::begin(['id' => 'reset-password-form']); ?> <?php $form = ActiveForm::begin(['id' => 'reset-password-form']); ?>
<?=$form->field($model, 'password')->passwordInput(); ?> <?= $form->field($model, 'password')->passwordInput() ?>
<div class="form-group"> <div class="form-group">
<?=Html::submitButton('Save', ['class' => 'btn btn-primary']); ?> <?= Html::submitButton('Save', ['class' => 'btn btn-primary']) ?>
</div> </div>
<?php ActiveForm::end(); ?> <?php ActiveForm::end(); ?>
</div> </div>
......
apps/advanced/frontend/views/site/signup.php
...@@ -11,18 +11,18 @@ $this->title = 'Signup'; ...@@ -11,18 +11,18 @@ $this->title = 'Signup';
$this->params['breadcrumbs'][] = $this->title; $this->params['breadcrumbs'][] = $this->title;
?> ?>
<div class="site-signup"> <div class="site-signup">
<h1><?=Html::encode($this->title); ?></h1> <h1><?= Html::encode($this->title) ?></h1>
<p>Please fill out the following fields to signup:</p> <p>Please fill out the following fields to signup:</p>
<div class="row"> <div class="row">
<div class="col-lg-5"> <div class="col-lg-5">
<?php $form = ActiveForm::begin(['id' => 'form-signup']); ?> <?php $form = ActiveForm::begin(['id' => 'form-signup']); ?>
<?=$form->field($model, 'username'); ?> <?= $form->field($model, 'username') ?>
<?=$form->field($model, 'email'); ?> <?= $form->field($model, 'email') ?>
<?=$form->field($model, 'password')->passwordInput(); ?> <?= $form->field($model, 'password')->passwordInput() ?>
<div class="form-group"> <div class="form-group">
<?=Html::submitButton('Signup', ['class' => 'btn btn-primary']); ?> <?= Html::submitButton('Signup', ['class' => 'btn btn-primary']) ?>
</div> </div>
<?php ActiveForm::end(); ?> <?php ActiveForm::end(); ?>
</div> </div>
......
apps/basic/views/layouts/main.php
...@@ -14,8 +14,8 @@ app\config\AppAsset::register($this); ...@@ -14,8 +14,8 @@ app\config\AppAsset::register($this);
<!DOCTYPE html> <!DOCTYPE html>
<html lang="en"> <html lang="en">
<head> <head>
<meta charset="<?=Yii::$app->charset; ?>"/> <meta charset="<?= Yii::$app->charset ?>"/>
<title><?=Html::encode($this->title); ?></title> <title><?= Html::encode($this->title) ?></title>
<?php $this->head(); ?> <?php $this->head(); ?>
</head> </head>
<body> <body>
...@@ -48,13 +48,13 @@ app\config\AppAsset::register($this); ...@@ -48,13 +48,13 @@ app\config\AppAsset::register($this);
<?=Breadcrumbs::widget([ <?=Breadcrumbs::widget([
'links' => isset($this->params['breadcrumbs']) ? $this->params['breadcrumbs'] : [], 'links' => isset($this->params['breadcrumbs']) ? $this->params['breadcrumbs'] : [],
]); ?> ]); ?>
<?=$content; ?> <?= $content ?>
</div> </div>
<footer class="footer"> <footer class="footer">
<div class="container"> <div class="container">
<p class="pull-left">&copy; My Company <?=date('Y'); ?></p> <p class="pull-left">&copy; My Company <?= date('Y') ?></p>
<p class="pull-right"><?=Yii::powered(); ?></p> <p class="pull-right"><?= Yii::powered() ?></p>
</div> </div>
</footer> </footer>
......
apps/basic/views/site/about.php
...@@ -8,11 +8,11 @@ $this->title = 'About'; ...@@ -8,11 +8,11 @@ $this->title = 'About';
$this->params['breadcrumbs'][] = $this->title; $this->params['breadcrumbs'][] = $this->title;
?> ?>
<div class="site-about"> <div class="site-about">
<h1><?=Html::encode($this->title); ?></h1> <h1><?= Html::encode($this->title) ?></h1>
<p> <p>
This is the About page. You may modify the following file to customize its content: This is the About page. You may modify the following file to customize its content:
</p> </p>
<code><?=__FILE__; ?></code> <code><?= __FILE__ ?></code>
</div> </div>
apps/basic/views/site/contact.php
...@@ -12,7 +12,7 @@ $this->title = 'Contact'; ...@@ -12,7 +12,7 @@ $this->title = 'Contact';
$this->params['breadcrumbs'][] = $this->title; $this->params['breadcrumbs'][] = $this->title;
?> ?>
<div class="site-contact"> <div class="site-contact">
<h1><?=Html::encode($this->title); ?></h1> <h1><?= Html::encode($this->title) ?></h1>
<?php if (Yii::$app->session->hasFlash('contactFormSubmitted')): ?> <?php if (Yii::$app->session->hasFlash('contactFormSubmitted')): ?>
...@@ -29,16 +29,16 @@ $this->params['breadcrumbs'][] = $this->title; ...@@ -29,16 +29,16 @@ $this->params['breadcrumbs'][] = $this->title;
<div class="row"> <div class="row">
<div class="col-lg-5"> <div class="col-lg-5">
<?php $form = ActiveForm::begin(['id' => 'contact-form']); ?> <?php $form = ActiveForm::begin(['id' => 'contact-form']); ?>
<?=$form->field($model, 'name'); ?> <?= $form->field($model, 'name') ?>
<?=$form->field($model, 'email'); ?> <?= $form->field($model, 'email') ?>
<?=$form->field($model, 'subject'); ?> <?= $form->field($model, 'subject') ?>
<?=$form->field($model, 'body')->textArea(['rows' => 6]); ?> <?= $form->field($model, 'body')->textArea(['rows' => 6]) ?>
<?=$form->field($model, 'verifyCode')->widget(Captcha::className(), [ <?=$form->field($model, 'verifyCode')->widget(Captcha::className(), [
'options' => ['class' => 'form-control'], 'options' => ['class' => 'form-control'],
'template' => '<div class="row"><div class="col-lg-3">{image}</div><div class="col-lg-6">{input}</div></div>', 'template' => '<div class="row"><div class="col-lg-3">{image}</div><div class="col-lg-6">{input}</div></div>',
]); ?> ]); ?>
<div class="form-group"> <div class="form-group">
<?=Html::submitButton('Submit', ['class' => 'btn btn-primary']); ?> <?= Html::submitButton('Submit', ['class' => 'btn btn-primary']) ?>
</div> </div>
<?php ActiveForm::end(); ?> <?php ActiveForm::end(); ?>
</div> </div>
......
apps/basic/views/site/error.php
...@@ -13,10 +13,10 @@ $this->title = $name; ...@@ -13,10 +13,10 @@ $this->title = $name;
?> ?>
<div class="site-error"> <div class="site-error">
<h1><?=Html::encode($this->title); ?></h1> <h1><?= Html::encode($this->title) ?></h1>
<div class="alert alert-danger"> <div class="alert alert-danger">
<?=nl2br(Html::encode($message)); ?> <?= nl2br(Html::encode($message)) ?>
</div> </div>
<p> <p>
......
apps/basic/views/site/login.php
...@@ -11,7 +11,7 @@ $this->title = 'Login'; ...@@ -11,7 +11,7 @@ $this->title = 'Login';
$this->params['breadcrumbs'][] = $this->title; $this->params['breadcrumbs'][] = $this->title;
?> ?>
<div class="site-login"> <div class="site-login">
<h1><?=Html::encode($this->title); ?></h1> <h1><?= Html::encode($this->title) ?></h1>
<p>Please fill out the following fields to login:</p> <p>Please fill out the following fields to login:</p>
...@@ -24,9 +24,9 @@ $this->params['breadcrumbs'][] = $this->title; ...@@ -24,9 +24,9 @@ $this->params['breadcrumbs'][] = $this->title;
], ],
]); ?> ]); ?>
<?=$form->field($model, 'username'); ?> <?= $form->field($model, 'username') ?>
<?=$form->field($model, 'password')->passwordInput(); ?> <?= $form->field($model, 'password')->passwordInput() ?>
<?=$form->field($model, 'rememberMe', [ <?=$form->field($model, 'rememberMe', [
'template' => "<div class=\"col-lg-offset-1 col-lg-3\">{input}</div>\n<div class=\"col-lg-8\">{error}</div>", 'template' => "<div class=\"col-lg-offset-1 col-lg-3\">{input}</div>\n<div class=\"col-lg-8\">{error}</div>",
...@@ -34,7 +34,7 @@ $this->params['breadcrumbs'][] = $this->title; ...@@ -34,7 +34,7 @@ $this->params['breadcrumbs'][] = $this->title;
<div class="form-group"> <div class="form-group">
<div class="col-lg-offset-1 col-lg-11"> <div class="col-lg-offset-1 col-lg-11">
<?=Html::submitButton('Login', ['class' => 'btn btn-primary']); ?> <?= Html::submitButton('Login', ['class' => 'btn btn-primary']) ?>
</div> </div>
</div> </div>
......
docs/guide/upgrade-from-v1.md
...@@ -340,10 +340,10 @@ It is represented as an `ActiveField` object. Using fields, you can build a form ...@@ -340,10 +340,10 @@ It is represented as an `ActiveField` object. Using fields, you can build a form
```php ```php
<?php $form = yii\widgets\ActiveForm::begin(); ?> <?php $form = yii\widgets\ActiveForm::begin(); ?>
<?=$form->field($model, 'username'); ?> <?= $form->field($model, 'username') ?>
<?=$form->field($model, 'password')->passwordInput(); ?> <?= $form->field($model, 'password')->passwordInput() ?>
<div class="form-group"> <div class="form-group">
<?=Html::submitButton('Login'); ?> <?= Html::submitButton('Login') ?>
</div> </div>
<?php yii\widgets\ActiveForm::end(); ?> <?php yii\widgets\ActiveForm::end(); ?>
``` ```
......
docs/guide/view.md
...@@ -76,7 +76,7 @@ use yii\helpers\Html; ...@@ -76,7 +76,7 @@ use yii\helpers\Html;
?> ?>
<div class="username"> <div class="username">
<?=Html::encode($user->name); ?> <?= Html::encode($user->name) ?>
</div> </div>
``` ```
...@@ -97,7 +97,7 @@ use yii\helpers\HtmlPurifier; ...@@ -97,7 +97,7 @@ use yii\helpers\HtmlPurifier;
?> ?>
<div class="post"> <div class="post">
<?=HtmlPurifier::process($post->text); ?> <?= HtmlPurifier::process($post->text) ?>
</div> </div>
``` ```
...@@ -256,16 +256,16 @@ use yii\helpers\Html; ...@@ -256,16 +256,16 @@ use yii\helpers\Html;
?> ?>
<?php $this->beginPage(); ?> <?php $this->beginPage(); ?>
<!DOCTYPE html> <!DOCTYPE html>
<html lang="<?=Yii::$app->charset; ?>"> <html lang="<?= Yii::$app->charset ?>">
<head> <head>
<meta charset="<?=Yii::$app->charset; ?>"/> <meta charset="<?= Yii::$app->charset ?>"/>
<title><?=Html::encode($this->title); ?></title> <title><?= Html::encode($this->title) ?></title>
<?php $this->head(); ?> <?php $this->head(); ?>
</head> </head>
<body> <body>
<?php $this->beginBody(); ?> <?php $this->beginBody(); ?>
<div class="container"> <div class="container">
<?=$content; ?> <?= $content ?>
</div> </div>
<footer class="footer">© 2013 me :)</footer> <footer class="footer">© 2013 me :)</footer>
<?php $this->endBody(); ?> <?php $this->endBody(); ?>
...@@ -295,8 +295,8 @@ use yii\helpers\Html; ...@@ -295,8 +295,8 @@ use yii\helpers\Html;
?> ?>
<div class="profile"> <div class="profile">
<h2><?=Html::encode($username); ?></h2> <h2><?= Html::encode($username) ?></h2>
<p><?=Html::encode($tagline); ?></p> <p><?= Html::encode($tagline) ?></p>
</div> </div>
``` ```
......
framework/yii/debug/views/default/index.php
...@@ -32,11 +32,11 @@ $this->title = 'Yii Debugger'; ...@@ -32,11 +32,11 @@ $this->title = 'Yii Debugger';
<tbody> <tbody>
<?php foreach ($manifest as $tag => $data): ?> <?php foreach ($manifest as $tag => $data): ?>
<tr> <tr>
<td><?=Html::a($tag, ['view', 'tag' => $tag]); ?></td> <td><?= Html::a($tag, ['view', 'tag' => $tag]) ?></td>
<td><?=date('Y-m-d h:i:sa', $data['time']); ?></td> <td><?= date('Y-m-d h:i:sa', $data['time']) ?></td>
<td><?=$data['ip']; ?></td> <td><?= $data['ip'] ?></td>
<td><?=$data['method']; ?></td> <td><?= $data['method'] ?></td>
<td><?=$data['url']; ?></td> <td><?= $data['url'] ?></td>
</tr> </tr>
<?php endforeach; ?> <?php endforeach; ?>
</tbody> </tbody>
......
framework/yii/debug/views/default/toolbar.php
...@@ -26,13 +26,13 @@ $url = $panels['request']->getUrl(); ...@@ -26,13 +26,13 @@ $url = $panels['request']->getUrl();
?> ?>
<div id="yii-debug-toolbar"> <div id="yii-debug-toolbar">
<?php foreach ($panels as $panel): ?> <?php foreach ($panels as $panel): ?>
<?=$panel->getSummary(); ?> <?= $panel->getSummary() ?>
<?php endforeach; ?> <?php endforeach; ?>
<span class="yii-debug-toolbar-toggler" onclick="<?=$minJs; ?>">›</span> <span class="yii-debug-toolbar-toggler" onclick="<?= $minJs ?>">›</span>
</div> </div>
<div id="yii-debug-toolbar-min"> <div id="yii-debug-toolbar-min">
<a href="<?=$url; ?>" title="Open Yii Debugger" id="yii-debug-toolbar-logo"> <a href="<?= $url ?>" title="Open Yii Debugger" id="yii-debug-toolbar-logo">
<img width="29" height="30" alt="" src="<?=ConfigPanel::getYiiLogo(); ?>"> <img width="29" height="30" alt="" src="<?= ConfigPanel::getYiiLogo() ?>">
</a> </a>
<span class="yii-debug-toolbar-toggler" onclick="<?=$maxJs; ?>">‹</span> <span class="yii-debug-toolbar-toggler" onclick="<?= $maxJs ?>">‹</span>
</div> </div>
framework/yii/debug/views/default/view.php
...@@ -21,7 +21,7 @@ $this->title = 'Yii Debugger'; ...@@ -21,7 +21,7 @@ $this->title = 'Yii Debugger';
Yii Debugger Yii Debugger
</div> </div>
<?php foreach ($panels as $panel): ?> <?php foreach ($panels as $panel): ?>
<?=$panel->getSummary(); ?> <?= $panel->getSummary() ?>
<?php endforeach; ?> <?php endforeach; ?>
</div> </div>
...@@ -71,7 +71,7 @@ $this->title = 'Yii Debugger'; ...@@ -71,7 +71,7 @@ $this->title = 'Yii Debugger';
echo ' at ' . date('Y-m-d h:i:s a', $summary['time']) . ' by ' . $summary['ip']; echo ' at ' . date('Y-m-d h:i:s a', $summary['time']) . ' by ' . $summary['ip'];
?> ?>
</div> </div>
<?=$activePanel->getDetail(); ?> <?= $activePanel->getDetail() ?>
</div> </div>
</div> </div>
</div> </div>
......
framework/yii/debug/views/layouts/main.php
...@@ -11,12 +11,12 @@ yii\debug\DebugAsset::register($this); ...@@ -11,12 +11,12 @@ yii\debug\DebugAsset::register($this);
<html> <html>
<?php $this->beginPage(); ?> <?php $this->beginPage(); ?>
<head> <head>
<title><?=Html::encode($this->title); ?></title> <title><?= Html::encode($this->title) ?></title>
<?php $this->head(); ?> <?php $this->head(); ?>
</head> </head>
<body> <body>
<?php $this->beginBody(); ?> <?php $this->beginBody(); ?>
<?=$content; ?> <?= $content ?>
<?php $this->endBody(); ?> <?php $this->endBody(); ?>
</body> </body>
<?php $this->endPage(); ?> <?php $this->endPage(); ?>
......
framework/yii/gii/generators/controller/templates/controller.php
...@@ -13,15 +13,15 @@ echo "<?php\n"; ...@@ -13,15 +13,15 @@ echo "<?php\n";
?> ?>
<?php if (!empty($generator->ns)): ?> <?php if (!empty($generator->ns)): ?>
namespace <?=$generator->ns; ?>; namespace <?= $generator->ns ?>;
<?php endif; ?> <?php endif; ?>
class <?=$generator->getControllerClass(); ?> extends <?='\\' . trim($generator->baseClass, '\\') . "\n"; ?> class <?= $generator->getControllerClass() ?> extends <?= '\\' . trim($generator->baseClass, '\\') . "\n" ?>
{ {
<?php foreach($generator->getActionIDs() as $action): ?> <?php foreach($generator->getActionIDs() as $action): ?>
public function action<?=Inflector::id2camel($action); ?>() public function action<?= Inflector::id2camel($action) ?>()
{ {
return $this->render('<?=$action; ?>'); return $this->render('<?= $action ?>');
} }
<?php endforeach; ?> <?php endforeach; ?>
......
framework/yii/gii/generators/controller/templates/view.php
...@@ -12,11 +12,11 @@ echo "<?php\n"; ...@@ -12,11 +12,11 @@ echo "<?php\n";
/** /**
* @var yii\base\View $this * @var yii\base\View $this
*/ */
<?="?>"; ?> <?= "?>" ?>
<h1><?=$generator->getControllerID() . '/' . $action; ?></h1> <h1><?= $generator->getControllerID() . '/' . $action ?></h1>
<p> <p>
You may change the content of this page by modifying You may change the content of this page by modifying
the file <code><?='<?php'; ?> echo __FILE__; ?></code>. the file <code><?= '<?php' ?> echo __FILE__; ?></code>.
</p> </p>
framework/yii/gii/generators/crud/templates/controller.php
...@@ -21,19 +21,19 @@ $actionParamComments = $generator->generateActionParamComments(); ...@@ -21,19 +21,19 @@ $actionParamComments = $generator->generateActionParamComments();
echo "<?php\n"; echo "<?php\n";
?> ?>
namespace <?=StringHelper::dirname(ltrim($generator->controllerClass, '\\')); ?>; namespace <?= StringHelper::dirname(ltrim($generator->controllerClass, '\\')) ?>;
use <?=ltrim($generator->modelClass, '\\'); ?>; use <?= ltrim($generator->modelClass, '\\') ?>;
use <?=ltrim($generator->searchModelClass, '\\'); ?>; use <?= ltrim($generator->searchModelClass, '\\') ?>;
use yii\data\ActiveDataProvider; use yii\data\ActiveDataProvider;
use <?=ltrim($generator->baseControllerClass, '\\'); ?>; use <?= ltrim($generator->baseControllerClass, '\\') ?>;
use yii\web\HttpException; use yii\web\HttpException;
use yii\web\VerbFilter; use yii\web\VerbFilter;
/** /**
* <?=$controllerClass; ?> implements the CRUD actions for <?=$modelClass; ?> model. * <?= $controllerClass ?> implements the CRUD actions for <?= $modelClass ?> model.
*/ */
class <?=$controllerClass; ?> extends <?=StringHelper::basename($generator->baseControllerClass) . "\n"; ?> class <?= $controllerClass ?> extends <?= StringHelper::basename($generator->baseControllerClass) . "\n" ?>
{ {
public function behaviors() public function behaviors()
{ {
...@@ -48,12 +48,12 @@ class <?=$controllerClass; ?> extends <?=StringHelper::basename($generator->base ...@@ -48,12 +48,12 @@ class <?=$controllerClass; ?> extends <?=StringHelper::basename($generator->base
} }
/** /**
* Lists all <?=$modelClass; ?> models. * Lists all <?= $modelClass ?> models.
* @return mixed * @return mixed
*/ */
public function actionIndex() public function actionIndex()
{ {
$searchModel = new <?=$searchModelClass; ?>; $searchModel = new <?= $searchModelClass ?>;
$dataProvider = $searchModel->search($_GET); $dataProvider = $searchModel->search($_GET);
return $this->render('index', [ return $this->render('index', [
...@@ -63,28 +63,28 @@ class <?=$controllerClass; ?> extends <?=StringHelper::basename($generator->base ...@@ -63,28 +63,28 @@ class <?=$controllerClass; ?> extends <?=StringHelper::basename($generator->base
} }
/** /**
* Displays a single <?=$modelClass; ?> model. * Displays a single <?= $modelClass ?> model.
* <?=implode("\n\t * ", $actionParamComments) . "\n"; ?> * <?= implode("\n\t * ", $actionParamComments) . "\n" ?>
* @return mixed * @return mixed
*/ */
public function actionView(<?=$actionParams; ?>) public function actionView(<?= $actionParams ?>)
{ {
return $this->render('view', [ return $this->render('view', [
'model' => $this->findModel(<?=$actionParams; ?>), 'model' => $this->findModel(<?= $actionParams ?>),
]); ]);
} }
/** /**
* Creates a new <?=$modelClass; ?> model. * Creates a new <?= $modelClass ?> model.
* If creation is successful, the browser will be redirected to the 'view' page. * If creation is successful, the browser will be redirected to the 'view' page.
* @return mixed * @return mixed
*/ */
public function actionCreate() public function actionCreate()
{ {
$model = new <?=$modelClass; ?>; $model = new <?= $modelClass ?>;
if ($model->load($_POST) && $model->save()) { if ($model->load($_POST) && $model->save()) {
return $this->redirect(['view', <?=$urlParams; ?>]); return $this->redirect(['view', <?= $urlParams ?>]);
} else { } else {
return $this->render('create', [ return $this->render('create', [
'model' => $model, 'model' => $model,
...@@ -93,17 +93,17 @@ class <?=$controllerClass; ?> extends <?=StringHelper::basename($generator->base ...@@ -93,17 +93,17 @@ class <?=$controllerClass; ?> extends <?=StringHelper::basename($generator->base
} }
/** /**
* Updates an existing <?=$modelClass; ?> model. * Updates an existing <?= $modelClass ?> model.
* If update is successful, the browser will be redirected to the 'view' page. * If update is successful, the browser will be redirected to the 'view' page.
* <?=implode("\n\t * ", $actionParamComments) . "\n"; ?> * <?= implode("\n\t * ", $actionParamComments) . "\n" ?>
* @return mixed * @return mixed
*/ */
public function actionUpdate(<?=$actionParams; ?>) public function actionUpdate(<?= $actionParams ?>)
{ {
$model = $this->findModel(<?=$actionParams; ?>); $model = $this->findModel(<?= $actionParams ?>);
if ($model->load($_POST) && $model->save()) { if ($model->load($_POST) && $model->save()) {
return $this->redirect(['view', <?=$urlParams; ?>]); return $this->redirect(['view', <?= $urlParams ?>]);
} else { } else {
return $this->render('update', [ return $this->render('update', [
'model' => $model, 'model' => $model,
...@@ -112,25 +112,25 @@ class <?=$controllerClass; ?> extends <?=StringHelper::basename($generator->base ...@@ -112,25 +112,25 @@ class <?=$controllerClass; ?> extends <?=StringHelper::basename($generator->base
} }
/** /**
* Deletes an existing <?=$modelClass; ?> model. * Deletes an existing <?= $modelClass ?> model.
* If deletion is successful, the browser will be redirected to the 'index' page. * If deletion is successful, the browser will be redirected to the 'index' page.
* <?=implode("\n\t * ", $actionParamComments) . "\n"; ?> * <?= implode("\n\t * ", $actionParamComments) . "\n" ?>
* @return mixed * @return mixed
*/ */
public function actionDelete(<?=$actionParams; ?>) public function actionDelete(<?= $actionParams ?>)
{ {
$this->findModel(<?=$actionParams; ?>)->delete(); $this->findModel(<?= $actionParams ?>)->delete();
return $this->redirect(['index']); return $this->redirect(['index']);
} }
/** /**
* Finds the <?=$modelClass; ?> model based on its primary key value. * Finds the <?= $modelClass ?> model based on its primary key value.
* If the model is not found, a 404 HTTP exception will be thrown. * If the model is not found, a 404 HTTP exception will be thrown.
* <?=implode("\n\t * ", $actionParamComments) . "\n"; ?> * <?= implode("\n\t * ", $actionParamComments) . "\n" ?>
* @return <?=$modelClass; ?> the loaded model * @return <?= $modelClass ?> the loaded model
* @throws HttpException if the model cannot be found * @throws HttpException if the model cannot be found
*/ */
protected function findModel(<?=$actionParams; ?>) protected function findModel(<?= $actionParams ?>)
{ {
<?php <?php
if (count($pks) === 1) { if (count($pks) === 1) {
...@@ -143,7 +143,7 @@ if (count($pks) === 1) { ...@@ -143,7 +143,7 @@ if (count($pks) === 1) {
$condition = '[' . implode(', ', $condition) . ']'; $condition = '[' . implode(', ', $condition) . ']';
} }
?> ?>
if (($model = <?=$modelClass; ?>::find(<?=$condition; ?>)) !== null) { if (($model = <?= $modelClass ?>::find(<?= $condition ?>)) !== null) {
return $model; return $model;
} else { } else {
throw new HttpException(404, 'The requested page does not exist.'); throw new HttpException(404, 'The requested page does not exist.');
......
framework/yii/gii/generators/crud/templates/search.php
...@@ -19,23 +19,23 @@ $searchConditions = $generator->generateSearchConditions(); ...@@ -19,23 +19,23 @@ $searchConditions = $generator->generateSearchConditions();
echo "<?php\n"; echo "<?php\n";
?> ?>
namespace <?=StringHelper::dirname(ltrim($generator->searchModelClass, '\\')); ?>; namespace <?= StringHelper::dirname(ltrim($generator->searchModelClass, '\\')) ?>;
use yii\base\Model; use yii\base\Model;
use yii\data\ActiveDataProvider; use yii\data\ActiveDataProvider;
use <?=ltrim($generator->modelClass, '\\'); ?>; use <?= ltrim($generator->modelClass, '\\') ?>;
/** /**
* <?=$searchModelClass; ?> represents the model behind the search form about <?=$modelClass; ?>. * <?= $searchModelClass ?> represents the model behind the search form about <?= $modelClass ?>.
*/ */
class <?=$searchModelClass; ?> extends Model class <?= $searchModelClass ?> extends Model
{ {
public $<?=implode(";\n\tpublic $", $searchAttributes); ?>; public $<?= implode(";\n\tpublic $", $searchAttributes) ?>;
public function rules() public function rules()
{ {
return [ return [
<?=implode(",\n\t\t\t", $rules); ?>, <?= implode(",\n\t\t\t", $rules) ?>,
]; ];
} }
...@@ -46,14 +46,14 @@ class <?=$searchModelClass; ?> extends Model ...@@ -46,14 +46,14 @@ class <?=$searchModelClass; ?> extends Model
{ {
return [ return [
<?php foreach ($labels as $name => $label): ?> <?php foreach ($labels as $name => $label): ?>
<?="'$name' => '" . addslashes($label) . "',\n"; ?> <?= "'$name' => '" . addslashes($label) . "',\n" ?>
<?php endforeach; ?> <?php endforeach; ?>
]; ];
} }
public function search($params) public function search($params)
{ {
$query = <?=$modelClass; ?>::find(); $query = <?= $modelClass ?>::find();
$dataProvider = new ActiveDataProvider([ $dataProvider = new ActiveDataProvider([
'query' => $query, 'query' => $query,
]); ]);
...@@ -62,7 +62,7 @@ class <?=$searchModelClass; ?> extends Model ...@@ -62,7 +62,7 @@ class <?=$searchModelClass; ?> extends Model
return $dataProvider; return $dataProvider;
} }
<?=implode("\n\t\t", $searchConditions); ?> <?= implode("\n\t\t", $searchConditions) ?>
return $dataProvider; return $dataProvider;
} }
......
framework/yii/gii/generators/crud/templates/views/_form.php
...@@ -23,22 +23,22 @@ use yii\widgets\ActiveForm; ...@@ -23,22 +23,22 @@ use yii\widgets\ActiveForm;
/** /**
* @var yii\base\View $this * @var yii\base\View $this
* @var <?=ltrim($generator->modelClass, '\\'); ?> $model * @var <?= ltrim($generator->modelClass, '\\') ?> $model
* @var yii\widgets\ActiveForm $form * @var yii\widgets\ActiveForm $form
*/ */
?> ?>
<div class="<?=Inflector::camel2id(StringHelper::basename($generator->modelClass)); ?>-form"> <div class="<?= Inflector::camel2id(StringHelper::basename($generator->modelClass)) ?>-form">
<?='<?php'; ?> $form = ActiveForm::begin(); ?> <?= '<?php' ?> $form = ActiveForm::begin(); ?>
<?php foreach ($safeAttributes as $attribute) { <?php foreach ($safeAttributes as $attribute) {
echo "\t\t<?=" . $generator->generateActiveField($attribute) . " ?>\n\n"; echo "\t\t<?=" . $generator->generateActiveField($attribute) . " ?>\n\n";
} ?> } ?>
<div class="form-group"> <div class="form-group">
<?='<?php'; ?> echo Html::submitButton($model->isNewRecord ? 'Create' : 'Update', ['class' => $model->isNewRecord ? 'btn btn-success' : 'btn btn-primary']); ?> <?= '<?php' ?> echo Html::submitButton($model->isNewRecord ? 'Create' : 'Update', ['class' => $model->isNewRecord ? 'btn btn-success' : 'btn btn-primary']); ?>
</div> </div>
<?='<?php'; ?> ActiveForm::end(); ?> <?= '<?php' ?> ActiveForm::end(); ?>
</div> </div>
framework/yii/gii/generators/crud/templates/views/_search.php
...@@ -16,14 +16,14 @@ use yii\widgets\ActiveForm; ...@@ -16,14 +16,14 @@ use yii\widgets\ActiveForm;
/** /**
* @var yii\base\View $this * @var yii\base\View $this
* @var <?=ltrim($generator->searchModelClass, '\\'); ?> $model * @var <?= ltrim($generator->searchModelClass, '\\') ?> $model
* @var yii\widgets\ActiveForm $form * @var yii\widgets\ActiveForm $form
*/ */
?> ?>
<div class="<?=Inflector::camel2id(StringHelper::basename($generator->modelClass)); ?>-search"> <div class="<?= Inflector::camel2id(StringHelper::basename($generator->modelClass)) ?>-search">
<?='<?php'; ?> $form = ActiveForm::begin([ <?= '<?php' ?> $form = ActiveForm::begin([
'action' => ['index'], 'action' => ['index'],
'method' => 'get', 'method' => 'get',
]); ?> ]); ?>
...@@ -39,10 +39,10 @@ foreach ($generator->getTableSchema()->getColumnNames() as $attribute) { ...@@ -39,10 +39,10 @@ foreach ($generator->getTableSchema()->getColumnNames() as $attribute) {
} }
?> ?>
<div class="form-group"> <div class="form-group">
<?='<?php'; ?> echo Html::submitButton('Search', ['class' => 'btn btn-primary']); ?> <?= '<?php' ?> echo Html::submitButton('Search', ['class' => 'btn btn-primary']); ?>
<?='<?php'; ?> echo Html::resetButton('Reset', ['class' => 'btn btn-default']); ?> <?= '<?php' ?> echo Html::resetButton('Reset', ['class' => 'btn btn-default']); ?>
</div> </div>
<?='<?php'; ?> ActiveForm::end(); ?> <?= '<?php' ?> ActiveForm::end(); ?>
</div> </div>
framework/yii/gii/generators/crud/templates/views/create.php
...@@ -15,18 +15,18 @@ use yii\helpers\Html; ...@@ -15,18 +15,18 @@ use yii\helpers\Html;
/** /**
* @var yii\base\View $this * @var yii\base\View $this
* @var <?=ltrim($generator->modelClass, '\\'); ?> $model * @var <?= ltrim($generator->modelClass, '\\') ?> $model
*/ */
$this->title = 'Create <?=Inflector::camel2words(StringHelper::basename($generator->modelClass)); ?>'; $this->title = 'Create <?= Inflector::camel2words(StringHelper::basename($generator->modelClass)) ?>';
$this->params['breadcrumbs'][] = ['label' => '<?=Inflector::pluralize(Inflector::camel2words(StringHelper::basename($generator->modelClass))); ?>', 'url' => ['index']]; $this->params['breadcrumbs'][] = ['label' => '<?= Inflector::pluralize(Inflector::camel2words(StringHelper::basename($generator->modelClass))) ?>', 'url' => ['index']];
$this->params['breadcrumbs'][] = $this->title; $this->params['breadcrumbs'][] = $this->title;
?> ?>
<div class="<?=Inflector::camel2id(StringHelper::basename($generator->modelClass)); ?>-create"> <div class="<?= Inflector::camel2id(StringHelper::basename($generator->modelClass)) ?>-create">
<h1><?="<?php"; ?> echo Html::encode($this->title); ?></h1> <h1><?= "<?php" ?> echo Html::encode($this->title); ?></h1>
<?="<?php"; ?> echo $this->render('_form', [ <?= "<?php" ?> echo $this->render('_form', [
'model' => $model, 'model' => $model,
]); ?> ]); ?>
......
framework/yii/gii/generators/crud/templates/views/index.php
...@@ -15,29 +15,29 @@ echo "<?php\n"; ...@@ -15,29 +15,29 @@ echo "<?php\n";
?> ?>
use yii\helpers\Html; use yii\helpers\Html;
use <?=$generator->indexWidgetType === 'grid' ? 'yii\grid\GridView' : 'yii\widgets\ListView'; ?>; use <?= $generator->indexWidgetType === 'grid' ? 'yii\grid\GridView' : 'yii\widgets\ListView' ?>;
/** /**
* @var yii\base\View $this * @var yii\base\View $this
* @var yii\data\ActiveDataProvider $dataProvider * @var yii\data\ActiveDataProvider $dataProvider
* @var <?=ltrim($generator->searchModelClass, '\\'); ?> $searchModel * @var <?= ltrim($generator->searchModelClass, '\\') ?> $searchModel
*/ */
$this->title = '<?=Inflector::pluralize(Inflector::camel2words(StringHelper::basename($generator->modelClass))); ?>'; $this->title = '<?= Inflector::pluralize(Inflector::camel2words(StringHelper::basename($generator->modelClass))) ?>';
$this->params['breadcrumbs'][] = $this->title; $this->params['breadcrumbs'][] = $this->title;
?> ?>
<div class="<?=Inflector::camel2id(StringHelper::basename($generator->modelClass)); ?>-index"> <div class="<?= Inflector::camel2id(StringHelper::basename($generator->modelClass)) ?>-index">
<h1><?="<?php"; ?> echo Html::encode($this->title); ?></h1> <h1><?= "<?php" ?> echo Html::encode($this->title); ?></h1>
<?='<?php' . ($generator->indexWidgetType === 'grid' ? ' //' : ''); ?> echo $this->render('_search', ['model' => $searchModel]); ?> <?= '<?php' . ($generator->indexWidgetType === 'grid' ? ' //' : '') ?> echo $this->render('_search', ['model' => $searchModel]); ?>
<p> <p>
<?='<?php'; ?> echo Html::a('Create <?=StringHelper::basename($generator->modelClass); ?>', ['create'], ['class' => 'btn btn-success']); ?> <?= '<?php' ?> echo Html::a('Create <?= StringHelper::basename($generator->modelClass) ?>', ['create'], ['class' => 'btn btn-success']); ?>
</p> </p>
<?php if ($generator->indexWidgetType === 'grid'): ?> <?php if ($generator->indexWidgetType === 'grid'): ?>
<?="<?php"; ?> echo GridView::widget([ <?= "<?php" ?> echo GridView::widget([
'dataProvider' => $dataProvider, 'dataProvider' => $dataProvider,
'filterModel' => $searchModel, 'filterModel' => $searchModel,
'columns' => [ 'columns' => [
...@@ -59,11 +59,11 @@ foreach ($generator->getTableSchema()->columns as $column) { ...@@ -59,11 +59,11 @@ foreach ($generator->getTableSchema()->columns as $column) {
], ],
]); ?> ]); ?>
<?php else: ?> <?php else: ?>
<?="<?php"; ?> echo ListView::widget([ <?= "<?php" ?> echo ListView::widget([
'dataProvider' => $dataProvider, 'dataProvider' => $dataProvider,
'itemOptions' => ['class' => 'item'], 'itemOptions' => ['class' => 'item'],
'itemView' => function ($model, $key, $index, $widget) { 'itemView' => function ($model, $key, $index, $widget) {
return Html::a(Html::encode($model-><?=$nameAttribute; ?>), ['view', <?=$urlParams; ?>]); return Html::a(Html::encode($model-><?= $nameAttribute ?>), ['view', <?= $urlParams ?>]);
}, },
]); ?> ]); ?>
<?php endif; ?> <?php endif; ?>
......
framework/yii/gii/generators/crud/templates/views/update.php
...@@ -17,19 +17,19 @@ use yii\helpers\Html; ...@@ -17,19 +17,19 @@ use yii\helpers\Html;
/** /**
* @var yii\base\View $this * @var yii\base\View $this
* @var <?=ltrim($generator->modelClass, '\\'); ?> $model * @var <?= ltrim($generator->modelClass, '\\') ?> $model
*/ */
$this->title = 'Update <?=Inflector::camel2words(StringHelper::basename($generator->modelClass)); ?>: ' . $model-><?=$generator->getNameAttribute(); ?>; $this->title = 'Update <?= Inflector::camel2words(StringHelper::basename($generator->modelClass)) ?>: ' . $model-><?= $generator->getNameAttribute() ?>;
$this->params['breadcrumbs'][] = ['label' => '<?=Inflector::pluralize(Inflector::camel2words(StringHelper::basename($generator->modelClass))); ?>', 'url' => ['index']]; $this->params['breadcrumbs'][] = ['label' => '<?= Inflector::pluralize(Inflector::camel2words(StringHelper::basename($generator->modelClass))) ?>', 'url' => ['index']];
$this->params['breadcrumbs'][] = ['label' => $model-><?=$generator->getNameAttribute(); ?>, 'url' => ['view', <?=$urlParams; ?>]]; $this->params['breadcrumbs'][] = ['label' => $model-><?= $generator->getNameAttribute() ?>, 'url' => ['view', <?= $urlParams ?>]];
$this->params['breadcrumbs'][] = 'Update'; $this->params['breadcrumbs'][] = 'Update';
?> ?>
<div class="<?=Inflector::camel2id(StringHelper::basename($generator->modelClass)); ?>-update"> <div class="<?= Inflector::camel2id(StringHelper::basename($generator->modelClass)) ?>-update">
<h1><?="<?php"; ?> echo Html::encode($this->title); ?></h1> <h1><?= "<?php" ?> echo Html::encode($this->title); ?></h1>
<?="<?php"; ?> echo $this->render('_form', [ <?= "<?php" ?> echo $this->render('_form', [
'model' => $model, 'model' => $model,
]); ?> ]); ?>
......
framework/yii/gii/generators/crud/templates/views/view.php
...@@ -18,27 +18,27 @@ use yii\widgets\DetailView; ...@@ -18,27 +18,27 @@ use yii\widgets\DetailView;
/** /**
* @var yii\base\View $this * @var yii\base\View $this
* @var <?=ltrim($generator->modelClass, '\\'); ?> $model * @var <?= ltrim($generator->modelClass, '\\') ?> $model
*/ */
$this->title = $model-><?=$generator->getNameAttribute(); ?>; $this->title = $model-><?= $generator->getNameAttribute() ?>;
$this->params['breadcrumbs'][] = ['label' => '<?=Inflector::pluralize(Inflector::camel2words(StringHelper::basename($generator->modelClass))); ?>', 'url' => ['index']]; $this->params['breadcrumbs'][] = ['label' => '<?= Inflector::pluralize(Inflector::camel2words(StringHelper::basename($generator->modelClass))) ?>', 'url' => ['index']];
$this->params['breadcrumbs'][] = $this->title; $this->params['breadcrumbs'][] = $this->title;
?> ?>
<div class="<?=Inflector::camel2id(StringHelper::basename($generator->modelClass)); ?>-view"> <div class="<?= Inflector::camel2id(StringHelper::basename($generator->modelClass)) ?>-view">
<h1><?="<?php"; ?> echo Html::encode($this->title); ?></h1> <h1><?= "<?php" ?> echo Html::encode($this->title); ?></h1>
<p> <p>
<?='<?php'; ?> echo Html::a('Update', ['update', <?=$urlParams; ?>], ['class' => 'btn btn-primary']); ?> <?= '<?php' ?> echo Html::a('Update', ['update', <?= $urlParams ?>], ['class' => 'btn btn-primary']); ?>
<?='<?php'; ?> echo Html::a('Delete', ['delete', <?=$urlParams; ?>], [ <?= '<?php' ?> echo Html::a('Delete', ['delete', <?= $urlParams ?>], [
'class' => 'btn btn-danger', 'class' => 'btn btn-danger',
'data-confirm' => Yii::t('app', 'Are you sure to delete this item?'), 'data-confirm' => Yii::t('app', 'Are you sure to delete this item?'),
'data-method' => 'post', 'data-method' => 'post',
]); ?> ]); ?>
</p> </p>
<?='<?php'; ?> echo DetailView::widget([ <?= '<?php' ?> echo DetailView::widget([
'model' => $model, 'model' => $model,
'attributes' => [ 'attributes' => [
<?php <?php
......
framework/yii/gii/generators/form/templates/action.php
...@@ -12,9 +12,9 @@ use yii\helpers\Inflector; ...@@ -12,9 +12,9 @@ use yii\helpers\Inflector;
echo "<?php\n"; echo "<?php\n";
?> ?>
public function action<?=Inflector::id2camel(trim(basename($generator->viewName), '_')); ?>() public function action<?= Inflector::id2camel(trim(basename($generator->viewName), '_')) ?>()
{ {
$model = new <?=$generator->modelClass; ?><?=empty($generator->scenarioName) ? '' : "(['scenario' => '{$generator->scenarioName}'])"; ?>; $model = new <?= $generator->modelClass ?><?= empty($generator->scenarioName) ? '' : "(['scenario' => '{$generator->scenarioName}'])" ?>;
if ($model->load($_POST)) { if ($model->load($_POST)) {
if($model->validate()) { if($model->validate()) {
...@@ -22,7 +22,7 @@ public function action<?=Inflector::id2camel(trim(basename($generator->viewName) ...@@ -22,7 +22,7 @@ public function action<?=Inflector::id2camel(trim(basename($generator->viewName)
return; return;
} }
} }
return $this->render('<?=$generator->viewName; ?>', [ return $this->render('<?= $generator->viewName ?>', [
'model' => $model, 'model' => $model,
]); ]);
} }
framework/yii/gii/generators/form/templates/form.php
...@@ -14,22 +14,22 @@ use yii\widgets\ActiveForm; ...@@ -14,22 +14,22 @@ use yii\widgets\ActiveForm;
/** /**
* @var yii\base\View $this * @var yii\base\View $this
* @var <?=$generator->modelClass; ?> $model * @var <?= $generator->modelClass ?> $model
* @var ActiveForm $form * @var ActiveForm $form
*/ */
<?="?>"; ?> <?= "?>" ?>
<div class="<?=str_replace('/', '-', trim($generator->viewName, '_')); ?>"> <div class="<?= str_replace('/', '-', trim($generator->viewName, '_')) ?>">
<?='<?php'; ?> $form = ActiveForm::begin(); ?> <?= '<?php' ?> $form = ActiveForm::begin(); ?>
<?php foreach ($generator->getModelAttributes() as $attribute): ?> <?php foreach ($generator->getModelAttributes() as $attribute): ?>
<?='<?php'; ?> echo $form->field($model, '<?=$attribute; ?>'); ?> <?= '<?php' ?> echo $form->field($model, '<?= $attribute ?>'); ?>
<?php endforeach; ?> <?php endforeach; ?>
<div class="form-group"> <div class="form-group">
<?='<?php'; ?> echo Html::submitButton('Submit', ['class' => 'btn btn-primary']); ?> <?= '<?php' ?> echo Html::submitButton('Submit', ['class' => 'btn btn-primary']); ?>
</div> </div>
<?='<?php'; ?> ActiveForm::end(); ?> <?= '<?php' ?> ActiveForm::end(); ?>
</div><!-- <?=str_replace('/', '-', trim($generator->viewName, '-')); ?> --> </div><!-- <?= str_replace('/', '-', trim($generator->viewName, '-')) ?> -->
framework/yii/gii/generators/model/templates/model.php
...@@ -15,29 +15,29 @@ ...@@ -15,29 +15,29 @@
echo "<?php\n"; echo "<?php\n";
?> ?>
namespace <?=$generator->ns; ?>; namespace <?= $generator->ns ?>;
/** /**
* This is the model class for table "<?=$tableName; ?>". * This is the model class for table "<?= $tableName ?>".
* *
<?php foreach ($tableSchema->columns as $column): ?> <?php foreach ($tableSchema->columns as $column): ?>
* @property <?="{$column->phpType} \${$column->name}\n"; ?> * @property <?= "{$column->phpType} \${$column->name}\n" ?>
<?php endforeach; ?> <?php endforeach; ?>
<?php if (!empty($relations)): ?> <?php if (!empty($relations)): ?>
* *
<?php foreach ($relations as $name => $relation): ?> <?php foreach ($relations as $name => $relation): ?>
* @property <?=$relation[1] . ($relation[2] ? '[]' : '') . ' $' . lcfirst($name) . "\n"; ?> * @property <?= $relation[1] . ($relation[2] ? '[]' : '') . ' $' . lcfirst($name) . "\n" ?>
<?php endforeach; ?> <?php endforeach; ?>
<?php endif; ?> <?php endif; ?>
*/ */
class <?=$className; ?> extends <?='\\' . ltrim($generator->baseClass, '\\') . "\n"; ?> class <?= $className ?> extends <?= '\\' . ltrim($generator->baseClass, '\\') . "\n" ?>
{ {
/** /**
* @inheritdoc * @inheritdoc
*/ */
public static function tableName() public static function tableName()
{ {
return '<?=$tableName; ?>'; return '<?= $tableName ?>';
} }
/** /**
...@@ -45,7 +45,7 @@ class <?=$className; ?> extends <?='\\' . ltrim($generator->baseClass, '\\') . " ...@@ -45,7 +45,7 @@ class <?=$className; ?> extends <?='\\' . ltrim($generator->baseClass, '\\') . "
*/ */
public function rules() public function rules()
{ {
return [<?="\n\t\t\t" . implode(",\n\t\t\t", $rules) . "\n\t\t"; ?>]; return [<?= "\n\t\t\t" . implode(",\n\t\t\t", $rules) . "\n\t\t" ?>];
} }
/** /**
...@@ -55,7 +55,7 @@ class <?=$className; ?> extends <?='\\' . ltrim($generator->baseClass, '\\') . " ...@@ -55,7 +55,7 @@ class <?=$className; ?> extends <?='\\' . ltrim($generator->baseClass, '\\') . "
{ {
return [ return [
<?php foreach ($labels as $name => $label): ?> <?php foreach ($labels as $name => $label): ?>
<?="'$name' => '" . addslashes($label) . "',\n"; ?> <?= "'$name' => '" . addslashes($label) . "',\n" ?>
<?php endforeach; ?> <?php endforeach; ?>
]; ];
} }
...@@ -64,9 +64,9 @@ class <?=$className; ?> extends <?='\\' . ltrim($generator->baseClass, '\\') . " ...@@ -64,9 +64,9 @@ class <?=$className; ?> extends <?='\\' . ltrim($generator->baseClass, '\\') . "
/** /**
* @return \yii\db\ActiveRelation * @return \yii\db\ActiveRelation
*/ */
public function get<?=$name; ?>() public function get<?= $name ?>()
{ {
<?=$relation[0] . "\n"; ?> <?= $relation[0] . "\n" ?>
} }
<?php endforeach; ?> <?php endforeach; ?>
} }
framework/yii/gii/generators/module/templates/controller.php
...@@ -8,7 +8,7 @@ ...@@ -8,7 +8,7 @@
echo "<?php\n"; echo "<?php\n";
?> ?>
namespace <?=$generator->getControllerNamespace(); ?>; namespace <?= $generator->getControllerNamespace() ?>;
use yii\web\Controller; use yii\web\Controller;
......
framework/yii/gii/generators/module/templates/module.php
...@@ -13,12 +13,12 @@ $className = substr($className, $pos + 1); ...@@ -13,12 +13,12 @@ $className = substr($className, $pos + 1);
echo "<?php\n"; echo "<?php\n";
?> ?>
namespace <?=$ns; ?>; namespace <?= $ns ?>;
class <?=$className; ?> extends \yii\base\Module class <?= $className ?> extends \yii\base\Module
{ {
public $controllerNamespace = '<?=$generator->getControllerNamespace(); ?>'; public $controllerNamespace = '<?= $generator->getControllerNamespace() ?>';
public function init() public function init()
{ {
......
framework/yii/gii/generators/module/templates/view.php
...@@ -4,15 +4,15 @@ ...@@ -4,15 +4,15 @@
* @var yii\gii\generators\module\Generator $generator * @var yii\gii\generators\module\Generator $generator
*/ */
?> ?>
<div class="<?=$generator->moduleID . '-default-index'; ?>"> <div class="<?= $generator->moduleID . '-default-index' ?>">
<h1><?="<?php"; ?> echo $this->context->action->uniqueId; ?></h1> <h1><?= "<?php" ?> echo $this->context->action->uniqueId; ?></h1>
<p> <p>
This is the view content for action "<?="<?php"; ?> echo $this->context->action->id; ?>". This is the view content for action "<?= "<?php" ?> echo $this->context->action->id; ?>".
The action belongs to the controller "<?="<?php"; ?> echo get_class($this->context); ?>" The action belongs to the controller "<?= "<?php" ?> echo get_class($this->context); ?>"
in the "<?="<?php"; ?> echo $this->context->module->id; ?>" module. in the "<?= "<?php" ?> echo $this->context->module->id; ?>" module.
</p> </p>
<p> <p>
You may customize this page by editing the following file:<br> You may customize this page by editing the following file:<br>
<code><?="<?php"; ?> echo __FILE__; ?></code> <code><?= "<?php" ?> echo __FILE__; ?></code>
</p> </p>
</div> </div>
framework/yii/gii/views/default/diff.php
...@@ -10,6 +10,6 @@ ...@@ -10,6 +10,6 @@
<?php elseif (empty($diff)): ?> <?php elseif (empty($diff)): ?>
<div class="alert alert-success">Identical.</div> <div class="alert alert-success">Identical.</div>
<?php else: ?> <?php else: ?>
<div class="content"><?=$diff; ?></div> <div class="content"><?= $diff ?></div>
<?php endif; ?> <?php endif; ?>
</div> </div>
framework/yii/gii/views/default/index.php
...@@ -21,9 +21,9 @@ $this->title = 'Welcome to Gii'; ...@@ -21,9 +21,9 @@ $this->title = 'Welcome to Gii';
<div class="row"> <div class="row">
<?php foreach ($generators as $id => $generator): ?> <?php foreach ($generators as $id => $generator): ?>
<div class="generator col-lg-4"> <div class="generator col-lg-4">
<h3><?=Html::encode($generator->getName()); ?></h3> <h3><?= Html::encode($generator->getName()) ?></h3>
<p><?=$generator->getDescription(); ?></p> <p><?= $generator->getDescription() ?></p>
<p><?=Html::a('Start »', ['default/view', 'id' => $id], ['class' => 'btn btn-default']); ?></p> <p><?= Html::a('Start »', ['default/view', 'id' => $id], ['class' => 'btn btn-default']) ?></p>
</div> </div>
<?php endforeach; ?> <?php endforeach; ?>
</div> </div>
......
framework/yii/gii/views/default/view.php
...@@ -24,9 +24,9 @@ foreach ($generator->templates as $name => $path) { ...@@ -24,9 +24,9 @@ foreach ($generator->templates as $name => $path) {
} }
?> ?>
<div class="default-view"> <div class="default-view">
<h1><?=Html::encode($this->title); ?></h1> <h1><?= Html::encode($this->title) ?></h1>
<p><?=$generator->getDescription(); ?></p> <p><?= $generator->getDescription() ?></p>
<?php $form = ActiveForm::begin([ <?php $form = ActiveForm::begin([
'id' => "$id-generator", 'id' => "$id-generator",
...@@ -45,10 +45,10 @@ foreach ($generator->templates as $name => $path) { ...@@ -45,10 +45,10 @@ foreach ($generator->templates as $name => $path) {
Please select which set of the templates should be used to generated the code. Please select which set of the templates should be used to generated the code.
'); ?> '); ?>
<div class="form-group"> <div class="form-group">
<?=Html::submitButton('Preview', ['name' => 'preview', 'class' => 'btn btn-primary']); ?> <?= Html::submitButton('Preview', ['name' => 'preview', 'class' => 'btn btn-primary']) ?>
<?php if(isset($files)): ?> <?php if(isset($files)): ?>
<?=Html::submitButton('Generate', ['name' => 'generate', 'class' => 'btn btn-success']); ?> <?= Html::submitButton('Generate', ['name' => 'generate', 'class' => 'btn btn-success']) ?>
<?php endif; ?> <?php endif; ?>
</div> </div>
</div> </div>
......
framework/yii/gii/views/default/view/files.php
...@@ -33,11 +33,11 @@ use yii\gii\CodeFile; ...@@ -33,11 +33,11 @@ use yii\gii\CodeFile;
</thead> </thead>
<tbody> <tbody>
<?php foreach ($files as $file): ?> <?php foreach ($files as $file): ?>
<tr class="<?=$file->operation; ?>"> <tr class="<?= $file->operation ?>">
<td class="file"> <td class="file">
<?=Html::a(Html::encode($file->getRelativePath()), ['preview', 'file' => $file->id], ['class' => 'preview-code', 'data-title' => $file->getRelativePath()]); ?> <?= Html::a(Html::encode($file->getRelativePath()), ['preview', 'file' => $file->id], ['class' => 'preview-code', 'data-title' => $file->getRelativePath()]) ?>
<?php if ($file->operation === CodeFile::OP_OVERWRITE): ?> <?php if ($file->operation === CodeFile::OP_OVERWRITE): ?>
<?=Html::a('diff', ['diff', 'file' => $file->id], ['class' => 'diff-code label label-warning', 'data-title' => $file->getRelativePath()]); ?> <?= Html::a('diff', ['diff', 'file' => $file->id], ['class' => 'diff-code label label-warning', 'data-title' => $file->getRelativePath()]) ?>
<?php endif; ?> <?php endif; ?>
</td> </td>
<td class="action"> <td class="action">
......
framework/yii/gii/views/default/view/results.php
...@@ -18,5 +18,5 @@ use yii\gii\CodeFile; ...@@ -18,5 +18,5 @@ use yii\gii\CodeFile;
echo '<div class="alert alert-success">' . $generator->successMessage() . '</div>'; echo '<div class="alert alert-success">' . $generator->successMessage() . '</div>';
} }
?> ?>
<pre><?=nl2br($results); ?></pre> <pre><?= nl2br($results) ?></pre>
</div> </div>
framework/yii/gii/views/layouts/generator.php
...@@ -25,7 +25,7 @@ $activeGenerator = Yii::$app->controller->generator; ...@@ -25,7 +25,7 @@ $activeGenerator = Yii::$app->controller->generator;
</div> </div>
</div> </div>
<div class="col-lg-9"> <div class="col-lg-9">
<?=$content; ?> <?= $content ?>
</div> </div>
</div> </div>
<?php $this->endContent(); ?> <?php $this->endContent(); ?>
framework/yii/gii/views/layouts/main.php
...@@ -14,7 +14,7 @@ $asset = yii\gii\GiiAsset::register($this); ...@@ -14,7 +14,7 @@ $asset = yii\gii\GiiAsset::register($this);
<html lang="en"> <html lang="en">
<head> <head>
<meta charset="utf-8"/> <meta charset="utf-8"/>
<title><?=Html::encode($this->title); ?></title> <title><?= Html::encode($this->title) ?></title>
<?php $this->head(); ?> <?php $this->head(); ?>
</head> </head>
<body> <body>
...@@ -37,13 +37,13 @@ NavBar::end(); ...@@ -37,13 +37,13 @@ NavBar::end();
?> ?>
<div class="container"> <div class="container">
<?=$content; ?> <?= $content ?>
</div> </div>
<footer class="footer"> <footer class="footer">
<div class="container"> <div class="container">
<p class="pull-left">A Product of <a href="http://www.yiisoft.com/">Yii Software LLC</a></p> <p class="pull-left">A Product of <a href="http://www.yiisoft.com/">Yii Software LLC</a></p>
<p class="pull-right"><?=Yii::powered(); ?></p> <p class="pull-right"><?= Yii::powered() ?></p>
</div> </div>
</footer> </footer>
......
framework/yii/requirements/views/web/index.php
...@@ -52,18 +52,18 @@ ...@@ -52,18 +52,18 @@
<table class="table table-bordered"> <table class="table table-bordered">
<tr><th>Name</th><th>Result</th><th>Required By</th><th>Memo</th></tr> <tr><th>Name</th><th>Result</th><th>Required By</th><th>Memo</th></tr>
<?php foreach($requirements as $requirement): ?> <?php foreach($requirements as $requirement): ?>
<tr class="<?=$requirement['condition'] ? 'success' : ($requirement['mandatory'] ? 'error' : 'warning'); ?>"> <tr class="<?= $requirement['condition'] ? 'success' : ($requirement['mandatory'] ? 'error' : 'warning') ?>">
<td> <td>
<?=$requirement['name']; ?> <?= $requirement['name'] ?>
</td> </td>
<td> <td>
<span class="result"><?=$requirement['condition'] ? 'Passed' : ($requirement['mandatory'] ? 'Failed' : 'Warning'); ?></span> <span class="result"><?= $requirement['condition'] ? 'Passed' : ($requirement['mandatory'] ? 'Failed' : 'Warning') ?></span>
</td> </td>
<td> <td>
<?=$requirement['by']; ?> <?= $requirement['by'] ?>
</td> </td>
<td> <td>
<?=$requirement['memo']; ?> <?= $requirement['memo'] ?>
</td> </td>
</tr> </tr>
<?php endforeach; ?> <?php endforeach; ?>
...@@ -74,7 +74,7 @@ ...@@ -74,7 +74,7 @@
<hr> <hr>
<div class="footer"> <div class="footer">
<p>Server: <?=$this->getServerInfo() . ' ' . $this->getNowDate(); ?></p> <p>Server: <?= $this->getServerInfo() . ' ' . $this->getNowDate() ?></p>
<p>Powered by <a href="http://www.yiiframework.com/" rel="external">Yii Framework</a></p> <p>Powered by <a href="http://www.yiiframework.com/" rel="external">Yii Framework</a></p>
</div> </div>
</div> </div>
......
framework/yii/views/errorHandler/callStackItem.php
...@@ -12,15 +12,15 @@ ...@@ -12,15 +12,15 @@
*/ */
?> ?>
<li class="<?php if (!$handler->isCoreFile($file) || $index === 1) echo 'application'; ?> call-stack-item" <li class="<?php if (!$handler->isCoreFile($file) || $index === 1) echo 'application'; ?> call-stack-item"
data-line="<?=(int)($line - $begin); ?>"> data-line="<?= (int)($line - $begin) ?>">
<div class="element-wrap"> <div class="element-wrap">
<div class="element"> <div class="element">
<span class="item-number"><?=(int)$index; ?>.</span> <span class="item-number"><?= (int)$index ?>.</span>
<span class="text"><?php if ($file !== null) echo 'in ' . $handler->htmlEncode($file); ?></span> <span class="text"><?php if ($file !== null) echo 'in ' . $handler->htmlEncode($file); ?></span>
<?php if ($method !== null): ?> <?php if ($method !== null): ?>
<span class="call"> <span class="call">
<?php if ($file !== null) echo '&ndash;' ?> <?php if ($file !== null) echo '&ndash;' ?>
<?php if ($class !== null) echo $handler->addTypeLinks($class) . '::'; ?><?=$handler->addTypeLinks($method . '()'); ?> <?php if ($class !== null) echo $handler->addTypeLinks($class) . '::'; ?><?= $handler->addTypeLinks($method . '()') ?>
</span> </span>
<?php endif; ?> <?php endif; ?>
<span class="at"><?php if ($line !== null) echo 'at line'; ?></span> <span class="at"><?php if ($line !== null) echo 'at line'; ?></span>
...@@ -32,7 +32,7 @@ ...@@ -32,7 +32,7 @@
<div class="error-line"></div> <div class="error-line"></div>
<?php for ($i = $begin; $i <= $end; ++$i): ?><div class="hover-line"></div><?php endfor; ?> <?php for ($i = $begin; $i <= $end; ++$i): ?><div class="hover-line"></div><?php endfor; ?>
<div class="code"> <div class="code">
<?php for ($i = $begin; $i <= $end; ++$i): ?><span class="lines-item"><?=(int)($i + 1); ?></span><?php endfor; ?> <?php for ($i = $begin; $i <= $end; ++$i): ?><span class="lines-item"><?= (int)($i + 1) ?></span><?php endfor; ?>
<pre><?php <pre><?php
// fill empty lines with a whitespace to avoid rendering problems in opera // fill empty lines with a whitespace to avoid rendering problems in opera
for ($i = $begin; $i <= $end; ++$i) { for ($i = $begin; $i <= $end; ++$i) {
......
framework/yii/views/errorHandler/error.php
...@@ -28,7 +28,7 @@ if ($exception instanceof \yii\base\UserException) { ...@@ -28,7 +28,7 @@ if ($exception instanceof \yii\base\UserException) {
<html> <html>
<head> <head>
<meta charset="utf-8" /> <meta charset="utf-8" />
<title><?=$handler->htmlEncode($name); ?></title> <title><?= $handler->htmlEncode($name) ?></title>
<style> <style>
body { body {
...@@ -69,8 +69,8 @@ if ($exception instanceof \yii\base\UserException) { ...@@ -69,8 +69,8 @@ if ($exception instanceof \yii\base\UserException) {
</head> </head>
<body> <body>
<h1><?=$handler->htmlEncode($name); ?></h1> <h1><?= $handler->htmlEncode($name) ?></h1>
<h2><?=nl2br($handler->htmlEncode($message)); ?></h2> <h2><?= nl2br($handler->htmlEncode($message)) ?></h2>
<p> <p>
The above error occurred while the Web server was processing your request. The above error occurred while the Web server was processing your request.
</p> </p>
...@@ -78,7 +78,7 @@ if ($exception instanceof \yii\base\UserException) { ...@@ -78,7 +78,7 @@ if ($exception instanceof \yii\base\UserException) {
Please contact us if you think this is a server error. Thank you. Please contact us if you think this is a server error. Thank you.
</p> </p>
<div class="version"> <div class="version">
<?=date('Y-m-d H:i:s', time()); ?> <?= date('Y-m-d H:i:s', time()) ?>
</div> </div>
<?php if (method_exists($this, 'endBody')) $this->endBody(); // to allow injecting code into body (mostly by Yii Debug Toolbar) ?> <?php if (method_exists($this, 'endBody')) $this->endBody(); // to allow injecting code into body (mostly by Yii Debug Toolbar) ?>
</body> </body>
......
framework/yii/views/errorHandler/previousException.php
...@@ -9,13 +9,13 @@ ...@@ -9,13 +9,13 @@
<h2> <h2>
<span>Caused by:</span> <span>Caused by:</span>
<?php if ($exception instanceof \yii\base\Exception): ?> <?php if ($exception instanceof \yii\base\Exception): ?>
<span><?=$handler->htmlEncode($exception->getName()); ?></span> &ndash; <span><?= $handler->htmlEncode($exception->getName()) ?></span> &ndash;
<?=$handler->addTypeLinks(get_class($exception)); ?> <?= $handler->addTypeLinks(get_class($exception)) ?>
<?php else: ?> <?php else: ?>
<span><?=$handler->htmlEncode(get_class($exception)); ?></span> <span><?= $handler->htmlEncode(get_class($exception)) ?></span>
<?php endif; ?> <?php endif; ?>
</h2> </h2>
<h3><?=$handler->htmlEncode($exception->getMessage()); ?></h3> <h3><?= $handler->htmlEncode($exception->getMessage()) ?></h3>
<p>in <span class="file"><?=$exception->getFile(); ?></span> at line <span class="line"><?=$exception->getLine(); ?></span></p> <p>in <span class="file"><?= $exception->getFile() ?></span> at line <span class="line"><?= $exception->getLine() ?></span></p>
<?=$handler->renderPreviousExceptions($exception); ?> <?= $handler->renderPreviousExceptions($exception) ?>
</div> </div>
framework/yii/views/migration.php
...@@ -8,7 +8,7 @@ ...@@ -8,7 +8,7 @@
echo "<?php\n"; echo "<?php\n";
?> ?>
class <?=$className; ?> extends \yii\db\Migration class <?= $className ?> extends \yii\db\Migration
{ {
public function up() public function up()
{ {
...@@ -17,7 +17,7 @@ class <?=$className; ?> extends \yii\db\Migration ...@@ -17,7 +17,7 @@ class <?=$className; ?> extends \yii\db\Migration
public function down() public function down()
{ {
echo "<?=$className; ?> cannot be reverted.\n"; echo "<?= $className ?> cannot be reverted.\n";
return false; return false;
} }
} }
tests/unit/data/views/layout.php
...@@ -14,7 +14,7 @@ ...@@ -14,7 +14,7 @@
<body> <body>
<?php $this->beginBody(); ?> <?php $this->beginBody(); ?>
<?=$content; ?> <?= $content ?>
<?php $this->endBody(); ?> <?php $this->endBody(); ?>
</body> </body>
......
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