Merge pull request #1054 from lucianobaraglia/master

GII - more short echo syntax

framework/yii/gii/generators/form/templates/action.php

@@ -14,7 +14,7 @@ echo "<?php\n";
 
 public function action<?= Inflector::id2camel(trim(basename($generator->viewName), '_')) ?>()
 {
-	$model = new <?= $generator->modelClass ?><?= empty($generator->scenarioName) ? '' : "(['scenario' => '{$generator->scenarioName}'])" ?>;
+	$model = new <?= $generator->modelClass ?><?= empty($generator->scenarioName) ? "" : "(['scenario' => '{$generator->scenarioName}'])" ?>;
 
 	if ($model->load($_POST)) {
 		if($model->validate()) {

framework/yii/gii/generators/form/templates/form.php

@@ -21,15 +21,15 @@ use yii\widgets\ActiveForm;
 
 <div class="<?= str_replace('/', '-', trim($generator->viewName, '_')) ?>">
 
-	<?= '<?php' ?> $form = ActiveForm::begin(); ?>
+	<?= "<?php " ?>$form = ActiveForm::begin(); ?>
 
 	<?php foreach ($generator->getModelAttributes() as $attribute): ?>
-	<?= '<?php' ?> echo $form->field($model, '<?= $attribute ?>'); ?>
+	<?= "<?= " ?>$form->field($model, '<?= $attribute ?>') ?>
 	<?php endforeach; ?>
 
 		<div class="form-group">
-			<?= '<?php' ?> echo Html::submitButton('Submit', ['class' => 'btn btn-primary']); ?>
+			<?= "<?= " ?>Html::submitButton('Submit', ['class' => 'btn btn-primary']) ?>
 		</div>
-	<?= '<?php' ?> ActiveForm::end(); ?>
+	<?= "<?php " ?>ActiveForm::end(); ?>
 
 </div><!-- <?= str_replace('/', '-', trim($generator->viewName, '-')) ?> -->

framework/yii/gii/generators/module/templates/view.php

@@ -5,14 +5,14 @@
  */
 ?>
 <div class="<?= $generator->moduleID . '-default-index' ?>">
-	<h1><?= "<?php" ?> echo $this->context->action->uniqueId; ?></h1>
+	<h1><?= "<?= " ?>$this->context->action->uniqueId ?></h1>
 	<p>
-		This is the view content for action "<?= "<?php" ?> echo $this->context->action->id; ?>".
-		The action belongs to the controller "<?= "<?php" ?> echo get_class($this->context); ?>"
-		in the "<?= "<?php" ?> echo $this->context->module->id; ?>" module.
+		This is the view content for action "<?= "<?= " ?>$this->context->action->id ?>".
+		The action belongs to the controller "<?= "<?= " ?>get_class($this->context) ?>"
+		in the "<?= "<?= " ?>$this->context->module->id ?>" module.
 	</p>
 	<p>
 		You may customize this page by editing the following file:<br>
-		<code><?= "<?php" ?> echo __FILE__; ?></code>
+		<code><?= "<?= " ?>__FILE__ ?></code>
 	</p>
 </div>