Commit 0c14f47f by Alexander Makarov

Fixes #3793: Changed inline autocomplete hints style to get more IDEs support

parent 0ab4da03
...@@ -5,10 +5,9 @@ use yii\bootstrap\Nav; ...@@ -5,10 +5,9 @@ use yii\bootstrap\Nav;
use yii\bootstrap\NavBar; use yii\bootstrap\NavBar;
use yii\widgets\Breadcrumbs; use yii\widgets\Breadcrumbs;
/** /* @var $this \yii\web\View */
* @var \yii\web\View $this /* @var $content string */
* @var string $content
*/
AppAsset::register($this); AppAsset::register($this);
?> ?>
<?php $this->beginPage() ?> <?php $this->beginPage() ?>
......
...@@ -2,12 +2,10 @@ ...@@ -2,12 +2,10 @@
use yii\helpers\Html; use yii\helpers\Html;
/** /* @var $this yii\web\View */
* @var yii\web\View $this /* @var $name string */
* @var string $name /* @var $message string */
* @var string $message /* @var $exception Exception */
* @var Exception $exception
*/
$this->title = $name; $this->title = $name;
?> ?>
......
<?php <?php
/** /* @var $this yii\web\View */
* @var yii\web\View $this
*/
$this->title = 'My Yii Application'; $this->title = 'My Yii Application';
?> ?>
<div class="site-index"> <div class="site-index">
......
...@@ -2,11 +2,10 @@ ...@@ -2,11 +2,10 @@
use yii\helpers\Html; use yii\helpers\Html;
use yii\widgets\ActiveForm; use yii\widgets\ActiveForm;
/** /* @var $this yii\web\View */
* @var yii\web\View $this /* @var $form yii\widgets\ActiveForm */
* @var yii\widgets\ActiveForm $form /* @var $model \common\models\LoginForm */
* @var \common\models\LoginForm $model
*/
$this->title = 'Login'; $this->title = 'Login';
$this->params['breadcrumbs'][] = $this->title; $this->params['breadcrumbs'][] = $this->title;
?> ?>
......
<?php <?php
use yii\helpers\Html; use yii\helpers\Html;
/** /* @var $this \yii\web\View */
* @var \yii\web\View $this /* @var $content string */
* @var string $content
*/
?> ?>
<?php $this->beginPage() ?> <?php $this->beginPage() ?>
<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd"> <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
......
<?php <?php
use yii\helpers\Html; use yii\helpers\Html;
/** /* @var $this yii\web\View */
* @var yii\web\View $this /* @var $user common\models\User */
* @var common\models\User $user
*/
$resetLink = Yii::$app->urlManager->createAbsoluteUrl(['site/reset-password', 'token' => $user->password_reset_token]); $resetLink = Yii::$app->urlManager->createAbsoluteUrl(['site/reset-password', 'token' => $user->password_reset_token]);
?> ?>
......
...@@ -35,7 +35,7 @@ class PasswordResetRequestForm extends Model ...@@ -35,7 +35,7 @@ class PasswordResetRequestForm extends Model
*/ */
public function sendEmail() public function sendEmail()
{ {
/** @var User $user */ /* @var $user User */
$user = User::findOne([ $user = User::findOne([
'status' => User::STATUS_ACTIVE, 'status' => User::STATUS_ACTIVE,
'email' => $this->email, 'email' => $this->email,
......
...@@ -6,10 +6,9 @@ use yii\widgets\Breadcrumbs; ...@@ -6,10 +6,9 @@ use yii\widgets\Breadcrumbs;
use frontend\assets\AppAsset; use frontend\assets\AppAsset;
use frontend\widgets\Alert; use frontend\widgets\Alert;
/** /* @var $this \yii\web\View */
* @var \yii\web\View $this /* @var $content string */
* @var string $content
*/
AppAsset::register($this); AppAsset::register($this);
?> ?>
<?php $this->beginPage() ?> <?php $this->beginPage() ?>
......
<?php <?php
use yii\helpers\Html; use yii\helpers\Html;
/** /* @var $this yii\web\View */
* @var yii\web\View $this
*/
$this->title = 'About'; $this->title = 'About';
$this->params['breadcrumbs'][] = $this->title; $this->params['breadcrumbs'][] = $this->title;
?> ?>
......
...@@ -3,11 +3,10 @@ use yii\helpers\Html; ...@@ -3,11 +3,10 @@ use yii\helpers\Html;
use yii\widgets\ActiveForm; use yii\widgets\ActiveForm;
use yii\captcha\Captcha; use yii\captcha\Captcha;
/** /* @var $this yii\web\View */
* @var yii\web\View $this /* @var $form yii\widgets\ActiveForm */
* @var yii\widgets\ActiveForm $form /* @var $model \frontend\models\ContactForm */
* @var \frontend\models\ContactForm $model
*/
$this->title = 'Contact'; $this->title = 'Contact';
$this->params['breadcrumbs'][] = $this->title; $this->params['breadcrumbs'][] = $this->title;
?> ?>
......
...@@ -2,12 +2,10 @@ ...@@ -2,12 +2,10 @@
use yii\helpers\Html; use yii\helpers\Html;
/** /* @var $this yii\web\View */
* @var yii\web\View $this /* @var $name string */
* @var string $name /* @var $message string */
* @var string $message /* @var $exception Exception */
* @var Exception $exception
*/
$this->title = $name; $this->title = $name;
?> ?>
......
<?php <?php
/** /* @var $this yii\web\View */
* @var yii\web\View $this
*/
$this->title = 'My Yii Application'; $this->title = 'My Yii Application';
?> ?>
<div class="site-index"> <div class="site-index">
......
...@@ -2,11 +2,10 @@ ...@@ -2,11 +2,10 @@
use yii\helpers\Html; use yii\helpers\Html;
use yii\widgets\ActiveForm; use yii\widgets\ActiveForm;
/** /* @var $this yii\web\View */
* @var yii\web\View $this /* @var $form yii\widgets\ActiveForm */
* @var yii\widgets\ActiveForm $form /* @var $model \common\models\LoginForm */
* @var \common\models\LoginForm $model
*/
$this->title = 'Login'; $this->title = 'Login';
$this->params['breadcrumbs'][] = $this->title; $this->params['breadcrumbs'][] = $this->title;
?> ?>
......
...@@ -2,11 +2,10 @@ ...@@ -2,11 +2,10 @@
use yii\helpers\Html; use yii\helpers\Html;
use yii\widgets\ActiveForm; use yii\widgets\ActiveForm;
/** /* @var $this yii\web\View */
* @var yii\web\View $this /* @var $form yii\widgets\ActiveForm */
* @var yii\widgets\ActiveForm $form /* @var $model \frontend\models\PasswordResetRequestForm */
* @var \frontend\models\PasswordResetRequestForm $model
*/
$this->title = 'Request password reset'; $this->title = 'Request password reset';
$this->params['breadcrumbs'][] = $this->title; $this->params['breadcrumbs'][] = $this->title;
?> ?>
......
...@@ -2,11 +2,10 @@ ...@@ -2,11 +2,10 @@
use yii\helpers\Html; use yii\helpers\Html;
use yii\widgets\ActiveForm; use yii\widgets\ActiveForm;
/** /* @var $this yii\web\View */
* @var yii\web\View $this /* @var $form yii\widgets\ActiveForm */
* @var yii\widgets\ActiveForm $form /* @var $model \frontend\models\ResetPasswordForm */
* @var \frontend\models\ResetPasswordForm $model
*/
$this->title = 'Reset password'; $this->title = 'Reset password';
$this->params['breadcrumbs'][] = $this->title; $this->params['breadcrumbs'][] = $this->title;
?> ?>
......
...@@ -2,11 +2,10 @@ ...@@ -2,11 +2,10 @@
use yii\helpers\Html; use yii\helpers\Html;
use yii\widgets\ActiveForm; use yii\widgets\ActiveForm;
/** /* @var $this yii\web\View */
* @var yii\web\View $this /* @var $form yii\widgets\ActiveForm */
* @var yii\widgets\ActiveForm $form /* @var $model \frontend\models\SignupForm */
* @var \frontend\models\SignupForm $model
*/
$this->title = 'Signup'; $this->title = 'Signup';
$this->params['breadcrumbs'][] = $this->title; $this->params['breadcrumbs'][] = $this->title;
?> ?>
......
<?php <?php
use yii\helpers\Html; use yii\helpers\Html;
/** /* @var $this \yii\web\View */
* @var \yii\web\View $this /* @var $content string */
* @var string $content
*/
?> ?>
<?php $this->beginPage() ?> <?php $this->beginPage() ?>
<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd"> <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
......
...@@ -5,10 +5,9 @@ use yii\bootstrap\NavBar; ...@@ -5,10 +5,9 @@ use yii\bootstrap\NavBar;
use yii\widgets\Breadcrumbs; use yii\widgets\Breadcrumbs;
use app\assets\AppAsset; use app\assets\AppAsset;
/** /* @var $this \yii\web\View */
* @var \yii\web\View $this /* @var $content string */
* @var string $content
*/
AppAsset::register($this); AppAsset::register($this);
?> ?>
<?php $this->beginPage() ?> <?php $this->beginPage() ?>
......
<?php <?php
use yii\helpers\Html; use yii\helpers\Html;
/** /* @var $this yii\web\View */
* @var yii\web\View $this
*/
$this->title = 'About'; $this->title = 'About';
$this->params['breadcrumbs'][] = $this->title; $this->params['breadcrumbs'][] = $this->title;
?> ?>
......
...@@ -3,11 +3,10 @@ use yii\helpers\Html; ...@@ -3,11 +3,10 @@ use yii\helpers\Html;
use yii\widgets\ActiveForm; use yii\widgets\ActiveForm;
use yii\captcha\Captcha; use yii\captcha\Captcha;
/** /* @var $this yii\web\View */
* @var yii\web\View $this /* @var $form yii\widgets\ActiveForm */
* @var yii\widgets\ActiveForm $form /* @var $model app\models\ContactForm */
* @var app\models\ContactForm $model
*/
$this->title = 'Contact'; $this->title = 'Contact';
$this->params['breadcrumbs'][] = $this->title; $this->params['breadcrumbs'][] = $this->title;
?> ?>
......
...@@ -2,12 +2,10 @@ ...@@ -2,12 +2,10 @@
use yii\helpers\Html; use yii\helpers\Html;
/** /* @var $this yii\web\View */
* @var yii\web\View $this /* @var $name string */
* @var string $name /* @var $message string */
* @var string $message /* @var $exception Exception */
* @var Exception $exception
*/
$this->title = $name; $this->title = $name;
?> ?>
......
<?php <?php
/** /* @var $this yii\web\View */
* @var yii\web\View $this
*/
$this->title = 'My Yii Application'; $this->title = 'My Yii Application';
?> ?>
<div class="site-index"> <div class="site-index">
......
...@@ -2,11 +2,10 @@ ...@@ -2,11 +2,10 @@
use yii\helpers\Html; use yii\helpers\Html;
use yii\widgets\ActiveForm; use yii\widgets\ActiveForm;
/** /* @var $this yii\web\View */
* @var yii\web\View $this /* @var $form yii\widgets\ActiveForm */
* @var yii\widgets\ActiveForm $form /* @var $model app\models\LoginForm */
* @var app\models\LoginForm $model
*/
$this->title = 'Login'; $this->title = 'Login';
$this->params['breadcrumbs'][] = $this->title; $this->params['breadcrumbs'][] = $this->title;
?> ?>
......
...@@ -40,7 +40,7 @@ class TranslationController extends Controller ...@@ -40,7 +40,7 @@ class TranslationController extends Controller
$dir = new DirectoryIterator($sourcePath); $dir = new DirectoryIterator($sourcePath);
foreach ($dir as $fileinfo) { foreach ($dir as $fileinfo) {
/** @var DirectoryIterator $fileinfo */ /* @var $fileinfo DirectoryIterator */
if (!$fileinfo->isDot() && !$fileinfo->isDir()) { if (!$fileinfo->isDot() && !$fileinfo->isDir()) {
$translatedFilePath = $translationPath . '/' . $fileinfo->getFilename(); $translatedFilePath = $translationPath . '/' . $fileinfo->getFilename();
$sourceFilePath = $sourcePath . '/' . $fileinfo->getFilename(); $sourceFilePath = $sourcePath . '/' . $fileinfo->getFilename();
...@@ -63,7 +63,7 @@ class TranslationController extends Controller ...@@ -63,7 +63,7 @@ class TranslationController extends Controller
// checking if there are obsolete translation files // checking if there are obsolete translation files
$dir = new DirectoryIterator($translationPath); $dir = new DirectoryIterator($translationPath);
foreach ($dir as $fileinfo) { foreach ($dir as $fileinfo) {
/** @var \DirectoryIterator $fileinfo */ /* @var $fileinfo \DirectoryIterator */
if (!$fileinfo->isDot() && !$fileinfo->isDir()) { if (!$fileinfo->isDot() && !$fileinfo->isDir()) {
$translatedFilePath = $translationPath . '/' . $fileinfo->getFilename(); $translatedFilePath = $translationPath . '/' . $fileinfo->getFilename();
......
...@@ -20,11 +20,10 @@ page title and the form, while HTML code organizes them into a presentable HTML ...@@ -20,11 +20,10 @@ page title and the form, while HTML code organizes them into a presentable HTML
use yii\helpers\Html; use yii\helpers\Html;
use yii\widgets\ActiveForm; use yii\widgets\ActiveForm;
/** /* @var $this yii\web\View */
* @var yii\web\View $this /* @var $form yii\widgets\ActiveForm */
* @var yii\widgets\ActiveForm $form /* @var $model app\models\LoginForm */
* @var app\models\LoginForm $model
*/
$this->title = 'Login'; $this->title = 'Login';
?> ?>
<h1><?= Html::encode($this->title) ?></h1> <h1><?= Html::encode($this->title) ?></h1>
...@@ -323,10 +322,9 @@ the code in the layout. In practice, you may want to add more content to it, suc ...@@ -323,10 +322,9 @@ the code in the layout. In practice, you may want to add more content to it, suc
```php ```php
<?php <?php
use yii\helpers\Html; use yii\helpers\Html;
/**
* @var yii\web\View $this /* @var $this yii\web\View */
* @var string $content /* @var $content string */
*/
?> ?>
<?php $this->beginPage() ?> <?php $this->beginPage() ?>
<!DOCTYPE html> <!DOCTYPE html>
......
...@@ -92,10 +92,10 @@ Example mail view file content: ...@@ -92,10 +92,10 @@ Example mail view file content:
use yii\helpers\Html; use yii\helpers\Html;
use yii\helpers\Url; use yii\helpers\Url;
/**
* @var \yii\web\View $this view component instance /* @var $this \yii\web\View view component instance */
* @var \yii\mail\BaseMessage $message instance of newly created mail message /* @var $message \yii\mail\BaseMessage instance of newly created mail message */
*/
?> ?>
<h2>This message allows you to visit out site home page by one click</h2> <h2>This message allows you to visit out site home page by one click</h2>
<?= Html::a('Go to home page', Url::home('http')) ?> <?= Html::a('Go to home page', Url::home('http')) ?>
...@@ -140,10 +140,8 @@ Layout can be used to setup mail CSS styles or other shared content: ...@@ -140,10 +140,8 @@ Layout can be used to setup mail CSS styles or other shared content:
<?php <?php
use yii\helpers\Html; use yii\helpers\Html;
/** /* @var $this \yii\web\View view component instance */
* @var \yii\web\View $this view component instance /* @var $content string main view render result */
* @var string $content main view render result
*/
?> ?>
<?php $this->beginPage() ?> <?php $this->beginPage() ?>
<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd"> <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
......
...@@ -8,12 +8,10 @@ The following code style is used for Yii 2.x core and official extensions view f ...@@ -8,12 +8,10 @@ The following code style is used for Yii 2.x core and official extensions view f
// Leading PHP tag is a must in every template file. Empty line after leading PHP tag is also required. // Leading PHP tag is a must in every template file. Empty line after leading PHP tag is also required.
// Describe input variables passed by controller here. // Describe input variables passed by controller here.
/** /* @var $this yii\base\View */
* @var yii\base\View $this /* @var $form yii\widgets\ActiveForm */
* @var yii\widgets\ActiveForm $form /* @var $posts app\models\Post[] */
* @var app\models\Post[] $posts /* @var $contactMessage app\models\ContactMessage */
* @var app\models\ContactMessage $contactMessage
*/
// Empty line below is necessary. // Empty line below is necessary.
// Namespaced classes declaration. // Namespaced classes declaration.
......
...@@ -4,13 +4,11 @@ use yii\apidoc\templates\bootstrap\ApiRenderer; ...@@ -4,13 +4,11 @@ use yii\apidoc\templates\bootstrap\ApiRenderer;
use yii\apidoc\templates\bootstrap\SideNavWidget; use yii\apidoc\templates\bootstrap\SideNavWidget;
use yii\helpers\StringHelper; use yii\helpers\StringHelper;
/** /* @var $this yii\web\View */
* @var yii\web\View $this /* @var $types array */
* @var array $types /* @var $content string */
* @var string $content
*/
/** @var ApiRenderer $renderer */ /** @var $renderer ApiRenderer */
$renderer = $this->context; $renderer = $this->context;
$this->beginContent('@yii/apidoc/templates/bootstrap/layouts/main.php'); ?> $this->beginContent('@yii/apidoc/templates/bootstrap/layouts/main.php'); ?>
......
...@@ -2,11 +2,9 @@ ...@@ -2,11 +2,9 @@
use yii\apidoc\templates\bootstrap\SideNavWidget; use yii\apidoc\templates\bootstrap\SideNavWidget;
/** /* @var $this yii\web\View */
* @var yii\web\View $this /* @var $content string */
* @var string $content /* @var $chapters array */
* @var array $chapters
*/
$this->beginContent('@yii/apidoc/templates/bootstrap/layouts/main.php'); ?> $this->beginContent('@yii/apidoc/templates/bootstrap/layouts/main.php'); ?>
......
...@@ -5,9 +5,7 @@ use yii\bootstrap\Nav; ...@@ -5,9 +5,7 @@ use yii\bootstrap\Nav;
use yii\bootstrap\NavBar; use yii\bootstrap\NavBar;
use yii\helpers\Html; use yii\helpers\Html;
/** /* @var $this yii\web\View */
* @var yii\web\View $this
*/
\yii\apidoc\templates\bootstrap\assets\AssetBundle::register($this); \yii\apidoc\templates\bootstrap\assets\AssetBundle::register($this);
......
...@@ -4,11 +4,9 @@ use yii\apidoc\models\ClassDoc; ...@@ -4,11 +4,9 @@ use yii\apidoc\models\ClassDoc;
use yii\apidoc\models\InterfaceDoc; use yii\apidoc\models\InterfaceDoc;
use yii\apidoc\models\TraitDoc; use yii\apidoc\models\TraitDoc;
/** /* @var $types ClassDoc[]|InterfaceDoc[]|TraitDoc[] */
* @var ClassDoc[]|InterfaceDoc[]|TraitDoc[] $types /* @var $this yii\web\View */
* @var yii\web\View $this /* @var $renderer \yii\apidoc\templates\html\ApiRenderer */
* @var \yii\apidoc\templates\html\ApiRenderer $renderer
*/
$renderer = $this->context; $renderer = $this->context;
......
...@@ -4,11 +4,9 @@ use yii\apidoc\helpers\ApiMarkdown; ...@@ -4,11 +4,9 @@ use yii\apidoc\helpers\ApiMarkdown;
use yii\apidoc\models\ClassDoc; use yii\apidoc\models\ClassDoc;
use yii\helpers\ArrayHelper; use yii\helpers\ArrayHelper;
/** /* @var $type ClassDoc */
* @var ClassDoc $type /* @var $this yii\web\View */
* @var yii\web\View $this /* @var $renderer \yii\apidoc\templates\html\ApiRenderer */
* @var \yii\apidoc\templates\html\ApiRenderer $renderer
*/
$renderer = $this->context; $renderer = $this->context;
......
...@@ -4,11 +4,9 @@ use yii\apidoc\helpers\ApiMarkdown; ...@@ -4,11 +4,9 @@ use yii\apidoc\helpers\ApiMarkdown;
use yii\apidoc\models\ClassDoc; use yii\apidoc\models\ClassDoc;
use yii\helpers\ArrayHelper; use yii\helpers\ArrayHelper;
/** /* @var $type ClassDoc */
* @var ClassDoc $type /* @var $this yii\web\View */
* @var yii\web\View $this /* @var $renderer \yii\apidoc\templates\html\ApiRenderer */
* @var \yii\apidoc\templates\html\ApiRenderer $renderer
*/
$renderer = $this->context; $renderer = $this->context;
......
...@@ -4,11 +4,9 @@ use yii\apidoc\helpers\ApiMarkdown; ...@@ -4,11 +4,9 @@ use yii\apidoc\helpers\ApiMarkdown;
use yii\apidoc\models\ClassDoc; use yii\apidoc\models\ClassDoc;
use yii\helpers\ArrayHelper; use yii\helpers\ArrayHelper;
/** /* @var $type ClassDoc */
* @var ClassDoc $type /* @var $this yii\web\View */
* @var yii\web\View $this /* @var $renderer \yii\apidoc\templates\html\ApiRenderer */
* @var \yii\apidoc\templates\html\ApiRenderer $renderer
*/
$renderer = $this->context; $renderer = $this->context;
......
...@@ -5,11 +5,9 @@ use yii\apidoc\models\ClassDoc; ...@@ -5,11 +5,9 @@ use yii\apidoc\models\ClassDoc;
use yii\apidoc\models\TraitDoc; use yii\apidoc\models\TraitDoc;
use yii\helpers\ArrayHelper; use yii\helpers\ArrayHelper;
/** /* @var $type ClassDoc|TraitDoc */
* @var ClassDoc|TraitDoc $type /* @var $this yii\web\View */
* @var yii\web\View $this /* @var $renderer \yii\apidoc\templates\html\ApiRenderer */
* @var \yii\apidoc\templates\html\ApiRenderer $renderer
*/
$renderer = $this->context; $renderer = $this->context;
......
...@@ -6,12 +6,10 @@ use yii\apidoc\models\InterfaceDoc; ...@@ -6,12 +6,10 @@ use yii\apidoc\models\InterfaceDoc;
use yii\apidoc\models\TraitDoc; use yii\apidoc\models\TraitDoc;
use yii\helpers\ArrayHelper; use yii\helpers\ArrayHelper;
/** /* @var $type ClassDoc|InterfaceDoc|TraitDoc */
* @var ClassDoc|InterfaceDoc|TraitDoc $type /* @var $protected boolean */
* @var boolean $protected /* @var $this yii\web\View */
* @var yii\web\View $this /* @var $renderer \yii\apidoc\templates\html\ApiRenderer */
* @var \yii\apidoc\templates\html\ApiRenderer $renderer
*/
$renderer = $this->context; $renderer = $this->context;
......
...@@ -5,11 +5,9 @@ use yii\apidoc\models\ClassDoc; ...@@ -5,11 +5,9 @@ use yii\apidoc\models\ClassDoc;
use yii\apidoc\models\TraitDoc; use yii\apidoc\models\TraitDoc;
use yii\helpers\ArrayHelper; use yii\helpers\ArrayHelper;
/** /* @var $type ClassDoc|TraitDoc */
* @var ClassDoc|TraitDoc $type /* @var $this yii\web\View */
* @var yii\web\View $this /* @var $renderer \yii\apidoc\templates\html\ApiRenderer */
* @var \yii\apidoc\templates\html\ApiRenderer $renderer
*/
$renderer = $this->context; $renderer = $this->context;
......
...@@ -5,12 +5,10 @@ use yii\apidoc\models\ClassDoc; ...@@ -5,12 +5,10 @@ use yii\apidoc\models\ClassDoc;
use yii\apidoc\models\TraitDoc; use yii\apidoc\models\TraitDoc;
use yii\helpers\ArrayHelper; use yii\helpers\ArrayHelper;
/** /* @var $type ClassDoc|TraitDoc */
* @var ClassDoc|TraitDoc $type /* @var $protected boolean */
* @var boolean $protected /* @var $this yii\web\View */
* @var yii\web\View $this /* @var $renderer \yii\apidoc\templates\html\ApiRenderer */
* @var \yii\apidoc\templates\html\ApiRenderer $renderer
*/
$renderer = $this->context; $renderer = $this->context;
......
<?php <?php
/** /* @var $object yii\apidoc\models\BaseDoc */
* @var yii\apidoc\models\BaseDoc $object /* @var $this yii\web\View */
* @var yii\web\View $this
*/
$type = $object instanceof \yii\apidoc\models\TypeDoc ? $object : $object->definedBy; $type = $object instanceof \yii\apidoc\models\TypeDoc ? $object : $object->definedBy;
......
...@@ -5,11 +5,9 @@ use yii\apidoc\models\ClassDoc; ...@@ -5,11 +5,9 @@ use yii\apidoc\models\ClassDoc;
use yii\apidoc\models\InterfaceDoc; use yii\apidoc\models\InterfaceDoc;
use yii\apidoc\models\TraitDoc; use yii\apidoc\models\TraitDoc;
/** /* @var $type ClassDoc|InterfaceDoc|TraitDoc */
* @var ClassDoc|InterfaceDoc|TraitDoc $type /* @var $this yii\web\View */
* @var yii\web\View $this /* @var $renderer \yii\apidoc\templates\html\ApiRenderer */
* @var \yii\apidoc\templates\html\ApiRenderer $renderer
*/
$renderer = $this->context; $renderer = $this->context;
?> ?>
......
...@@ -36,7 +36,7 @@ class ApiRenderer extends \yii\apidoc\templates\html\ApiRenderer ...@@ -36,7 +36,7 @@ class ApiRenderer extends \yii\apidoc\templates\html\ApiRenderer
$packages = []; $packages = [];
$notNamespaced = []; $notNamespaced = [];
foreach (array_merge($context->classes, $context->interfaces, $context->traits) as $type) { foreach (array_merge($context->classes, $context->interfaces, $context->traits) as $type) {
/** @var TypeDoc $type */ /* @var $type TypeDoc */
if (empty($type->namespace)) { if (empty($type->namespace)) {
$notNamespaced[] = str_replace('\\', '-', $type->name); $notNamespaced[] = str_replace('\\', '-', $type->name);
} else { } else {
......
...@@ -4,10 +4,8 @@ use yii\apidoc\models\ClassDoc; ...@@ -4,10 +4,8 @@ use yii\apidoc\models\ClassDoc;
use yii\apidoc\models\InterfaceDoc; use yii\apidoc\models\InterfaceDoc;
use yii\apidoc\models\TraitDoc; use yii\apidoc\models\TraitDoc;
/** /* @var $types ClassDoc[]|InterfaceDoc[]|TraitDoc[] */
* @var ClassDoc[]|InterfaceDoc[]|TraitDoc[] $types /* @var $this yii\web\View */
* @var yii\web\View $this
*/
?><h1>Class Reference</h1> ?><h1>Class Reference</h1>
......
...@@ -164,7 +164,7 @@ class AuthAction extends Action ...@@ -164,7 +164,7 @@ class AuthAction extends Action
{ {
if (!empty($_GET[$this->clientIdGetParamName])) { if (!empty($_GET[$this->clientIdGetParamName])) {
$clientId = $_GET[$this->clientIdGetParamName]; $clientId = $_GET[$this->clientIdGetParamName];
/** @var \yii\authclient\Collection $collection */ /* @var $collection \yii\authclient\Collection */
$collection = Yii::$app->get($this->clientCollection); $collection = Yii::$app->get($this->clientCollection);
if (!$collection->hasClient($clientId)) { if (!$collection->hasClient($clientId)) {
throw new NotFoundHttpException("Unknown auth client '{$clientId}'"); throw new NotFoundHttpException("Unknown auth client '{$clientId}'");
......
...@@ -142,7 +142,7 @@ class AuthChoice extends Widget ...@@ -142,7 +142,7 @@ class AuthChoice extends Widget
*/ */
protected function defaultClients() protected function defaultClients()
{ {
/** @var $collection \yii\authclient\Collection */ /* @var $collection \yii\authclient\Collection */
$collection = Yii::$app->get($this->clientCollection); $collection = Yii::$app->get($this->clientCollection);
return $collection->getClients(); return $collection->getClients();
......
...@@ -176,7 +176,7 @@ class Module extends \yii\base\Module implements BootstrapInterface ...@@ -176,7 +176,7 @@ class Module extends \yii\base\Module implements BootstrapInterface
'tag' => $this->logTarget->tag, 'tag' => $this->logTarget->tag,
]); ]);
echo '<div id="yii-debug-toolbar" data-url="' . $url . '" style="display:none"></div>'; echo '<div id="yii-debug-toolbar" data-url="' . $url . '" style="display:none"></div>';
/** @var View $view */ /* @var $view View */
$view = $event->sender; $view = $event->sender;
echo '<style>' . $view->renderPhpFile(__DIR__ . '/assets/toolbar.css') . '</style>'; echo '<style>' . $view->renderPhpFile(__DIR__ . '/assets/toolbar.css') . '</style>';
echo '<script>' . $view->renderPhpFile(__DIR__ . '/assets/toolbar.js') . '</script>'; echo '<script>' . $view->renderPhpFile(__DIR__ . '/assets/toolbar.js') . '</script>';
......
...@@ -67,7 +67,7 @@ class Filter extends Component ...@@ -67,7 +67,7 @@ class Filter extends Component
if (isset($this->rules[$name])) { if (isset($this->rules[$name])) {
// check all rules for a given attribute // check all rules for a given attribute
foreach ($this->rules[$name] as $rule) { foreach ($this->rules[$name] as $rule) {
/** @var MatcherInterface $rule */ /* @var $rule MatcherInterface */
if (!$rule->match($value)) { if (!$rule->match($value)) {
return false; return false;
} }
......
...@@ -42,7 +42,7 @@ class MailPanel extends Panel ...@@ -42,7 +42,7 @@ class MailPanel extends Panel
parent::init(); parent::init();
Event::on(BaseMailer::className(), BaseMailer::EVENT_AFTER_SEND, function ($event) { Event::on(BaseMailer::className(), BaseMailer::EVENT_AFTER_SEND, function ($event) {
/** @var MessageInterface $message */ /* @var $message MessageInterface */
$message = $event->message; $message = $event->message;
$messageData = [ $messageData = [
'isSuccessful' => $event->isSuccessful, 'isSuccessful' => $event->isSuccessful,
...@@ -57,7 +57,7 @@ class MailPanel extends Panel ...@@ -57,7 +57,7 @@ class MailPanel extends Panel
// add more information when message is a SwiftMailer message // add more information when message is a SwiftMailer message
if ($message instanceof \yii\swiftmailer\Message) { if ($message instanceof \yii\swiftmailer\Message) {
/** @var \Swift_Message $swiftMessage */ /* @var $swiftMessage \Swift_Message */
$swiftMessage = $message->getSwiftMessage(); $swiftMessage = $message->getSwiftMessage();
$messageData['body'] = $swiftMessage->getBody(); $messageData['body'] = $swiftMessage->getBody();
......
...@@ -115,7 +115,7 @@ class RequestPanel extends Panel ...@@ -115,7 +115,7 @@ class RequestPanel extends Panel
*/ */
protected function getFlashes() protected function getFlashes()
{ {
/** @var \yii\web\Session $session */ /* @var $session \yii\web\Session */
$session = Yii::$app->has('session', true) ? Yii::$app->get('session') : null; $session = Yii::$app->has('session', true) ? Yii::$app->get('session') : null;
if ($session === null) { if ($session === null) {
return []; return [];
......
<?php <?php
/** /* @var $this \yii\web\View */
* @var \yii\web\View $this /* @var $manifest array */
* @var array $manifest /* @var $searchModel \yii\debug\models\search\Debug */
* @var \yii\debug\models\search\Debug $searchModel /* @var $dataProvider ArrayDataProvider */
* @var ArrayDataProvider $dataProvider /* @var $panels \yii\debug\Panel[] */
* @var \yii\debug\Panel[] $panels
*/
use yii\helpers\Html; use yii\helpers\Html;
use yii\grid\GridView; use yii\grid\GridView;
......
<?php <?php
/** /* @var $panel yii\debug\panels\ConfigPanel */
* @var yii\debug\panels\ConfigPanel $panel
*/
$extensions = $panel->getExtensions(); $extensions = $panel->getExtensions();
?> ?>
<h1>Configuration</h1> <h1>Configuration</h1>
......
<?php <?php
/** /* @var $panel yii\debug\panels\ConfigPanel */
* @var yii\debug\panels\ConfigPanel $panel
*/
?> ?>
<div class="yii-debug-toolbar-block"> <div class="yii-debug-toolbar-block">
<a href="<?= $panel->getUrl() ?>"> <a href="<?= $panel->getUrl() ?>">
......
<?php <?php
use yii\helpers\Html; use yii\helpers\Html;
/** /* @var $caption string */
* @var string $caption /* @var $values array */
* @var array $values
*/
?> ?>
<h3><?= $caption ?></h3> <h3><?= $caption ?></h3>
......
<?php <?php
/** /* @var $panel yii\debug\panels\DbPanel */
* @var yii\debug\panels\DbPanel $panel /* @var $searchModel yii\debug\models\search\Db */
* @var yii\debug\models\search\Db $searchModel /* @var $dataProvider yii\data\ArrayDataProvider */
* @var yii\data\ArrayDataProvider $dataProvider
*/
use yii\helpers\Html; use yii\helpers\Html;
use yii\grid\GridView; use yii\grid\GridView;
......
<?php <?php
/** /* @var $panel yii\debug\panels\DbPanel */
* @var yii\debug\panels\DbPanel $panel /* @var $queryCount integer */
* @var integer $queryCount /* @var $queryTime integer */
* @var integer $queryTime
*/
?> ?>
<?php if ($queryCount): ?> <?php if ($queryCount): ?>
<div class="yii-debug-toolbar-block"> <div class="yii-debug-toolbar-block">
......
<?php <?php
/** /* @var $panel yii\debug\panels\LogPanel */
* @var yii\debug\panels\LogPanel $panel /* @var $searchModel yii\debug\models\search\Log */
* @var yii\debug\models\search\Log $searchModel /* @var $dataProvider yii\data\ArrayDataProvider */
* @var yii\data\ArrayDataProvider $dataProvider
*/
use yii\helpers\Html; use yii\helpers\Html;
use yii\grid\GridView; use yii\grid\GridView;
......
<?php <?php
/** /* @var $panel yii\debug\panels\LogPanel */
* @var yii\debug\panels\LogPanel $panel /* @var $data array */
* @var array $data
*/
use yii\log\Target; use yii\log\Target;
use yii\log\Logger; use yii\log\Logger;
......
<?php <?php
/** /* @var $model array */
* @var array $model
*/
use yii\helpers\Html; use yii\helpers\Html;
use yii\widgets\DetailView; use yii\widgets\DetailView;
......
<?php <?php
/** /* @var $panel yii\debug\panels\MailPanel */
* @var yii\debug\panels\MailPanel $panel /* @var $searchModel yii\debug\models\search\Mail */
* @var yii\debug\models\search\Mail $searchModel /* @var $dataProvider yii\data\ArrayDataProvider */
* @var yii\data\ArrayDataProvider $dataProvider
*/
use \yii\widgets\ListView; use \yii\widgets\ListView;
use yii\widgets\ActiveForm; use yii\widgets\ActiveForm;
......
<?php <?php
/** /* @var $panel yii\debug\panels\MailPanel */
* @var yii\debug\panels\MailPanel $panel /* @var $mailCount integer */
* @var integer $mailCount
*/
if ($mailCount): ?> if ($mailCount): ?>
<div class="yii-debug-toolbar-block"> <div class="yii-debug-toolbar-block">
<a href="<?= $panel->getUrl() ?>">Mail <span class="label"><?= $mailCount ?></span></a> <a href="<?= $panel->getUrl() ?>">Mail <span class="label"><?= $mailCount ?></span></a>
......
<?php <?php
/** /* @var $panel yii\debug\panels\ProfilingPanel */
* @var yii\debug\panels\ProfilingPanel $panel /* @var $searchModel yii\debug\models\search\Profile */
* @var yii\debug\models\search\Profile $searchModel /* @var $dataProvider yii\data\ArrayDataProvider */
* @var yii\data\ArrayDataProvider $dataProvider /* @var $time integer */
* @var integer $time /* @var $memory integer */
* @var integer $memory
*/
use yii\grid\GridView; use yii\grid\GridView;
use yii\helpers\Html; use yii\helpers\Html;
......
<?php <?php
/** /* @var $panel yii\debug\panels\ProfilingPanel */
* @var yii\debug\panels\ProfilingPanel $panel /* @var $time integer */
* @var integer $time /* @var $memory integer */
* @var integer $memory
*/
?> ?>
<div class="yii-debug-toolbar-block"> <div class="yii-debug-toolbar-block">
<a href="<?= $panel->getUrl() ?>" title="Total request processing time was <?= $time ?>">Time <span class="label label-info"><?= $time ?></span></a> <a href="<?= $panel->getUrl() ?>" title="Total request processing time was <?= $time ?>">Time <span class="label label-info"><?= $time ?></span></a>
......
<?php <?php
/** /* @var $panel yii\debug\panels\RequestPanel */
* @var yii\debug\panels\RequestPanel $panel
*/
use yii\bootstrap\Tabs; use yii\bootstrap\Tabs;
......
<?php <?php
/** /* @var $panel yii\debug\panels\RequestPanel */
* @var yii\debug\panels\RequestPanel $panel
*/
use yii\helpers\Html; use yii\helpers\Html;
use yii\web\Response; use yii\web\Response;
......
<?php <?php
/** /* @var $caption string */
* @var string $caption /* @var $values array */
* @var array $values
*/
use yii\helpers\Html; use yii\helpers\Html;
use yii\helpers\VarDumper; use yii\helpers\VarDumper;
......
<?php <?php
/** /* @var $this \yii\web\View */
* @var \yii\web\View $this /* @var $panels \yii\debug\Panel[] */
* @var \yii\debug\Panel[] $panels /* @var $tag string */
* @var string $tag /* @var $position string */
* @var string $position
*/
use yii\helpers\Url; use yii\helpers\Url;
......
<?php <?php
/** /* @var $this \yii\web\View */
* @var \yii\web\View $this /* @var $summary array */
* @var array $summary /* @var $tag string */
* @var string $tag /* @var $manifest array */
* @var array $manifest /* @var $panels \yii\debug\Panel[] */
* @var \yii\debug\Panel[] $panels /* @var $activePanel \yii\debug\Panel */
* @var \yii\debug\Panel $activePanel
*/
use yii\bootstrap\ButtonDropdown; use yii\bootstrap\ButtonDropdown;
use yii\bootstrap\ButtonGroup; use yii\bootstrap\ButtonGroup;
......
<?php <?php
/** /* @var $this \yii\web\View */
* @var \yii\web\View $this /* @var $content string */
* @var string $content
*/
use yii\helpers\Html; use yii\helpers\Html;
yii\debug\DebugAsset::register($this); yii\debug\DebugAsset::register($this);
......
...@@ -101,7 +101,7 @@ class ActiveQuery extends Query implements ActiveQueryInterface ...@@ -101,7 +101,7 @@ class ActiveQuery extends Query implements ActiveQueryInterface
// lazy loading // lazy loading
if (is_array($this->via)) { if (is_array($this->via)) {
// via relation // via relation
/** @var ActiveQuery $viaQuery */ /* @var $viaQuery ActiveQuery */
list($viaName, $viaQuery) = $this->via; list($viaName, $viaQuery) = $this->via;
if ($viaQuery->multiple) { if ($viaQuery->multiple) {
$viaModels = $viaQuery->all(); $viaModels = $viaQuery->all();
...@@ -117,7 +117,7 @@ class ActiveQuery extends Query implements ActiveQueryInterface ...@@ -117,7 +117,7 @@ class ActiveQuery extends Query implements ActiveQueryInterface
} }
} }
/** @var ActiveRecord $modelClass */ /* @var $modelClass ActiveRecord */
$modelClass = $this->modelClass; $modelClass = $this->modelClass;
if ($db === null) { if ($db === null) {
$db = $modelClass::getDb(); $db = $modelClass::getDb();
...@@ -178,7 +178,7 @@ class ActiveQuery extends Query implements ActiveQueryInterface ...@@ -178,7 +178,7 @@ class ActiveQuery extends Query implements ActiveQueryInterface
} }
if ($this->asArray) { if ($this->asArray) {
// TODO implement with // TODO implement with
// /** @var ActiveRecord $modelClass */ // /* @var $modelClass ActiveRecord */
// $modelClass = $this->modelClass; // $modelClass = $this->modelClass;
// $model = $result['_source']; // $model = $result['_source'];
// $pk = $modelClass::primaryKey()[0]; // $pk = $modelClass::primaryKey()[0];
...@@ -193,7 +193,7 @@ class ActiveQuery extends Query implements ActiveQueryInterface ...@@ -193,7 +193,7 @@ class ActiveQuery extends Query implements ActiveQueryInterface
// } // }
return $result; return $result;
} else { } else {
/** @var ActiveRecord $class */ /* @var $class ActiveRecord */
$class = $this->modelClass; $class = $this->modelClass;
$model = $class::instantiate($result); $model = $class::instantiate($result);
$class::populateRecord($model, $result); $class::populateRecord($model, $result);
......
...@@ -58,7 +58,7 @@ class DebugAction extends Action ...@@ -58,7 +58,7 @@ class DebugAction extends Action
$options = ['pretty' => true]; $options = ['pretty' => true];
/** @var Connection $db */ /* @var $db Connection */
$db = \Yii::$app->get($this->db); $db = \Yii::$app->get($this->db);
$time = microtime(true); $time = microtime(true);
switch ($method) { switch ($method) {
......
<?php <?php
use yii\helpers\Inflector;
/** /**
* This is the template for generating a controller class file. * This is the template for generating a controller class file.
*
* @var yii\web\View $this
* @var yii\gii\generators\controller\Generator $generator
*/ */
use yii\helpers\Inflector;
/* @var $this yii\web\View */
/* @var $generator yii\gii\generators\controller\Generator */
echo "<?php\n"; echo "<?php\n";
?> ?>
......
<?php <?php
/** /**
* This is the template for generating an action view file. * This is the template for generating an action view file.
*
* @var yii\web\View $this
* @var yii\gii\generators\controller\Generator $generator
* @var string $action the action ID
*/ */
/* @var $this yii\web\View */
/* @var $generator yii\gii\generators\controller\Generator */
/* @var $action string the action ID */
echo "<?php\n"; echo "<?php\n";
?> ?>
/** /* @var $this yii\web\View */
* @var yii\web\View $this
*/
<?= "?>" ?> <?= "?>" ?>
<h1><?= $generator->getControllerID() . '/' . $action ?></h1> <h1><?= $generator->getControllerID() . '/' . $action ?></h1>
......
<?php <?php
/** /* @var $this yii\web\View */
* @var yii\web\View $this /* @var $form yii\widgets\ActiveForm */
* @var yii\widgets\ActiveForm $form /* @var $generator yii\gii\generators\controller\Generator */
* @var yii\gii\generators\controller\Generator $generator
*/
echo $form->field($generator, 'controller'); echo $form->field($generator, 'controller');
echo $form->field($generator, 'actions'); echo $form->field($generator, 'actions');
echo $form->field($generator, 'ns'); echo $form->field($generator, 'ns');
......
...@@ -136,7 +136,7 @@ class Generator extends \yii\gii\Generator ...@@ -136,7 +136,7 @@ class Generator extends \yii\gii\Generator
*/ */
public function validateModelClass() public function validateModelClass()
{ {
/** @var ActiveRecord $class */ /* @var $class ActiveRecord */
$class = $this->modelClass; $class = $this->modelClass;
$pk = $class::primaryKey(); $pk = $class::primaryKey();
if (empty($pk)) { if (empty($pk)) {
...@@ -215,7 +215,7 @@ class Generator extends \yii\gii\Generator ...@@ -215,7 +215,7 @@ class Generator extends \yii\gii\Generator
return $name; return $name;
} }
} }
/** @var \yii\db\ActiveRecord $class */ /* @var $class \yii\db\ActiveRecord */
$class = $this->modelClass; $class = $this->modelClass;
$pk = $class::primaryKey(); $pk = $class::primaryKey();
...@@ -361,7 +361,7 @@ class Generator extends \yii\gii\Generator ...@@ -361,7 +361,7 @@ class Generator extends \yii\gii\Generator
*/ */
public function generateSearchLabels() public function generateSearchLabels()
{ {
/** @var \yii\base\Model $model */ /* @var $model \yii\base\Model */
$model = new $this->modelClass(); $model = new $this->modelClass();
$attributeLabels = $model->attributeLabels(); $attributeLabels = $model->attributeLabels();
$labels = []; $labels = [];
...@@ -393,7 +393,7 @@ class Generator extends \yii\gii\Generator ...@@ -393,7 +393,7 @@ class Generator extends \yii\gii\Generator
$columns = []; $columns = [];
if (($table = $this->getTableSchema()) === false) { if (($table = $this->getTableSchema()) === false) {
$class = $this->modelClass; $class = $this->modelClass;
/** @var \yii\base\Model $model */ /* @var $model \yii\base\Model */
$model = new $class(); $model = new $class();
foreach ($model->attributes() as $attribute) { foreach ($model->attributes() as $attribute) {
$columns[$attribute] = 'unknown'; $columns[$attribute] = 'unknown';
...@@ -446,7 +446,7 @@ class Generator extends \yii\gii\Generator ...@@ -446,7 +446,7 @@ class Generator extends \yii\gii\Generator
*/ */
public function generateUrlParams() public function generateUrlParams()
{ {
/** @var ActiveRecord $class */ /* @var $class ActiveRecord */
$class = $this->modelClass; $class = $this->modelClass;
$pks = $class::primaryKey(); $pks = $class::primaryKey();
if (count($pks) === 1) { if (count($pks) === 1) {
...@@ -475,7 +475,7 @@ class Generator extends \yii\gii\Generator ...@@ -475,7 +475,7 @@ class Generator extends \yii\gii\Generator
*/ */
public function generateActionParams() public function generateActionParams()
{ {
/** @var ActiveRecord $class */ /* @var $class ActiveRecord */
$class = $this->modelClass; $class = $this->modelClass;
$pks = $class::primaryKey(); $pks = $class::primaryKey();
if (count($pks) === 1) { if (count($pks) === 1) {
...@@ -491,7 +491,7 @@ class Generator extends \yii\gii\Generator ...@@ -491,7 +491,7 @@ class Generator extends \yii\gii\Generator
*/ */
public function generateActionParamComments() public function generateActionParamComments()
{ {
/** @var ActiveRecord $class */ /* @var $class ActiveRecord */
$class = $this->modelClass; $class = $this->modelClass;
$pks = $class::primaryKey(); $pks = $class::primaryKey();
if (($table = $this->getTableSchema()) === false) { if (($table = $this->getTableSchema()) === false) {
...@@ -520,7 +520,7 @@ class Generator extends \yii\gii\Generator ...@@ -520,7 +520,7 @@ class Generator extends \yii\gii\Generator
*/ */
public function getTableSchema() public function getTableSchema()
{ {
/** @var ActiveRecord $class */ /* @var $class ActiveRecord */
$class = $this->modelClass; $class = $this->modelClass;
if (is_subclass_of($class, 'yii\db\ActiveRecord')) { if (is_subclass_of($class, 'yii\db\ActiveRecord')) {
return $class::getTableSchema(); return $class::getTableSchema();
...@@ -534,12 +534,12 @@ class Generator extends \yii\gii\Generator ...@@ -534,12 +534,12 @@ class Generator extends \yii\gii\Generator
*/ */
public function getColumnNames() public function getColumnNames()
{ {
/** @var ActiveRecord $class */ /* @var $class ActiveRecord */
$class = $this->modelClass; $class = $this->modelClass;
if (is_subclass_of($class, 'yii\db\ActiveRecord')) { if (is_subclass_of($class, 'yii\db\ActiveRecord')) {
return $class::getTableSchema()->getColumnNames(); return $class::getTableSchema()->getColumnNames();
} else { } else {
/** @var \yii\base\Model $model */ /* @var $model \yii\base\Model */
$model = new $class(); $model = new $class();
return $model->attributes(); return $model->attributes();
......
<?php <?php
/**
* This is the template for generating a CRUD controller class file.
*/
use yii\db\ActiveRecordInterface; use yii\db\ActiveRecordInterface;
use yii\helpers\StringHelper; use yii\helpers\StringHelper;
/**
* This is the template for generating a CRUD controller class file. /* @var $this yii\web\View */
* /* @var $generator yii\gii\generators\crud\Generator */
* @var yii\web\View $this
* @var yii\gii\generators\crud\Generator $generator
*/
$controllerClass = StringHelper::basename($generator->controllerClass); $controllerClass = StringHelper::basename($generator->controllerClass);
$modelClass = StringHelper::basename($generator->modelClass); $modelClass = StringHelper::basename($generator->modelClass);
...@@ -17,7 +17,7 @@ if ($modelClass === $searchModelClass) { ...@@ -17,7 +17,7 @@ if ($modelClass === $searchModelClass) {
$searchModelAlias = $searchModelClass . 'Search'; $searchModelAlias = $searchModelClass . 'Search';
} }
/** @var ActiveRecordInterface $class */ /* @var $class ActiveRecordInterface */
$class = $generator->modelClass; $class = $generator->modelClass;
$pks = $class::primaryKey(); $pks = $class::primaryKey();
$urlParams = $generator->generateUrlParams(); $urlParams = $generator->generateUrlParams();
......
<?php <?php
use yii\helpers\StringHelper;
/** /**
* This is the template for generating CRUD search class of the specified model. * This is the template for generating CRUD search class of the specified model.
*
* @var yii\web\View $this
* @var yii\gii\generators\crud\Generator $generator
*/ */
use yii\helpers\StringHelper;
/* @var $this yii\web\View */
/* @var $generator yii\gii\generators\crud\Generator */
$modelClass = StringHelper::basename($generator->modelClass); $modelClass = StringHelper::basename($generator->modelClass);
$searchModelClass = StringHelper::basename($generator->searchModelClass); $searchModelClass = StringHelper::basename($generator->searchModelClass);
if ($modelClass === $searchModelClass) { if ($modelClass === $searchModelClass) {
......
...@@ -3,12 +3,10 @@ ...@@ -3,12 +3,10 @@
use yii\helpers\Inflector; use yii\helpers\Inflector;
use yii\helpers\StringHelper; use yii\helpers\StringHelper;
/** /* @var $this yii\web\View */
* @var yii\web\View $this /* @var $generator yii\gii\generators\crud\Generator */
* @var yii\gii\generators\crud\Generator $generator
*/
/** @var \yii\db\ActiveRecord $model */ /* @var $model \yii\db\ActiveRecord */
$model = new $generator->modelClass(); $model = new $generator->modelClass();
$safeAttributes = $model->safeAttributes(); $safeAttributes = $model->safeAttributes();
if (empty($safeAttributes)) { if (empty($safeAttributes)) {
...@@ -21,11 +19,9 @@ echo "<?php\n"; ...@@ -21,11 +19,9 @@ echo "<?php\n";
use yii\helpers\Html; use yii\helpers\Html;
use yii\widgets\ActiveForm; use yii\widgets\ActiveForm;
/** /* @var $this yii\web\View */
* @var yii\web\View $this /* @var $model <?= ltrim($generator->modelClass, '\\') ?> */
* @var <?= ltrim($generator->modelClass, '\\') ?> $model /* @var $form yii\widgets\ActiveForm */
* @var yii\widgets\ActiveForm $form
*/
?> ?>
<div class="<?= Inflector::camel2id(StringHelper::basename($generator->modelClass)) ?>-form"> <div class="<?= Inflector::camel2id(StringHelper::basename($generator->modelClass)) ?>-form">
......
...@@ -3,10 +3,8 @@ ...@@ -3,10 +3,8 @@
use yii\helpers\Inflector; use yii\helpers\Inflector;
use yii\helpers\StringHelper; use yii\helpers\StringHelper;
/** /* @var $this yii\web\View */
* @var yii\web\View $this /* @var $generator yii\gii\generators\crud\Generator */
* @var yii\gii\generators\crud\Generator $generator
*/
echo "<?php\n"; echo "<?php\n";
?> ?>
...@@ -14,11 +12,9 @@ echo "<?php\n"; ...@@ -14,11 +12,9 @@ echo "<?php\n";
use yii\helpers\Html; use yii\helpers\Html;
use yii\widgets\ActiveForm; use yii\widgets\ActiveForm;
/** /* @var $this yii\web\View */
* @var yii\web\View $this /* @var $model <?= ltrim($generator->searchModelClass, '\\') ?> */
* @var <?= ltrim($generator->searchModelClass, '\\') ?> $model /* @var $form yii\widgets\ActiveForm */
* @var yii\widgets\ActiveForm $form
*/
?> ?>
<div class="<?= Inflector::camel2id(StringHelper::basename($generator->modelClass)) ?>-search"> <div class="<?= Inflector::camel2id(StringHelper::basename($generator->modelClass)) ?>-search">
......
...@@ -3,20 +3,17 @@ ...@@ -3,20 +3,17 @@
use yii\helpers\Inflector; use yii\helpers\Inflector;
use yii\helpers\StringHelper; use yii\helpers\StringHelper;
/** /* @var $this yii\web\View */
* @var yii\web\View $this /* @var $generator yii\gii\generators\crud\Generator */
* @var yii\gii\generators\crud\Generator $generator
*/
echo "<?php\n"; echo "<?php\n";
?> ?>
use yii\helpers\Html; use yii\helpers\Html;
/**
* @var yii\web\View $this /* @var $this yii\web\View */
* @var <?= ltrim($generator->modelClass, '\\') ?> $model /* @var $model <?= ltrim($generator->modelClass, '\\') ?> */
*/
$this->title = <?= $generator->generateString('Create {modelClass}', ['modelClass' => Inflector::camel2words(StringHelper::basename($generator->modelClass))]) ?>; $this->title = <?= $generator->generateString('Create {modelClass}', ['modelClass' => Inflector::camel2words(StringHelper::basename($generator->modelClass))]) ?>;
$this->params['breadcrumbs'][] = ['label' => <?= $generator->generateString(Inflector::pluralize(Inflector::camel2words(StringHelper::basename($generator->modelClass)))) ?>, 'url' => ['index']]; $this->params['breadcrumbs'][] = ['label' => <?= $generator->generateString(Inflector::pluralize(Inflector::camel2words(StringHelper::basename($generator->modelClass)))) ?>, 'url' => ['index']];
......
...@@ -3,10 +3,8 @@ ...@@ -3,10 +3,8 @@
use yii\helpers\Inflector; use yii\helpers\Inflector;
use yii\helpers\StringHelper; use yii\helpers\StringHelper;
/** /* @var $this yii\web\View */
* @var yii\web\View $this /* @var $generator yii\gii\generators\crud\Generator */
* @var yii\gii\generators\crud\Generator $generator
*/
$urlParams = $generator->generateUrlParams(); $urlParams = $generator->generateUrlParams();
$nameAttribute = $generator->getNameAttribute(); $nameAttribute = $generator->getNameAttribute();
...@@ -17,11 +15,9 @@ echo "<?php\n"; ...@@ -17,11 +15,9 @@ 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 $this yii\web\View */
* @var yii\web\View $this <?= !empty($generator->searchModelClass) ? "/* @var \$searchModel " . ltrim($generator->searchModelClass, '\\') . " */\n" : '' ?>
<?= !empty($generator->searchModelClass) ? " * @var " . ltrim($generator->searchModelClass, '\\') . " \$searchModel\n" : '' ?> /* @var $dataProvider yii\data\ActiveDataProvider */
* @var yii\data\ActiveDataProvider $dataProvider
*/
$this->title = <?= $generator->generateString(Inflector::pluralize(Inflector::camel2words(StringHelper::basename($generator->modelClass)))) ?>; $this->title = <?= $generator->generateString(Inflector::pluralize(Inflector::camel2words(StringHelper::basename($generator->modelClass)))) ?>;
$this->params['breadcrumbs'][] = $this->title; $this->params['breadcrumbs'][] = $this->title;
......
...@@ -3,10 +3,8 @@ ...@@ -3,10 +3,8 @@
use yii\helpers\Inflector; use yii\helpers\Inflector;
use yii\helpers\StringHelper; use yii\helpers\StringHelper;
/** /* @var $this yii\web\View */
* @var yii\web\View $this /* @var $generator yii\gii\generators\crud\Generator */
* @var yii\gii\generators\crud\Generator $generator
*/
$urlParams = $generator->generateUrlParams(); $urlParams = $generator->generateUrlParams();
...@@ -15,10 +13,8 @@ echo "<?php\n"; ...@@ -15,10 +13,8 @@ echo "<?php\n";
use yii\helpers\Html; use yii\helpers\Html;
/** /* @var $this yii\web\View */
* @var yii\web\View $this /* @var $model <?= ltrim($generator->modelClass, '\\') ?> */
* @var <?= ltrim($generator->modelClass, '\\') ?> $model
*/
$this->title = <?= $generator->generateString('Update {modelClass}: ', ['modelClass' => Inflector::camel2words(StringHelper::basename($generator->modelClass))]) ?> . ' ' . $model-><?= $generator->getNameAttribute() ?>; $this->title = <?= $generator->generateString('Update {modelClass}: ', ['modelClass' => Inflector::camel2words(StringHelper::basename($generator->modelClass))]) ?> . ' ' . $model-><?= $generator->getNameAttribute() ?>;
$this->params['breadcrumbs'][] = ['label' => <?= $generator->generateString(Inflector::pluralize(Inflector::camel2words(StringHelper::basename($generator->modelClass)))) ?>, 'url' => ['index']]; $this->params['breadcrumbs'][] = ['label' => <?= $generator->generateString(Inflector::pluralize(Inflector::camel2words(StringHelper::basename($generator->modelClass)))) ?>, 'url' => ['index']];
......
...@@ -3,10 +3,8 @@ ...@@ -3,10 +3,8 @@
use yii\helpers\Inflector; use yii\helpers\Inflector;
use yii\helpers\StringHelper; use yii\helpers\StringHelper;
/** /* @var $this yii\web\View */
* @var yii\web\View $this /* @var $generator yii\gii\generators\crud\Generator */
* @var yii\gii\generators\crud\Generator $generator
*/
$urlParams = $generator->generateUrlParams(); $urlParams = $generator->generateUrlParams();
...@@ -16,10 +14,8 @@ echo "<?php\n"; ...@@ -16,10 +14,8 @@ echo "<?php\n";
use yii\helpers\Html; use yii\helpers\Html;
use yii\widgets\DetailView; use yii\widgets\DetailView;
/** /* @var $this yii\web\View */
* @var yii\web\View $this /* @var $model <?= ltrim($generator->modelClass, '\\') ?> */
* @var <?= ltrim($generator->modelClass, '\\') ?> $model
*/
$this->title = $model-><?= $generator->getNameAttribute() ?>; $this->title = $model-><?= $generator->getNameAttribute() ?>;
$this->params['breadcrumbs'][] = ['label' => <?= $generator->generateString(Inflector::pluralize(Inflector::camel2words(StringHelper::basename($generator->modelClass)))) ?>, 'url' => ['index']]; $this->params['breadcrumbs'][] = ['label' => <?= $generator->generateString(Inflector::pluralize(Inflector::camel2words(StringHelper::basename($generator->modelClass)))) ?>, 'url' => ['index']];
......
<?php <?php
/** /* @var $this yii\web\View */
* @var yii\web\View $this /* @var $form yii\widgets\ActiveForm */
* @var yii\widgets\ActiveForm $form /* @var $generator yii\gii\generators\crud\Generator */
* @var yii\gii\generators\crud\Generator $generator
*/
echo $form->field($generator, 'modelClass'); echo $form->field($generator, 'modelClass');
echo $form->field($generator, 'searchModelClass'); echo $form->field($generator, 'searchModelClass');
......
<?php <?php
/** /* @var $this yii\web\View */
* @var yii\web\View $this /* @var $form yii\widgets\ActiveForm */
* @var yii\widgets\ActiveForm $form /* @var $generator yii\gii\generators\module\Generator */
* @var yii\gii\generators\module\Generator $generator
*/
?> ?>
<div class="alert alert-info"> <div class="alert alert-info">
Please read the Please read the
......
...@@ -147,7 +147,7 @@ EOD; ...@@ -147,7 +147,7 @@ EOD;
*/ */
public function getModelAttributes() public function getModelAttributes()
{ {
/** @var Model $model */ /* @var $model Model */
$model = new $this->modelClass(); $model = new $this->modelClass();
if (!empty($this->scenarioName)) { if (!empty($this->scenarioName)) {
$model->setScenario($this->scenarioName); $model->setScenario($this->scenarioName);
......
<?php <?php
use yii\helpers\Inflector;
/** /**
* This is the template for generating an action view file. * This is the template for generating an action view file.
*
* @var yii\web\View $this
* @var yii\gii\generators\form\Generator $generator
*/ */
use yii\helpers\Inflector;
/* @var $this yii\web\View */
/* @var $generator yii\gii\generators\form\Generator */
echo "<?php\n"; echo "<?php\n";
?> ?>
......
<?php <?php
/** /**
* This is the template for generating an action view file. * This is the template for generating an action view file.
*
* @var yii\web\View $this
* @var yii\gii\generators\form\Generator $generator
*/ */
/* @var $this yii\web\View */
/* @var $generator yii\gii\generators\form\Generator */
echo "<?php\n"; echo "<?php\n";
?> ?>
use yii\helpers\Html; use yii\helpers\Html;
use yii\widgets\ActiveForm; use yii\widgets\ActiveForm;
/** /* @var $this yii\web\View */
* @var yii\web\View $this /* @var $model <?= $generator->modelClass ?> */
* @var <?= $generator->modelClass ?> $model /* @var $form ActiveForm */
* @var ActiveForm $form
*/
<?= "?>" ?> <?= "?>" ?>
<div class="<?= str_replace('/', '-', trim($generator->viewName, '_')) ?>"> <div class="<?= str_replace('/', '-', trim($generator->viewName, '_')) ?>">
......
<?php <?php
/** /* @var $this yii\web\View */
* @var yii\web\View $this /* @var $form yii\widgets\ActiveForm */
* @var yii\widgets\ActiveForm $form /* @var $generator yii\gii\generators\form\Generator */
* @var yii\gii\generators\form\Generator $generator
*/
echo $form->field($generator, 'viewName'); echo $form->field($generator, 'viewName');
echo $form->field($generator, 'modelClass'); echo $form->field($generator, 'modelClass');
echo $form->field($generator, 'scenarioName'); echo $form->field($generator, 'scenarioName');
......
<?php <?php
/** /**
* This is the template for generating the model class of a specified table. * This is the template for generating the model class of a specified table.
*
* @var yii\web\View $this
* @var yii\gii\generators\model\Generator $generator
* @var string $tableName full table name
* @var string $className class name
* @var yii\db\TableSchema $tableSchema
* @var string[] $labels list of attribute labels (name => label)
* @var string[] $rules list of validation rules
* @var array $relations list of relations (name => relation declaration)
*/ */
/* @var $this yii\web\View */
/* @var $generator yii\gii\generators\model\Generator */
/* @var $tableName string full table name */
/* @var $className string class name */
/* @var $tableSchema yii\db\TableSchema */
/* @var $labels string[] list of attribute labels (name => label) */
/* @var $rules string[] list of validation rules */
/* @var $relations array list of relations (name => relation declaration) */
echo "<?php\n"; echo "<?php\n";
?> ?>
......
<?php <?php
/** /* @var $this yii\web\View */
* @var yii\web\View $this /* @var $form yii\widgets\ActiveForm */
* @var yii\widgets\ActiveForm $form /* @var $generator yii\gii\generators\form\Generator */
* @var yii\gii\generators\form\Generator $generator
*/
echo $form->field($generator, 'tableName'); echo $form->field($generator, 'tableName');
echo $form->field($generator, 'modelClass'); echo $form->field($generator, 'modelClass');
......
<?php <?php
/** /**
* This is the template for generating a controller class within a module. * This is the template for generating a controller class within a module.
*
* @var yii\web\View $this
* @var yii\gii\generators\module\Generator $generator
*/ */
/* @var $this yii\web\View */
/* @var $generator yii\gii\generators\module\Generator */
echo "<?php\n"; echo "<?php\n";
?> ?>
......
<?php <?php
/** /**
* This is the template for generating a module class file. * This is the template for generating a module class file.
*
* @var yii\web\View $this
* @var yii\gii\generators\module\Generator $generator
*/ */
/* @var $this yii\web\View */
/* @var $generator yii\gii\generators\module\Generator */
$className = $generator->moduleClass; $className = $generator->moduleClass;
$pos = strrpos($className, '\\'); $pos = strrpos($className, '\\');
$ns = ltrim(substr($className, 0, $pos), '\\'); $ns = ltrim(substr($className, 0, $pos), '\\');
......
<?php <?php
/** /* @var $this yii\web\View */
* @var yii\web\View $this /* @var $generator yii\gii\generators\module\Generator */
* @var yii\gii\generators\module\Generator $generator
*/
?> ?>
<div class="<?= $generator->moduleID . '-default-index' ?>"> <div class="<?= $generator->moduleID . '-default-index' ?>">
<h1><?= "<?= " ?>$this->context->action->uniqueId ?></h1> <h1><?= "<?= " ?>$this->context->action->uniqueId ?></h1>
......
<?php <?php
/** /* @var $this yii\web\View */
* @var yii\web\View $this /* @var $form yii\widgets\ActiveForm */
* @var yii\widgets\ActiveForm $form /* @var $generator yii\gii\generators\module\Generator */
* @var yii\gii\generators\module\Generator $generator
*/
?> ?>
<div class="module-form"> <div class="module-form">
<?php <?php
......
<?php <?php
/** /* @var $this yii\web\View */
* @var yii\web\View $this /* @var $diff mixed */
* @var mixed $diff
*/
?> ?>
<div class="default-diff"> <div class="default-diff">
<?php if ($diff === false): ?> <?php if ($diff === false): ?>
......
<?php <?php
use yii\helpers\Html; use yii\helpers\Html;
/** /* @var $this \yii\web\View */
* @var \yii\web\View $this /* @var $generators \yii\gii\Generator[] */
* @var \yii\gii\Generator[] $generators /* @var $content string */
* @var string $content
*/
$generators = Yii::$app->controller->module->generators; $generators = Yii::$app->controller->module->generators;
$this->title = 'Welcome to Gii'; $this->title = 'Welcome to Gii';
?> ?>
......
...@@ -5,16 +5,14 @@ use yii\widgets\ActiveForm; ...@@ -5,16 +5,14 @@ use yii\widgets\ActiveForm;
use yii\gii\components\ActiveField; use yii\gii\components\ActiveField;
use yii\gii\CodeFile; use yii\gii\CodeFile;
/** /* @var $this yii\web\View */
* @var yii\web\View $this /* @var $generator yii\gii\Generator */
* @var yii\gii\Generator $generator /* @var $id string panel ID */
* @var string $id panel ID /* @var $form yii\widgets\ActiveForm */
* @var yii\widgets\ActiveForm $form /* @var $results string */
* @var string $results /* @var $hasError boolean */
* @var boolean $hasError /* @var $files CodeFile[] */
* @var CodeFile[] $files /* @var $answers array */
* @var array $answers
*/
$this->title = $generator->getName(); $this->title = $generator->getName();
$templates = []; $templates = [];
......
...@@ -3,13 +3,12 @@ ...@@ -3,13 +3,12 @@
use yii\helpers\Html; use yii\helpers\Html;
use yii\gii\CodeFile; use yii\gii\CodeFile;
/** /* @var $this \yii\web\View */
* @var \yii\web\View $this /* @var $generator \yii\gii\Generator */
* @var \yii\gii\Generator $generator /* @var $files CodeFile[] */
* @var CodeFile[] $files /* @var $answers array */
* @var array $answers /* @var $id string panel ID */
* @var string $id panel ID
*/
?> ?>
<div class="default-view-files"> <div class="default-view-files">
<div id="action-toggle" class="btn-group btn-group-xs pull-right"> <div id="action-toggle" class="btn-group btn-group-xs pull-right">
......
<?php <?php
/** /* @var $this yii\web\View */
* @var yii\web\View $this /* @var $generator yii\gii\Generator */
* @var yii\gii\Generator $generator /* @var $results string */
* @var string $results /* @var $hasError boolean */
* @var boolean $hasError
*/
?> ?>
<div class="default-view-results"> <div class="default-view-results">
<?php <?php
......
<?php <?php
use yii\helpers\Html; use yii\helpers\Html;
/** /* @var $this \yii\web\View */
* @var \yii\web\View $this /* @var $generators \yii\gii\Generator[] */
* @var \yii\gii\Generator[] $generators /* @var $activeGenerator \yii\gii\Generator */
* @var \yii\gii\Generator $activeGenerator /* @var $content string */
* @var string $content
*/
$generators = Yii::$app->controller->module->generators; $generators = Yii::$app->controller->module->generators;
$activeGenerator = Yii::$app->controller->generator; $activeGenerator = Yii::$app->controller->generator;
?> ?>
......
...@@ -3,10 +3,9 @@ use yii\bootstrap\NavBar; ...@@ -3,10 +3,9 @@ use yii\bootstrap\NavBar;
use yii\bootstrap\Nav; use yii\bootstrap\Nav;
use yii\helpers\Html; use yii\helpers\Html;
/** /* @var $this \yii\web\View */
* @var \yii\web\View $this /* @var $content string */
* @var string $content
*/
$asset = yii\gii\GiiAsset::register($this); $asset = yii\gii\GiiAsset::register($this);
?> ?>
<?php $this->beginPage() ?> <?php $this->beginPage() ?>
......
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