title); ?>
+title) ?>
-
+
diff --git a/apps/advanced/backend/views/site/login.php b/apps/advanced/backend/views/site/login.php index d52eaa1..65495bf 100644 --- a/apps/advanced/backend/views/site/login.php +++ b/apps/advanced/backend/views/site/login.php @@ -11,18 +11,18 @@ $this->title = 'Login'; $this->params['breadcrumbs'][] = $this->title; ?>
-
<?=Html::encode($this->title); ?>
+
+ <?= Html::encode($this->title) ?>
head(); ?>
@@ -53,13 +53,13 @@ AppAsset::register($this);
'links' => isset($this->params['breadcrumbs']) ? $this->params['breadcrumbs'] : [],
]); ?>
-
+
diff --git a/apps/advanced/frontend/views/site/about.php b/apps/advanced/frontend/views/site/about.php
index 2084648..32b84eb 100644
--- a/apps/advanced/frontend/views/site/about.php
+++ b/apps/advanced/frontend/views/site/about.php
@@ -8,9 +8,9 @@ $this->title = 'About';
$this->params['breadcrumbs'][] = $this->title;
?>
title); ?>
+title) ?>
Please fill out the following fields to login:
'login-form']); ?>
- field($model, 'username'); ?>
- field($model, 'password')->passwordInput(); ?>
- field($model, 'rememberMe')->checkbox(); ?>
+ field($model, 'username') ?>
+ field($model, 'password')->passwordInput() ?>
+ field($model, 'rememberMe')->checkbox() ?>
diff --git a/apps/advanced/frontend/views/layouts/main.php b/apps/advanced/frontend/views/layouts/main.php
index 0b36edc..4f1510e 100644
--- a/apps/advanced/frontend/views/layouts/main.php
+++ b/apps/advanced/frontend/views/layouts/main.php
@@ -16,8 +16,8 @@ AppAsset::register($this);
-
-
- 'btn btn-primary']); ?>
+ 'btn btn-primary']) ?>
-
diff --git a/apps/advanced/frontend/views/site/contact.php b/apps/advanced/frontend/views/site/contact.php
index 012c36d..97580ca 100644
--- a/apps/advanced/frontend/views/site/contact.php
+++ b/apps/advanced/frontend/views/site/contact.php
@@ -12,7 +12,7 @@ $this->title = 'Contact';
$this->params['breadcrumbs'][] = $this->title;
?>
title); ?>
+title) ?>
This is the About page. You may modify the following file to customize its content:
-
-
title); ?>
+title) ?>
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;
'contact-form']); ?>
- field($model, 'name'); ?>
- field($model, 'email'); ?>
- field($model, 'subject'); ?>
- field($model, 'body')->textArea(['rows' => 6]); ?>
+ field($model, 'name') ?>
+ field($model, 'email') ?>
+ field($model, 'subject') ?>
+ field($model, 'body')->textArea(['rows' => 6]) ?>
field($model, 'verifyCode')->widget(Captcha::className(), [
'options' => ['class' => 'form-control'],
'template' => '',
]); ?>
diff --git a/apps/advanced/frontend/views/site/error.php b/apps/advanced/frontend/views/site/error.php
index eef87f6..15a8eee 100644
--- a/apps/advanced/frontend/views/site/error.php
+++ b/apps/advanced/frontend/views/site/error.php
@@ -13,10 +13,10 @@ $this->title = $name;
?>
{image}
{input}
- 'btn btn-primary']); ?>
+ 'btn btn-primary']) ?>
-
title); ?>
+title) ?>
-
+
diff --git a/apps/advanced/frontend/views/site/login.php b/apps/advanced/frontend/views/site/login.php index df758a8..3069f90 100644 --- a/apps/advanced/frontend/views/site/login.php +++ b/apps/advanced/frontend/views/site/login.php @@ -11,21 +11,21 @@ $this->title = 'Login'; $this->params['breadcrumbs'][] = $this->title; ?>
-
title); ?>
+title) ?>
Please fill out the following fields to login:
'login-form']); ?>
- field($model, 'username'); ?>
- field($model, 'password')->passwordInput(); ?>
- field($model, 'rememberMe')->checkbox(); ?>
+ field($model, 'username') ?>
+ field($model, 'password')->passwordInput() ?>
+ field($model, 'rememberMe')->checkbox() ?>
diff --git a/apps/advanced/frontend/views/site/requestPasswordResetToken.php b/apps/advanced/frontend/views/site/requestPasswordResetToken.php
index f906b72..88d23be 100644
--- a/apps/advanced/frontend/views/site/requestPasswordResetToken.php
+++ b/apps/advanced/frontend/views/site/requestPasswordResetToken.php
@@ -11,16 +11,16 @@ $this->title = 'Request password reset';
$this->params['breadcrumbs'][] = $this->title;
?>
If you forgot your password you can .
- 'btn btn-primary']); ?>
+ 'btn btn-primary']) ?>
-
title); ?>
+title) ?>
Please fill out your email. A link to reset password will be sent there.
'request-password-reset-form']); ?>
- field($model, 'email'); ?>
+ field($model, 'email') ?>
diff --git a/apps/advanced/frontend/views/site/resetPassword.php b/apps/advanced/frontend/views/site/resetPassword.php
index 40c1106..dc5beba 100644
--- a/apps/advanced/frontend/views/site/resetPassword.php
+++ b/apps/advanced/frontend/views/site/resetPassword.php
@@ -11,16 +11,16 @@ $this->title = 'Reset password';
$this->params['breadcrumbs'][] = $this->title;
?>
- 'btn btn-primary']); ?>
+ 'btn btn-primary']) ?>
-
diff --git a/framework/yii/debug/views/layouts/main.php b/framework/yii/debug/views/layouts/main.php
index f22842d..c16ac4f 100644
--- a/framework/yii/debug/views/layouts/main.php
+++ b/framework/yii/debug/views/layouts/main.php
@@ -11,12 +11,12 @@ yii\debug\DebugAsset::register($this);
beginPage(); ?>
- <?=Html::encode($this->title); ?>
+ <?= Html::encode($this->title) ?>
head(); ?>
beginBody(); ?>
-
+
endBody(); ?>
endPage(); ?>
diff --git a/framework/yii/gii/generators/controller/templates/controller.php b/framework/yii/gii/generators/controller/templates/controller.php
index 9101c57..9d0d92c 100644
--- a/framework/yii/gii/generators/controller/templates/controller.php
+++ b/framework/yii/gii/generators/controller/templates/controller.php
@@ -13,15 +13,15 @@ echo "
ns)): ?>
-namespace ns; ?>;
+namespace ns ?>;
-class getControllerClass(); ?> extends baseClass, '\\') . "\n"; ?>
+class getControllerClass() ?> extends baseClass, '\\') . "\n" ?>
{
getActionIDs() as $action): ?>
- public function action()
+ public function action()
{
- return $this->render('');
+ return $this->render('');
}
diff --git a/framework/yii/gii/generators/controller/templates/view.php b/framework/yii/gii/generators/controller/templates/view.php
index 6441ecc..8a46f75 100644
--- a/framework/yii/gii/generators/controller/templates/view.php
+++ b/framework/yii/gii/generators/controller/templates/view.php
@@ -12,11 +12,11 @@ echo ""; ?>
+" ?>
-
title); ?>
+title) ?>
Please choose your new password:
'reset-password-form']); ?>
- field($model, 'password')->passwordInput(); ?>
+ field($model, 'password')->passwordInput() ?>
diff --git a/apps/advanced/frontend/views/site/signup.php b/apps/advanced/frontend/views/site/signup.php
index 82bc78c..bfebceb 100644
--- a/apps/advanced/frontend/views/site/signup.php
+++ b/apps/advanced/frontend/views/site/signup.php
@@ -11,18 +11,18 @@ $this->title = 'Signup';
$this->params['breadcrumbs'][] = $this->title;
?>
- 'btn btn-primary']); ?>
+ 'btn btn-primary']) ?>
-
<?=Html::encode($this->title); ?>
+
+ <?= Html::encode($this->title) ?>
head(); ?>
@@ -48,13 +48,13 @@ app\config\AppAsset::register($this);
isset($this->params['breadcrumbs']) ? $this->params['breadcrumbs'] : [],
]); ?>
-
+
diff --git a/apps/basic/views/site/about.php b/apps/basic/views/site/about.php
index e4070a8..5010642 100644
--- a/apps/basic/views/site/about.php
+++ b/apps/basic/views/site/about.php
@@ -8,11 +8,11 @@ $this->title = 'About';
$this->params['breadcrumbs'][] = $this->title;
?>
title); ?>
+title) ?>
Please fill out the following fields to signup:
'form-signup']); ?>
- field($model, 'username'); ?>
- field($model, 'email'); ?>
- field($model, 'password')->passwordInput(); ?>
+ field($model, 'username') ?>
+ field($model, 'email') ?>
+ field($model, 'password')->passwordInput() ?>
diff --git a/apps/basic/tests/acceptance/WebGuy.php b/apps/basic/tests/acceptance/WebGuy.php
index 397761c..e6cc370 100644
--- a/apps/basic/tests/acceptance/WebGuy.php
+++ b/apps/basic/tests/acceptance/WebGuy.php
@@ -36,7 +36,7 @@ class WebGuy extends \Codeception\AbstractGuy
*
* ``` php
* submitForm('#login', array('login' => 'davert', 'password' => '123456'));
+ * $I->submitForm('#login', ['login' => 'davert', 'password' => '123456']);
*
* ```
*
@@ -55,7 +55,7 @@ class WebGuy extends \Codeception\AbstractGuy
*
* ``` php
* submitForm('#userForm', array('user' => array('login' => 'Davert', 'password' => '123456', 'agree' => true)));
+ * $I->submitForm('#userForm', ['user' => ['login' => 'Davert', 'password' => '123456', 'agree' => true]]);
*
* ```
* Note, that pricing plan will be set to Paid, as it's selected on page.
@@ -89,8 +89,8 @@ class WebGuy extends \Codeception\AbstractGuy
*
* ``` php
* sendAjaxPostRequest('/updateSettings', array('notifications' => true); // POST
- * $I->sendAjaxGetRequest('/updateSettings', array('notifications' => true); // GET
+ * $I->sendAjaxPostRequest('/updateSettings', ['notifications' => true]; // POST
+ * $I->sendAjaxGetRequest('/updateSettings', ['notifications' => true]; // GET
*
* ```
*
@@ -202,12 +202,12 @@ class WebGuy extends \Codeception\AbstractGuy
* // from the official Guzzle manual
* $I->amGoingTo('Sign all requests with OAuth');
* $I->executeInGuzzle(function (\Guzzle\Http\Client $client) {
- * $client->addSubscriber(new Guzzle\Plugin\Oauth\OauthPlugin(array(
+ * $client->addSubscriber(new Guzzle\Plugin\Oauth\OauthPlugin([
* 'consumer_key' => '***',
* 'consumer_secret' => '***',
* 'token' => '***',
* 'token_secret' => '***'
- * )));
+ * ]));
* });
* ?>
* ```
diff --git a/apps/basic/tests/functional/TestGuy.php b/apps/basic/tests/functional/TestGuy.php
index 767d564..58baf56 100644
--- a/apps/basic/tests/functional/TestGuy.php
+++ b/apps/basic/tests/functional/TestGuy.php
@@ -832,7 +832,7 @@ class TestGuy extends \Codeception\AbstractGuy
*
* ``` php
* submitForm('#login', array('login' => 'davert', 'password' => '123456'));
+ * $I->submitForm('#login', ['login' => 'davert', 'password' => '123456']);
*
* ```
*
@@ -851,7 +851,7 @@ class TestGuy extends \Codeception\AbstractGuy
*
* ``` php
* submitForm('#userForm', array('user' => array('login' => 'Davert', 'password' => '123456', 'agree' => true)));
+ * $I->submitForm('#userForm', ['user' => ['login' => 'Davert', 'password' => '123456', 'agree' => true]]);
*
* ```
* Note, that pricing plan will be set to Paid, as it's selected on page.
@@ -1042,8 +1042,8 @@ class TestGuy extends \Codeception\AbstractGuy
*
* ``` php
* sendAjaxPostRequest('/updateSettings', array('notifications' => true); // POST
- * $I->sendAjaxGetRequest('/updateSettings', array('notifications' => true); // GET
+ * $I->sendAjaxPostRequest('/updateSettings', ['notifications' => true]; // POST
+ * $I->sendAjaxGetRequest('/updateSettings', ['notifications' => true]; // GET
*
* ```
*
diff --git a/apps/basic/views/layouts/main.php b/apps/basic/views/layouts/main.php
index 3ffbf0f..88066de 100644
--- a/apps/basic/views/layouts/main.php
+++ b/apps/basic/views/layouts/main.php
@@ -14,8 +14,8 @@ app\config\AppAsset::register($this);
-
-
- 'btn btn-primary']); ?>
+ 'btn btn-primary']) ?>
-
diff --git a/apps/basic/views/site/contact.php b/apps/basic/views/site/contact.php
index 450e06b..66711a5 100644
--- a/apps/basic/views/site/contact.php
+++ b/apps/basic/views/site/contact.php
@@ -12,7 +12,7 @@ $this->title = 'Contact';
$this->params['breadcrumbs'][] = $this->title;
?>
title); ?>
+title) ?>
This is the About page. You may modify the following file to customize its content:
-
-
- getDetail(); ?>
+ getDetail() ?>
title); ?>
+title) ?>
session->hasFlash('contactFormSubmitted')): ?> @@ -29,16 +29,16 @@ $this->params['breadcrumbs'][] = $this->title;
'contact-form']); ?>
- field($model, 'name'); ?>
- field($model, 'email'); ?>
- field($model, 'subject'); ?>
- field($model, 'body')->textArea(['rows' => 6]); ?>
+ field($model, 'name') ?>
+ field($model, 'email') ?>
+ field($model, 'subject') ?>
+ field($model, 'body')->textArea(['rows' => 6]) ?>
field($model, 'verifyCode')->widget(Captcha::className(), [
'options' => ['class' => 'form-control'],
'template' => '',
]); ?>
diff --git a/apps/basic/views/site/error.php b/apps/basic/views/site/error.php
index eef87f6..15a8eee 100644
--- a/apps/basic/views/site/error.php
+++ b/apps/basic/views/site/error.php
@@ -13,10 +13,10 @@ $this->title = $name;
?>
{image}
{input}
- 'btn btn-primary']); ?>
+ 'btn btn-primary']) ?>
-
@@ -71,7 +71,7 @@ $this->title = 'Yii Debugger';
echo ' at ' . date('Y-m-d h:i:s a', $summary['time']) . ' by ' . $summary['ip'];
?>
title); ?>
+title) ?>
-
+
diff --git a/apps/basic/views/site/login.php b/apps/basic/views/site/login.php index 34936af..62b4398 100644 --- a/apps/basic/views/site/login.php +++ b/apps/basic/views/site/login.php @@ -11,7 +11,7 @@ $this->title = 'Login'; $this->params['breadcrumbs'][] = $this->title; ?>
-
diff --git a/docs/api/db/ActiveRecord.md b/docs/api/db/ActiveRecord.md
index 0120998..70f171b 100644
--- a/docs/api/db/ActiveRecord.md
+++ b/docs/api/db/ActiveRecord.md
@@ -175,7 +175,7 @@ class Customer extends \yii\db\ActiveRecord
{
public function getOrders()
{
- return $this->hasMany('Order', ['customer_id' => 'id']);
+ return $this->hasMany(Order::className(), ['customer_id' => 'id']);
}
}
@@ -183,7 +183,7 @@ class Order extends \yii\db\ActiveRecord
{
public function getCustomer()
{
- return $this->hasOne('Customer', ['id' => 'customer_id']);
+ return $this->hasOne(Customer::className(), ['id' => 'customer_id']);
}
}
~~~
@@ -194,8 +194,7 @@ a one-many relationship. For example, a customer has many orders. And the [[hasO
method declares a many-one or one-one relationship. For example, an order has one customer.
Both methods take two parameters:
-- `$class`: the name of the class related models should use. If specified without
- a namespace, the namespace will be taken from the declaring class.
+- `$class`: the name of the class that the related models should use.
- `$link`: the association between columns from two tables. This should be given as an array.
The keys of the array are the names of the columns from the table associated with `$class`,
while the values of the array are the names of the columns from the declaring class.
@@ -223,7 +222,7 @@ class Customer extends \yii\db\ActiveRecord
{
public function getBigOrders($threshold = 100)
{
- return $this->hasMany('Order', ['customer_id' => 'id'])
+ return $this->hasMany(Order::className(), ['customer_id' => 'id'])
->where('subtotal > :threshold', [':threshold' => $threshold])
->orderBy('id');
}
@@ -244,7 +243,7 @@ class Order extends \yii\db\ActiveRecord
{
public function getItems()
{
- return $this->hasMany('Item', ['id' => 'item_id'])
+ return $this->hasMany(Item::className(), ['id' => 'item_id'])
->viaTable('tbl_order_item', ['order_id' => 'id']);
}
}
@@ -259,12 +258,12 @@ class Order extends \yii\db\ActiveRecord
{
public function getOrderItems()
{
- return $this->hasMany('OrderItem', ['order_id' => 'id']);
+ return $this->hasMany(OrderItem::className(), ['order_id' => 'id']);
}
public function getItems()
{
- return $this->hasMany('Item', ['id' => 'item_id'])
+ return $this->hasMany(Item::className(), ['id' => 'item_id'])
->via('orderItems');
}
}
diff --git a/docs/guide/active-record.md b/docs/guide/active-record.md
index 3de4a01..90826b0 100644
--- a/docs/guide/active-record.md
+++ b/docs/guide/active-record.md
@@ -202,7 +202,7 @@ class Customer extends \yii\db\ActiveRecord
{
public function getOrders()
{
- return $this->hasMany('Order', ['customer_id' => 'id']);
+ return $this->hasMany(Order::className(), ['customer_id' => 'id']);
}
}
@@ -210,7 +210,7 @@ class Order extends \yii\db\ActiveRecord
{
public function getCustomer()
{
- return $this->hasOne('Customer', ['id' => 'customer_id']);
+ return $this->hasOne(Customer::className(), ['id' => 'customer_id']);
}
}
```
@@ -257,7 +257,7 @@ class Customer extends \yii\db\ActiveRecord
{
public function getBigOrders($threshold = 100)
{
- return $this->hasMany('Order', ['customer_id' => 'id'])
+ return $this->hasMany(Order::className(), ['customer_id' => 'id'])
->where('subtotal > :threshold', [':threshold' => $threshold])
->orderBy('id');
}
@@ -291,7 +291,7 @@ class Order extends \yii\db\ActiveRecord
{
public function getItems()
{
- return $this->hasMany('Item', ['id' => 'item_id'])
+ return $this->hasMany(Item::className(), ['id' => 'item_id'])
->viaTable('tbl_order_item', ['order_id' => 'id']);
}
}
@@ -306,12 +306,12 @@ class Order extends \yii\db\ActiveRecord
{
public function getOrderItems()
{
- return $this->hasMany('OrderItem', ['order_id' => 'id']);
+ return $this->hasMany(OrderItem::className(), ['order_id' => 'id']);
}
public function getItems()
{
- return $this->hasMany('Item', ['id' => 'item_id'])
+ return $this->hasMany(Item::className(), ['id' => 'item_id'])
->via('orderItems');
}
}
@@ -517,7 +517,7 @@ class Feature extends \yii\db\ActiveRecord
public function getProduct()
{
- return $this->hasOne('Product', ['product_id' => 'id']);
+ return $this->hasOne(Product::className(), ['product_id' => 'id']);
}
}
@@ -527,7 +527,7 @@ class Product extends \yii\db\ActiveRecord
public function getFeatures()
{
- return $this->hasMany('Feature', ['id' => 'product_id']);
+ return $this->hasMany(Feature::className(), ['id' => 'product_id']);
}
}
```
@@ -566,7 +566,7 @@ class Feature extends \yii\db\ActiveRecord
public function getProduct()
{
- return $this->hasOne('Product', ['product_id' => 'id']);
+ return $this->hasOne(Product::className(), ['product_id' => 'id']);
}
public function scenarios()
@@ -586,7 +586,7 @@ class Product extends \yii\db\ActiveRecord
public function getFeatures()
{
- return $this->hasMany('Feature', ['id' => 'product_id']);
+ return $this->hasMany(Feature::className(), ['id' => 'product_id']);
}
public function scenarios()
diff --git a/docs/guide/i18n.md b/docs/guide/i18n.md
index e44dc6b..de1c80d 100644
--- a/docs/guide/i18n.md
+++ b/docs/guide/i18n.md
@@ -205,7 +205,7 @@ Will produce "You are 42nd visitor here!".
```php
-echo \Yii::t('app', 'You are here for {n, duration} already!', ['n' => 42]);
+echo \Yii::t('app', 'You are here for {n, duration} already!', ['n' => 47]);
```
Will produce "You are here for 47 sec. already!".
diff --git a/docs/guide/installation.md b/docs/guide/installation.md
index 8ec3619..11e6a5e 100644
--- a/docs/guide/installation.md
+++ b/docs/guide/installation.md
@@ -83,57 +83,28 @@ Yii to catch all requests to nonexistent files, which allows us to have nice-loo
~~~
server {
- set $host_path "/www/mysite";
- access_log /www/mysite/log/access.log main;
-
- server_name mysite;
- root $host_path/htdocs;
- set $yii_bootstrap "index.php";
-
charset utf-8;
- location / {
- index index.html $yii_bootstrap;
- try_files $uri $uri/ /$yii_bootstrap?$args;
- }
+ listen 80;
+ server_name mysite.local;
+ root /path/to/project/webroot/directory
- location ~ ^/(protected|framework|themes/\w+/views) {
- deny all;
- }
+ access_log /path/to/project/log/access.log main;
- #avoid processing of calls to unexisting static files by yii
- location ~ \.(js|css|png|jpg|gif|swf|ico|pdf|mov|fla|zip|rar)$ {
- try_files $uri =404;
+ location / {
+ try_files $uri $uri/ /index.php?$args; # Redirect everything that isn't real file to index.php including arguments.
}
- # pass the PHP scripts to FastCGI server listening on 127.0.0.1:9000
- #
- location ~ \.php {
- fastcgi_split_path_info ^(.+\.php)(.*)$;
-
- #let yii catch the calls to unexising PHP files
- set $fsn /$yii_bootstrap;
- if (-f $document_root$fastcgi_script_name){
- set $fsn $fastcgi_script_name;
- }
-
- #for php-cgi
+ location ~ \.php$ {
+ include fastcgi.conf;
fastcgi_pass 127.0.0.1:9000;
- #for php-fpm
#fastcgi_pass unix:/var/run/php5-fpm.sock;
- include fastcgi_params;
- fastcgi_param SCRIPT_FILENAME $document_root$fsn;
-
- #PATH_INFO and PATH_TRANSLATED can be omitted, but RFC 3875 specifies them for CGI
- fastcgi_param PATH_INFO $fastcgi_path_info;
- fastcgi_param PATH_TRANSLATED $document_root$fsn;
}
- location ~ /\.ht {
- deny all;
+ location ~ /\.(ht|svn|git) {
+ deny all;
}
}
~~~
-Using this configuration you can set `cgi.fix_pathinfo=0` in php.ini to avoid
-many unnecessary system `stat()` calls.
+Make sure to set `cgi.fix_pathinfo=0` in php.ini to avoid many unnecessary system `stat()` calls.
diff --git a/docs/guide/upgrade-from-v1.md b/docs/guide/upgrade-from-v1.md
index 713f967..f04e849 100644
--- a/docs/guide/upgrade-from-v1.md
+++ b/docs/guide/upgrade-from-v1.md
@@ -340,10 +340,10 @@ It is represented as an `ActiveField` object. Using fields, you can build a form
```php
- field($model, 'username'); ?>
- field($model, 'password')->passwordInput(); ?>
+ field($model, 'username') ?>
+ field($model, 'password')->passwordInput() ?>
<?=Html::encode($this->title); ?>
+
+ <?= Html::encode($this->title) ?>
head(); ?>
beginBody(); ?>
* @since 2.0
*/
class Extension
{
+ /**
+ * Initializes the extension.
+ * This method is invoked at the end of [[Application::init()]].
+ */
public static function init()
{
}
diff --git a/framework/yii/base/Module.php b/framework/yii/base/Module.php
index ee3949b..fefdf1d 100644
--- a/framework/yii/base/Module.php
+++ b/framework/yii/base/Module.php
@@ -83,7 +83,6 @@ abstract class Module extends Component
* it will use the "controllers" sub-namespace under the namespace of this module.
* For example, if the namespace of this module is "foo\bar", then the default
* controller namespace would be "foo\bar\controllers".
- * If the module is an application, it will default to "app\controllers".
*/
public $controllerNamespace;
/**
@@ -167,22 +166,20 @@ abstract class Module extends Component
/**
* Initializes the module.
* This method is called after the module is created and initialized with property values
- * given in configuration. The default implement will create a path alias using the module [[id]]
+ * given in configuration. The default implementation will create a path alias using the module [[id]]
* and then call [[preloadComponents()]] to load components that are declared in [[preload]].
+ *
+ * If you override this method, please make sure you call the parent implementation.
*/
public function init()
{
- $this->preloadComponents();
if ($this->controllerNamespace === null) {
- if ($this instanceof Application) {
- $this->controllerNamespace = 'app\\controllers';
- } else {
- $class = get_class($this);
- if (($pos = strrpos($class, '\\')) !== false) {
- $this->controllerNamespace = substr($class, 0, $pos) . '\\controllers';
- }
+ $class = get_class($this);
+ if (($pos = strrpos($class, '\\')) !== false) {
+ $this->controllerNamespace = substr($class, 0, $pos) . '\\controllers';
}
}
+ $this->preloadComponents();
}
/**
@@ -221,9 +218,6 @@ abstract class Module extends Component
$p = realpath($path);
if ($p !== false && is_dir($p)) {
$this->_basePath = $p;
- if ($this instanceof Application) {
- Yii::setAlias('@app', $p);
- }
} else {
throw new InvalidParamException("The directory does not exist: $path");
}
diff --git a/framework/yii/base/View.php b/framework/yii/base/View.php
index 28e7b71..68b1094 100644
--- a/framework/yii/base/View.php
+++ b/framework/yii/base/View.php
@@ -540,7 +540,7 @@ class View extends Component
/**
* Registers all files provided by an asset bundle including depending bundles files.
- * Removes a bundle from [[assetBundles]] once registered.
+ * Removes a bundle from [[assetBundles]] once files are registered.
* @param string $name name of the bundle to register
*/
private function registerAssetFiles($name)
@@ -552,7 +552,7 @@ class View extends Component
foreach($bundle->depends as $dep) {
$this->registerAssetFiles($dep);
}
- $bundle->registerAssets($this);
+ $bundle->registerAssetFiles($this);
unset($this->assetBundles[$name]);
}
diff --git a/framework/yii/db/ActiveRecord.php b/framework/yii/db/ActiveRecord.php
index 3f158cf..806a6c1 100644
--- a/framework/yii/db/ActiveRecord.php
+++ b/framework/yii/db/ActiveRecord.php
@@ -456,7 +456,7 @@ class ActiveRecord extends Model
* ~~~
* public function getCountry()
* {
- * return $this->hasOne('Country', ['id' => 'country_id']);
+ * return $this->hasOne(Country::className(), ['id' => 'country_id']);
* }
* ~~~
*
@@ -475,7 +475,7 @@ class ActiveRecord extends Model
public function hasOne($class, $link)
{
return new ActiveRelation([
- 'modelClass' => $this->getNamespacedClass($class),
+ 'modelClass' => $class,
'primaryModel' => $this,
'link' => $link,
'multiple' => false,
@@ -496,7 +496,7 @@ class ActiveRecord extends Model
* ~~~
* public function getOrders()
* {
- * return $this->hasMany('Order', ['customer_id' => 'id']);
+ * return $this->hasMany(Order::className(), ['customer_id' => 'id']);
* }
* ~~~
*
@@ -513,7 +513,7 @@ class ActiveRecord extends Model
public function hasMany($class, $link)
{
return new ActiveRelation([
- 'modelClass' => $this->getNamespacedClass($class),
+ 'modelClass' => $class,
'primaryModel' => $this,
'link' => $link,
'multiple' => true,
@@ -1439,24 +1439,6 @@ class ActiveRecord extends Model
}
/**
- * Changes the given class name into a namespaced one.
- * If the given class name is already namespaced, no change will be made.
- * Otherwise, the class name will be changed to use the same namespace as
- * the current AR class.
- * @param string $class the class name to be namespaced
- * @return string the namespaced class name
- */
- protected static function getNamespacedClass($class)
- {
- if (strpos($class, '\\') === false) {
- $reflector = new \ReflectionClass(static::className());
- return $reflector->getNamespaceName() . '\\' . $class;
- } else {
- return $class;
- }
- }
-
- /**
* @param array $link
* @param ActiveRecord $foreignModel
* @param ActiveRecord $primaryModel
diff --git a/framework/yii/debug/views/default/index.php b/framework/yii/debug/views/default/index.php
index 325267d..c01230c 100644
--- a/framework/yii/debug/views/default/index.php
+++ b/framework/yii/debug/views/default/index.php
@@ -32,11 +32,11 @@ $this->title = 'Yii Debugger';
$data): ?>
- $tag]); ?>
- $tag]) ?>
+
diff --git a/framework/yii/debug/views/default/toolbar.php b/framework/yii/debug/views/default/toolbar.php
index 40d33cf..bc76a67 100644
--- a/framework/yii/debug/views/default/toolbar.php
+++ b/framework/yii/debug/views/default/toolbar.php
@@ -26,13 +26,13 @@ $url = $panels['request']->getUrl();
?>
- getSummary(); ?>
+ getSummary() ?>
title); ?>
+title) ?>
Please fill out the following fields to login:
@@ -24,9 +24,9 @@ $this->params['breadcrumbs'][] = $this->title; ], ]); ?> - field($model, 'username'); ?> + field($model, 'username') ?> - field($model, 'password')->passwordInput(); ?> + field($model, 'password')->passwordInput() ?> field($model, 'rememberMe', [ 'template' => "{input}
\n{error}
",
@@ -34,7 +34,7 @@ $this->params['breadcrumbs'][] = $this->title;
- 'btn btn-primary']); ?>
+ 'btn btn-primary']) ?>
-
+
```
diff --git a/docs/guide/url.md b/docs/guide/url.md
index 46bb177..a82f741 100644
--- a/docs/guide/url.md
+++ b/docs/guide/url.md
@@ -1,3 +1,116 @@
URL Management
==============
+The concept of URL management in Yii fairly simple. The idea is that application uses internal routes and parameters
+everywhere. Framework takes care of translating routes into URLs and back according to URL manager configuration.
+This approach allows you to adjust URLs in a single config file without touching application code.
+
+Internal route
+--------------
+
+Internal routes and parameters are what you're dealing with when implementing an application using Yii.
+
+Each controller and its action has a corresponding internal route such as `site/index`. Here `site` is referred to as
+controller ID while `index` is referred to as action ID. If controller belongs to a module, internal route is prefixed
+with the module ID such as `blog/post/index` for a blog module.
+
+Creating URLs
+-------------
+
+As was already mentioned, the most important rule is to always use URL manager to create URLs. Url manages is an
+application component with `urlManager` id that is accessible both from web and console applications via
+`\Yii::$app->urlManager` and has two following URL creation methods available:
+
+- createUrl($route, $params = [])
+- createAbsoluteUrl($route, $params = [])
+
+First one creates URL relative to the application root while the second one creates URL prefixed with protocol and
+hostname. The former is suitable for internal application URLs while the latter is used when you need to create rules
+for outside the website. For example, when sending emails or generating RSS feed.
+
+Some examples:
+
+```php
+echo \Yii::$app->urlManager->createUrl('site/page', ['id' => 'about']);
+echo \Yii::$app->urlManager->createAbsoluteUrl('blog/post/index');
+```
+
+Inside web application controller you can use its own `createUrl` shortcut method in the following forms:
+
+```php
+echo $this->createUrl(''); // currently active route
+echo $this->createUrl('view', ['id' => 'contact']); // same controller, different action
+echo $this->createUrl('post/index'); // same module, different controller and action
+echo $this->createUrl('/site/index'); // absolute route no matter which controller we're in
+```
+
+> **Tip**: In order to generate URL with a hashtag, for example `/index.php?r=site/page&id=100#title`, you need to
+ specify parameter named `#` using `$this->createUrl('post/read', ['id' => 100, '#' => 'title'])`.
+
+Customizing URLs
+----------------
+
+By default Yii uses a query string format URLs such as `/index.php?r=news/view&id=100`. In order to make URLs
+human-friendly you need to configure `urlManager` component like the following:
+
+```php
+ [
+ 'urlManager' => [
+ 'enablePrettyUrl' => true,
+ 'showScriptName' => false,
+ ],
+ ],
+];
+```
+
+Note that
+
+### Named parameters
+
+### Handling subdomains
+
+### Faking URL Suffix
+
+```php
+ [
+ 'urlManager' => [
+ 'suffix' => '.html',
+ ],
+ ],
+];
+```
+
+### Handling REST
+
+
+URL parsing
+-----------
+
+Complimentary to creating URLs Yii is handling transforming custom URLs back into internal route and parameters.
+
+### Strict URL parsing
+
+By default if there's no custom rule for URL and URL matches default format such as `/site/page` Yii tries to run a
+corresponding controller's action. This behavior could be disabled so if there's no custom rule match, a 404 not found
+error will be produced immediately.
+
+```php
+ [
+ 'urlManager' => [
+ 'enableStrictParsing' => true,
+ ],
+ ],
+];
+```
+
+Creating your own rule classes
+------------------------------
diff --git a/docs/guide/view.md b/docs/guide/view.md
index 27a90ae..98e0140 100644
--- a/docs/guide/view.md
+++ b/docs/guide/view.md
@@ -76,7 +76,7 @@ use yii\helpers\Html;
?>
- name); ?>
+ name) ?>
```
@@ -97,7 +97,7 @@ use yii\helpers\HtmlPurifier;
?>
- text); ?>
+ text) ?>
```
@@ -256,16 +256,16 @@ use yii\helpers\Html;
?>
beginPage(); ?>
-
+
-
-
-
+
endBody(); ?>
@@ -295,8 +295,8 @@ use yii\helpers\Html;
?>
-
-
+
+
```
diff --git a/extensions/composer/yii/composer/Installer.php b/extensions/composer/yii/composer/Installer.php
index 6fcfeff..8b7363c 100644
--- a/extensions/composer/yii/composer/Installer.php
+++ b/extensions/composer/yii/composer/Installer.php
@@ -31,7 +31,7 @@ class Installer extends LibraryInstaller
*/
public function supports($packageType)
{
- return $packageType === 'yii-extension';
+ return $packageType === 'yii2-extension';
}
/**
@@ -65,7 +65,7 @@ class Installer extends LibraryInstaller
protected function addPackage(PackageInterface $package)
{
$extension = [
- 'name' => $package->getPrettyName(),
+ 'name' => $package->getName(),
'version' => $package->getVersion(),
];
@@ -76,14 +76,14 @@ class Installer extends LibraryInstaller
}
$extensions = $this->loadExtensions();
- $extensions[$package->getUniqueName()] = $extension;
+ $extensions[$package->getName()] = $extension;
$this->saveExtensions($extensions);
}
protected function removePackage(PackageInterface $package)
{
$packages = $this->loadExtensions();
- unset($packages[$package->getUniqueName()]);
+ unset($packages[$package->getName()]);
$this->saveExtensions($packages);
}
diff --git a/extensions/composer/yii/composer/InstallerPlugin.php b/extensions/composer/yii/composer/InstallerPlugin.php
index 519363d..0b8ce5f 100644
--- a/extensions/composer/yii/composer/InstallerPlugin.php
+++ b/extensions/composer/yii/composer/InstallerPlugin.php
@@ -28,7 +28,7 @@ class InstallerPlugin implements PluginInterface
$composer->getInstallationManager()->addInstaller($installer);
$file = rtrim($composer->getConfig()->get('vendor-dir'), '/') . '/yii-extensions.php';
if (!is_file($file)) {
- file_put_contents($file, "setBasePath($config['basePath']);
- unset($config['basePath']);
- } else {
- throw new InvalidConfigException('The "basePath" configuration is required.');
- }
$this->preInit($config);
-
$this->registerErrorHandlers();
$this->registerCoreComponents();
@@ -158,10 +155,23 @@ abstract class Application extends Module
/**
* Pre-initializes the application.
* This method is called at the beginning of the application constructor.
+ * It initializes several important application properties.
+ * If you override this method, please make sure you call the parent implementation.
* @param array $config the application configuration
+ * @throws InvalidConfigException if either [[id]] or [[basePath]] configuration is missing.
*/
public function preInit(&$config)
{
+ if (!isset($config['id'])) {
+ throw new InvalidConfigException('The "id" configuration is required.');
+ }
+ if (isset($config['basePath'])) {
+ $this->setBasePath($config['basePath']);
+ unset($config['basePath']);
+ } else {
+ throw new InvalidConfigException('The "basePath" configuration is required.');
+ }
+
if (isset($config['vendorPath'])) {
$this->setVendorPath($config['vendorPath']);
unset($config['vendorPath']);
@@ -176,6 +186,7 @@ abstract class Application extends Module
// set "@runtime"
$this->getRuntimePath();
}
+
if (isset($config['timeZone'])) {
$this->setTimeZone($config['timeZone']);
unset($config['timeZone']);
@@ -185,6 +196,31 @@ abstract class Application extends Module
}
/**
+ * @inheritdoc
+ */
+ public function init()
+ {
+ parent::init();
+ $this->initExtensions($this->extensions);
+ }
+
+ /**
+ * Initializes the extensions.
+ * @param array $extensions the extensions to be initialized. Please refer to [[extensions]]
+ * for the structure of the extension array.
+ */
+ protected function initExtensions($extensions)
+ {
+ foreach ($extensions as $extension) {
+ if (isset($extension['bootstrap'])) {
+ /** @var Extension $class */
+ $class = $extension['bootstrap'];
+ $class::init();
+ }
+ }
+ }
+
+ /**
* Loads components that are declared in [[preload]].
* @throws InvalidConfigException if a component or module to be preloaded is unknown
*/
@@ -221,6 +257,18 @@ abstract class Application extends Module
}
/**
+ * Sets the root directory of the applicaition and the @app alias.
+ * This method can only be invoked at the beginning of the constructor.
+ * @param string $path the root directory of the application.
+ * @throws InvalidParamException if the directory does not exist.
+ */
+ public function setBasePath($path)
+ {
+ parent::setBasePath($path);
+ Yii::setAlias('@app', $this->getBasePath());
+ }
+
+ /**
* Runs the application.
* This is the main entrance of an application.
* @return integer the exit status (0 means normal, non-zero values mean abnormal)
diff --git a/framework/yii/base/Extension.php b/framework/yii/base/Extension.php
index dac9552..c25a043 100644
--- a/framework/yii/base/Extension.php
+++ b/framework/yii/base/Extension.php
@@ -8,11 +8,21 @@
namespace yii\base;
/**
+ * Extension is the base class that may be extended by individual extensions.
+ *
+ * Extension serves as the bootstrap class for extensions. When an extension
+ * is installed via composer, the [[init()]] method of its Extension class (if any)
+ * will be invoked during the application initialization stage.
+ *
* @author Qiang Xue
- getSummary(); ?>
+ getSummary() ?>
-
+
diff --git a/framework/yii/debug/views/default/view.php b/framework/yii/debug/views/default/view.php
index 8fe7199..338bef7 100644
--- a/framework/yii/debug/views/default/view.php
+++ b/framework/yii/debug/views/default/view.php
@@ -21,7 +21,7 @@ $this->title = 'Yii Debugger';
Yii Debugger
getControllerID() . '/' . $action; ?>
+getControllerID() . '/' . $action ?>
You may change the content of this page by modifying
- the file echo __FILE__; ?>.
+ the file echo __FILE__; ?>.
+
- $form = ActiveForm::begin(); ?>
+ $form = ActiveForm::begin(); ?>
generateActiveField($attribute) . " ?>\n\n";
+ echo "\t\tgenerateActiveField($attribute) . " ?>\n\n";
} ?>
diff --git a/framework/yii/gii/generators/crud/templates/views/_search.php b/framework/yii/gii/generators/crud/templates/views/_search.php
index 14bd1af..ff9a0dd 100644
--- a/framework/yii/gii/generators/crud/templates/views/_search.php
+++ b/framework/yii/gii/generators/crud/templates/views/_search.php
@@ -16,14 +16,14 @@ use yii\widgets\ActiveForm;
/**
* @var yii\base\View $this
- * @var searchModelClass, '\\'); ?> $model
+ * @var searchModelClass, '\\') ?> $model
* @var yii\widgets\ActiveForm $form
*/
?>
-
- echo Html::submitButton($model->isNewRecord ? 'Create' : 'Update', ['class' => $model->isNewRecord ? 'btn btn-success' : 'btn btn-primary']); ?>
+ Html::submitButton($model->isNewRecord ? 'Create' : 'Update', ['class' => $model->isNewRecord ? 'btn btn-success' : 'btn btn-primary']) ?>
- ActiveForm::end(); ?>
+ ActiveForm::end(); ?>
+
- $form = ActiveForm::begin([
+ $form = ActiveForm::begin([
'action' => ['index'],
'method' => 'get',
]); ?>
@@ -32,17 +32,17 @@ use yii\widgets\ActiveForm;
$count = 0;
foreach ($generator->getTableSchema()->getColumnNames() as $attribute) {
if (++$count < 6) {
- echo "\t\tgenerateActiveSearchField($attribute) . " ?>\n";
+ echo "\t\tgenerateActiveSearchField($attribute) . " ?>\n\n";
} else {
- echo "\t\tgenerateActiveSearchField($attribute) . " ?>\n";
+ echo "\t\tgenerateActiveSearchField($attribute) . " ?>\n\n";
}
}
?>
diff --git a/framework/yii/gii/generators/crud/templates/views/create.php b/framework/yii/gii/generators/crud/templates/views/create.php
index 63a4eef..02c30bf 100644
--- a/framework/yii/gii/generators/crud/templates/views/create.php
+++ b/framework/yii/gii/generators/crud/templates/views/create.php
@@ -15,18 +15,18 @@ use yii\helpers\Html;
/**
* @var yii\base\View $this
- * @var modelClass, '\\'); ?> $model
+ * @var modelClass, '\\') ?> $model
*/
-$this->title = 'Create modelClass)); ?>';
-$this->params['breadcrumbs'][] = ['label' => 'modelClass))); ?>', 'url' => ['index']];
+$this->title = 'Create modelClass)) ?>';
+$this->params['breadcrumbs'][] = ['label' => 'modelClass))) ?>', 'url' => ['index']];
$this->params['breadcrumbs'][] = $this->title;
?>
-
- echo Html::submitButton('Search', ['class' => 'btn btn-primary']); ?>
- echo Html::resetButton('Reset', ['class' => 'btn btn-default']); ?>
+ Html::submitButton('Search', ['class' => 'btn btn-primary']) ?>
+ Html::resetButton('Reset', ['class' => 'btn btn-default']) ?>
- ActiveForm::end(); ?>
+ ActiveForm::end(); ?>
+
-
echo Html::encode($this->title); ?>
+Html::encode($this->title) ?>
- echo $this->render('_form', [ + echo $this->render('_form', [ 'model' => $model, ]); ?> diff --git a/framework/yii/gii/generators/crud/templates/views/index.php b/framework/yii/gii/generators/crud/templates/views/index.php index c440e34..d3cebcc 100644 --- a/framework/yii/gii/generators/crud/templates/views/index.php +++ b/framework/yii/gii/generators/crud/templates/views/index.php @@ -15,29 +15,29 @@ echo " use yii\helpers\Html; -use indexWidgetType === 'grid' ? 'yii\grid\GridView' : 'yii\widgets\ListView'; ?>; +use indexWidgetType === 'grid' ? "yii\grid\GridView" : "yii\widgets\ListView" ?>; /** * @var yii\base\View $this * @var yii\data\ActiveDataProvider $dataProvider - * @var searchModelClass, '\\'); ?> $searchModel + * @var searchModelClass, '\\') ?> $searchModel */ -$this->title = 'modelClass))); ?>'; +$this->title = 'modelClass))) ?>'; $this->params['breadcrumbs'][] = $this->title; ?> -
+
-
echo Html::encode($this->title); ?>
+Html::encode($this->title) ?>
- indexWidgetType === 'grid' ? ' //' : ''); ?> echo $this->render('_search', ['model' => $searchModel]); ?> + indexWidgetType === 'grid' ? "// " : "") ?>echo $this->render('_search', ['model' => $searchModel]); ?>- echo Html::a('Create modelClass); ?>', ['create'], ['class' => 'btn btn-success']); ?> + Html::a('Create modelClass) ?>', ['create'], ['class' => 'btn btn-success']) ?>
indexWidgetType === 'grid'): ?> - echo GridView::widget([ + echo GridView::widget([ 'dataProvider' => $dataProvider, 'filterModel' => $searchModel, 'columns' => [ @@ -48,9 +48,9 @@ $count = 0; foreach ($generator->getTableSchema()->columns as $column) { $format = $generator->generateColumnFormat($column); if (++$count < 6) { - echo "\t\t\t'" . $column->name . ($format === 'text' ? '' : ':' . $format) . "',\n"; + echo "\t\t\t'" . $column->name . ($format === 'text' ? "" : ":" . $format) . "',\n"; } else { - echo "\t\t\t// '" . $column->name . ($format === 'text' ? '' : ':' . $format) . "',\n"; + echo "\t\t\t// '" . $column->name . ($format === 'text' ? "" : ":" . $format) . "',\n"; } } ?> @@ -59,11 +59,11 @@ foreach ($generator->getTableSchema()->columns as $column) { ], ]); ?> - echo ListView::widget([ + echo ListView::widget([ 'dataProvider' => $dataProvider, 'itemOptions' => ['class' => 'item'], 'itemView' => function ($model, $key, $index, $widget) { - return Html::a(Html::encode($model->), ['view', ]); + return Html::a(Html::encode($model->), ['view', ]); }, ]); ?> diff --git a/framework/yii/gii/generators/crud/templates/views/update.php b/framework/yii/gii/generators/crud/templates/views/update.php index 0b881ec..903a880 100644 --- a/framework/yii/gii/generators/crud/templates/views/update.php +++ b/framework/yii/gii/generators/crud/templates/views/update.php @@ -17,19 +17,19 @@ use yii\helpers\Html; /** * @var yii\base\View $this - * @var modelClass, '\\'); ?> $model + * @var modelClass, '\\') ?> $model */ -$this->title = 'Update modelClass)); ?>: ' . $model->getNameAttribute(); ?>; -$this->params['breadcrumbs'][] = ['label' => 'modelClass))); ?>', 'url' => ['index']]; -$this->params['breadcrumbs'][] = ['label' => $model->getNameAttribute(); ?>, 'url' => ['view', ]]; +$this->title = 'Update modelClass)) ?>: ' . $model->getNameAttribute() ?>; +$this->params['breadcrumbs'][] = ['label' => 'modelClass))) ?>', 'url' => ['index']]; +$this->params['breadcrumbs'][] = ['label' => $model->getNameAttribute() ?>, 'url' => ['view', ]]; $this->params['breadcrumbs'][] = 'Update'; ?> -
+
-
echo Html::encode($this->title); ?>
+Html::encode($this->title) ?>
- echo $this->render('_form', [ + echo $this->render('_form', [ 'model' => $model, ]); ?> diff --git a/framework/yii/gii/generators/crud/templates/views/view.php b/framework/yii/gii/generators/crud/templates/views/view.php index 9e8f28d..a15a7b6 100644 --- a/framework/yii/gii/generators/crud/templates/views/view.php +++ b/framework/yii/gii/generators/crud/templates/views/view.php @@ -18,33 +18,33 @@ use yii\widgets\DetailView; /** * @var yii\base\View $this - * @var modelClass, '\\'); ?> $model + * @var modelClass, '\\') ?> $model */ -$this->title = $model->getNameAttribute(); ?>; -$this->params['breadcrumbs'][] = ['label' => 'modelClass))); ?>', 'url' => ['index']]; +$this->title = $model->getNameAttribute() ?>; +$this->params['breadcrumbs'][] = ['label' => 'modelClass))) ?>', 'url' => ['index']]; $this->params['breadcrumbs'][] = $this->title; ?> -
+
-
+
- getRelativePath()), ['preview', 'file' => $file->id], ['class' => 'preview-code', 'data-title' => $file->getRelativePath()]); ?>
+ getRelativePath()), ['preview', 'file' => $file->id], ['class' => 'preview-code', 'data-title' => $file->getRelativePath()]) ?>
operation === CodeFile::OP_OVERWRITE): ?>
- $file->id], ['class' => 'diff-code label label-warning', 'data-title' => $file->getRelativePath()]); ?>
+ $file->id], ['class' => 'diff-code label label-warning', 'data-title' => $file->getRelativePath()]) ?>
diff --git a/framework/yii/gii/views/default/view/results.php b/framework/yii/gii/views/default/view/results.php
index 5ecb4e1..b37543f 100644
--- a/framework/yii/gii/views/default/view/results.php
+++ b/framework/yii/gii/views/default/view/results.php
@@ -18,5 +18,5 @@ use yii\gii\CodeFile;
echo '<?=Html::encode($this->title); ?>
+ <?= Html::encode($this->title) ?>
head(); ?>
@@ -37,13 +37,13 @@ NavBar::end();
?>
echo Html::encode($this->title); ?>
+Html::encode($this->title) ?>
- echo Html::a('Update', ['update', ], ['class' => 'btn btn-primary']); ?> - echo Html::a('Delete', ['delete', ], [ + Html::a('Update', ['update', ], ['class' => 'btn btn-primary']) ?> + echo Html::a('Delete', ['delete', ], [ 'class' => 'btn btn-danger', 'data-confirm' => Yii::t('app', 'Are you sure to delete this item?'), 'data-method' => 'post', ]); ?>
- echo DetailView::widget([ + echo DetailView::widget([ 'model' => $model, 'attributes' => [ getTableSchema()->columns as $column) { $format = $generator->generateColumnFormat($column); - echo "\t\t\t'" . $column->name . ($format === 'text' ? '' : ':' . $format) . "',\n"; + echo "\t\t\t'" . $column->name . ($format === 'text' ? "" : ":" . $format) . "',\n"; } ?> ], diff --git a/framework/yii/gii/generators/form/templates/action.php b/framework/yii/gii/generators/form/templates/action.php index 184c60f..6b084f4 100644 --- a/framework/yii/gii/generators/form/templates/action.php +++ b/framework/yii/gii/generators/form/templates/action.php @@ -12,9 +12,9 @@ use yii\helpers\Inflector; echo " -public function actionviewName), '_')); ?>() +public function actionviewName), '_')) ?>() { - $model = new modelClass; ?>scenarioName) ? '' : "(['scenario' => '{$generator->scenarioName}'])"; ?>; + $model = new modelClass ?>scenarioName) ? '' : "(['scenario' => '{$generator->scenarioName}'])" ?>; if ($model->load($_POST)) { if($model->validate()) { @@ -22,7 +22,7 @@ public function actionviewName) return; } } - return $this->render('viewName; ?>', [ + return $this->render('viewName ?>', [ 'model' => $model, ]); } diff --git a/framework/yii/gii/generators/form/templates/form.php b/framework/yii/gii/generators/form/templates/form.php index f365ebc..a448687 100644 --- a/framework/yii/gii/generators/form/templates/form.php +++ b/framework/yii/gii/generators/form/templates/form.php @@ -14,22 +14,22 @@ use yii\widgets\ActiveForm; /** * @var yii\base\View $this - * @var modelClass; ?> $model + * @var modelClass ?> $model * @var ActiveForm $form */ -"; ?> +" ?> -
+
diff --git a/framework/yii/gii/generators/model/templates/model.php b/framework/yii/gii/generators/model/templates/model.php
index b5fc4ad..b445425 100644
--- a/framework/yii/gii/generators/model/templates/model.php
+++ b/framework/yii/gii/generators/model/templates/model.php
@@ -15,29 +15,29 @@
echo "
-namespace ns; ?>;
+namespace ns ?>;
/**
- * This is the model class for table "".
+ * This is the model class for table "".
*
columns as $column): ?>
- * @property phpType} \${$column->name}\n"; ?>
+ * @property phpType} \${$column->name}\n" ?>
*
$relation): ?>
- * @property
+ * @property
*/
-class extends baseClass, '\\') . "\n"; ?>
+class extends baseClass, '\\') . "\n" ?>
{
/**
* @inheritdoc
*/
public static function tableName()
{
- return '';
+ return '';
}
/**
@@ -45,7 +45,7 @@ class extends baseClass, '\\') . "
*/
public function rules()
{
- return [];
+ return [];
}
/**
@@ -55,7 +55,7 @@ class extends baseClass, '\\') . "
{
return [
$label): ?>
- '" . addslashes($label) . "',\n"; ?>
+ '" . addslashes($label) . "',\n" ?>
];
}
@@ -64,9 +64,9 @@ class extends baseClass, '\\') . "
/**
* @return \yii\db\ActiveRelation
*/
- public function get()
+ public function get()
{
-
+
}
}
diff --git a/framework/yii/gii/generators/module/templates/controller.php b/framework/yii/gii/generators/module/templates/controller.php
index d5e92d6..2b24e0e 100644
--- a/framework/yii/gii/generators/module/templates/controller.php
+++ b/framework/yii/gii/generators/module/templates/controller.php
@@ -8,7 +8,7 @@
echo "
-namespace getControllerNamespace(); ?>;
+namespace getControllerNamespace() ?>;
use yii\web\Controller;
diff --git a/framework/yii/gii/generators/module/templates/module.php b/framework/yii/gii/generators/module/templates/module.php
index b22469c..ef0c55a 100644
--- a/framework/yii/gii/generators/module/templates/module.php
+++ b/framework/yii/gii/generators/module/templates/module.php
@@ -13,12 +13,12 @@ $className = substr($className, $pos + 1);
echo "
-namespace ;
+namespace ;
-class extends \yii\base\Module
+class extends \yii\base\Module
{
- public $controllerNamespace = 'getControllerNamespace(); ?>';
+ public $controllerNamespace = 'getControllerNamespace() ?>';
public function init()
{
diff --git a/framework/yii/gii/generators/module/templates/view.php b/framework/yii/gii/generators/module/templates/view.php
index 9ca15c1..311134d 100644
--- a/framework/yii/gii/generators/module/templates/view.php
+++ b/framework/yii/gii/generators/module/templates/view.php
@@ -4,15 +4,15 @@
* @var yii\gii\generators\module\Generator $generator
*/
?>
-
- $form = ActiveForm::begin(); ?>
+ $form = ActiveForm::begin(); ?>
getModelAttributes() as $attribute): ?>
- echo $form->field($model, ''); ?>
+ echo $form->field($model, ''); ?>
+
- echo Html::submitButton('Submit', ['class' => 'btn btn-primary']); ?>
+ echo Html::submitButton('Submit', ['class' => 'btn btn-primary']); ?>
- ActiveForm::end(); ?>
+ ActiveForm::end(); ?>
-
-
diff --git a/framework/yii/gii/views/default/index.php b/framework/yii/gii/views/default/index.php
index 26ba583..011a44b 100644
--- a/framework/yii/gii/views/default/index.php
+++ b/framework/yii/gii/views/default/index.php
@@ -21,9 +21,9 @@ $this->title = 'Welcome to Gii';
echo $this->context->action->uniqueId; ?>
+
+
diff --git a/framework/yii/gii/views/default/diff.php b/framework/yii/gii/views/default/diff.php
index d01d0f2..6766528 100644
--- a/framework/yii/gii/views/default/diff.php
+++ b/framework/yii/gii/views/default/diff.php
@@ -10,6 +10,6 @@
echo $this->context->action->uniqueId; ?>
- This is the view content for action " echo $this->context->action->id; ?>". - The action belongs to the controller " echo get_class($this->context); ?>" - in the " echo $this->context->module->id; ?>" module. + This is the view content for action " echo $this->context->action->id; ?>". + The action belongs to the controller " echo get_class($this->context); ?>" + in the " echo $this->context->module->id; ?>" module.
You may customize this page by editing the following file:
- echo __FILE__; ?>
+ echo __FILE__; ?>
Identical.
-
+
$generator): ?>
diff --git a/framework/yii/gii/views/default/view.php b/framework/yii/gii/views/default/view.php
index 7899275..1ef5c77 100644
--- a/framework/yii/gii/views/default/view.php
+++ b/framework/yii/gii/views/default/view.php
@@ -24,9 +24,9 @@ foreach ($generator->templates as $name => $path) {
}
?>
-
getName()); ?>
-getDescription(); ?>
-$id], ['class' => 'btn btn-default']); ?>
+getName()) ?>
+getDescription() ?>
+$id], ['class' => 'btn btn-default']) ?>
-
diff --git a/framework/yii/gii/views/default/view/files.php b/framework/yii/gii/views/default/view/files.php
index dae0274..0cc12dd 100644
--- a/framework/yii/gii/views/default/view/files.php
+++ b/framework/yii/gii/views/default/view/files.php
@@ -33,11 +33,11 @@ use yii\gii\CodeFile;
- title); ?>
+title) ?>
-getDescription(); ?>
+getDescription() ?>
"$id-generator", @@ -45,10 +45,10 @@ foreach ($generator->templates as $name => $path) { Please select which set of the templates should be used to generated the code. '); ?>
- 'preview', 'class' => 'btn btn-primary']); ?>
+ 'preview', 'class' => 'btn btn-primary']) ?>
- 'generate', 'class' => 'btn btn-success']); ?>
+ 'generate', 'class' => 'btn btn-success']) ?>
' . $generator->successMessage() . '
';
}
?>
-
+
diff --git a/framework/yii/gii/views/layouts/generator.php b/framework/yii/gii/views/layouts/generator.php
index 7d51e65..bdc032e 100644
--- a/framework/yii/gii/views/layouts/generator.php
+++ b/framework/yii/gii/views/layouts/generator.php
@@ -25,7 +25,7 @@ $activeGenerator = Yii::$app->controller->generator;
-
+
endContent(); ?>
diff --git a/framework/yii/gii/views/layouts/main.php b/framework/yii/gii/views/layouts/main.php
index 1d6c2f4..f648999 100644
--- a/framework/yii/gii/views/layouts/main.php
+++ b/framework/yii/gii/views/layouts/main.php
@@ -14,7 +14,7 @@ $asset = yii\gii\GiiAsset::register($this);
-
-
+
diff --git a/framework/yii/requirements/views/web/index.php b/framework/yii/requirements/views/web/index.php
index a609705..82e3fdb 100644
--- a/framework/yii/requirements/views/web/index.php
+++ b/framework/yii/requirements/views/web/index.php
@@ -52,18 +52,18 @@
| Name | Result | Required By | Memo |
|---|---|---|---|
| - + | - + | - + | - + |