Merge pull request #177 from fredyns/master

enabling tidyOutput by default

src/generators/crud/Generator.php

@@ -119,9 +119,9 @@ class Generator extends \yii\gii\generators\crud\Generator
     public $overwriteSearchModelClass = false;
 
     /**
-     * @var array whether to use phptidy on renderer files before saving
+     * @var bool whether to use phptidy on renderer files before saving
      */
-    public $tidyOutput;
+    public $tidyOutput = true;
 
     /**
      * @var string form field for selecting and loading saved gii forms
@@ -393,8 +393,8 @@ class Generator extends \yii\gii\generators\crud\Generator
             FileHelper::createDirectory($tmpDir);
             $tmpFile = $tmpDir.'/'.md5($template);
             file_put_contents($tmpFile, $code);
-
-            shell_exec('vendor'.DIRECTORY_SEPARATOR.'bin'.DIRECTORY_SEPARATOR.'phptidy replace '.$tmpFile);
+            $command = Yii::getAlias('@vendor/bin/phptidy').' replace '.$tmpFile;
+            shell_exec($command);
 
             return file_get_contents($tmpFile);
         } else {

src/generators/crud/default/views/_form.php

@@ -82,7 +82,7 @@ use yii\helpers\StringHelper;
 
         $items = <<<EOS
 [
-    'label'   => Yii::t('$generator->modelMessageCategory', StringHelper::basename('{$model::className()}')),
+    'label'   => Yii::t('$generator->modelMessageCategory', '$label'),
     'content' => \$this->blocks['main'],
     'active'  => true,
 ],
@@ -93,8 +93,10 @@ EOS;
         "<?=
     Tabs::widget(
                  [
-                   'encodeLabels' => false,
-                     'items' => [ $items ]
+                    'encodeLabels' => false,
+                    'items' => [ 
+                        $items
+                    ]
                  ]
     );
     ?>";

src/generators/crud/default/views/create.php

@@ -31,10 +31,10 @@ $this->params['breadcrumbs'][] = $this->title;
 <div class="giiant-crud <?= Inflector::camel2id(StringHelper::basename($generator->modelClass), '-', true) ?>-create">
 
     <h1>
-        <?= "<?= Yii::t('{$generator->modelMessageCategory}', '{$modelName}') ?>" ?>
+        <?= "<?= Yii::t('{$generator->modelMessageCategory}', '{$modelName}') ?>\n" ?>
         <small>
             <?php $label = StringHelper::basename($generator->modelClass); ?>
-            <?= '<?= $model->'.$generator->getModelNameAttribute($generator->modelClass).' ?>' ?>
+            <?= '<?= $model->'.$generator->getModelNameAttribute($generator->modelClass)." ?>\n" ?>
         </small>
     </h1>
 

src/generators/crud/default/views/index.php

@@ -42,10 +42,8 @@ use <?= $generator->indexWidgetType === 'grid' ? $generator->indexGridClass : 'y
 <?php endif; ?>
 */
 
-<?php
-$this->title = Yii::t($generator->modelMessageCategory, $modelName);
+$this->title = Yii::t(<?= "'{$generator->modelMessageCategory}', '{$modelName}'" ?>);
 $this->params['breadcrumbs'][] = $this->title;
-?>
 
 <?php
 if($generator->accessFilter):
@@ -84,7 +82,7 @@ echo '?>';
 <div class="giiant-crud <?= Inflector::camel2id(StringHelper::basename($generator->modelClass), '-', true) ?>-index">
 
     <?=
-    '<?php '.($generator->indexWidgetType === 'grid' ? '// ' : '') ?>
+    "<?php\n".($generator->indexWidgetType === 'grid' ? '// ' : '') ?>
     <?php if ($generator->searchModelClass !== ''): ?>
         echo $this->render('_search', ['model' =>$searchModel]);
     <?php endif; ?>
@@ -95,7 +93,7 @@ echo '?>';
     <?= "<?php \yii\widgets\Pjax::begin(['id'=>'pjax-main', 'enableReplaceState'=> false, 'linkSelector'=>'#pjax-main ul.pagination a, th a', 'clientOptions' => ['pjax:success'=>'function(){alert(\"yo\")}']]) ?>\n"; ?>
 
     <h1>
-        <?= "<?= Yii::t('{$generator->modelMessageCategory}', '{$modelName}') ?>" ?>
+        <?= "<?= Yii::t('{$generator->modelMessageCategory}', '{$modelName}') ?>\n" ?>
         <small>
             List
         </small>
@@ -152,6 +150,7 @@ echo "?>\n"
                 'url' => ['{$route}'],
                 'label' => '<i class="glyphicon glyphicon-arrow-right">&nbsp;' . Yii::t('$generator->modelMessageCategory', '$label') . '</i>',
             ],
+                    
 PHP;
                 ?>
             <?php endforeach; ?>
@@ -169,14 +168,14 @@ PHP;
             'class' => 'dropdown-menu-right'
             ],
             'encodeLabels' => false,
-            'items' => [<?= $items ?>]
+            'items' => [<?= "\n".$items."\n" ?>]
             ],
             'options' => [
             'class' => 'btn-default'
             ]
             ]
             );
-            <?= '?>' ?>
+            <?= "?>\n" ?>
         </div>
     </div>
 
@@ -188,7 +187,7 @@ PHP;
         'pager' => [
         'class' => yii\widgets\LinkPager::className(),
         'firstPageLabel' => <?= $generator->generateString('First') ?>,
-        'lastPageLabel' => <?= $generator->generateString('Last') ?>
+        'lastPageLabel' => <?= $generator->generateString('Last').",\n" ?>
         ],
         <?php if ($generator->searchModelClass !== ''): ?>
             'filterModel' => $searchModel,
@@ -196,7 +195,6 @@ PHP;
         'tableOptions' => ['class' => 'table table-striped table-bordered table-hover'],
         'headerRowOptions' => ['class'=>'x'],
         'columns' => [
-
         <?php
         $actionButtonColumn = <<<PHP
         [

src/generators/crud/default/views/update.php

@@ -23,8 +23,8 @@ use yii\helpers\Html;
 * @var yii\web\View $this
 * @var <?= ltrim($generator->modelClass, '\\') ?> $model
 */
-
-$this->title = Yii::t('<?= $generator->modelMessageCategory ?>', '<?= $modelName ?>') . $model-><?= $generator->getNameAttribute(
+    
+$this->title = Yii::t('<?= $generator->modelMessageCategory ?>', '<?= $modelName ?>') . " " . $model-><?= $generator->getNameAttribute(
 ) ?> . ', ' . <?= $generator->generateString('Edit') ?>;
 $this->params['breadcrumbs'][] = ['label' => Yii::t('<?= $generator->modelMessageCategory ?>', '<?= $modelName ?>'), 'url' => ['index']];
 $this->params['breadcrumbs'][] = ['label' => (string)$model-><?= $generator->getNameAttribute(
@@ -38,7 +38,7 @@ $this->params['breadcrumbs'][] = <?= $generator->generateString('Edit') ?>;
 
         <small>
             <?php $label = StringHelper::basename($generator->modelClass); ?>
-            <?= '<?= $model->'.$generator->getModelNameAttribute($generator->modelClass).' ?>' ?>
+            <?= '<?= $model->'.$generator->getModelNameAttribute($generator->modelClass)." ?>\n" ?>
         </small>
     </h1>
 

src/generators/crud/default/views/view.php

@@ -44,7 +44,7 @@ use dmstr\bootstrap\Tabs;
 $copyParams = $model->attributes;
 
 $this->title = Yii::t('<?= $generator->modelMessageCategory ?>', '<?= $modelName ?>');
-$this->params['breadcrumbs'][] = ['label' => Yii::t('<?= $generator->modelMessageCategory ?>', '<?=Inflector::pluralize($modelName) ?>'), 'url' => ['index']];
+$this->params['breadcrumbs'][] = ['label' => Yii::t('<?= $generator->modelMessageCategory ?>', '<?= Inflector::pluralize($modelName) ?>'), 'url' => ['index']];
 $this->params['breadcrumbs'][] = ['label' => (string)$model-><?= $generator->getNameAttribute() ?>, 'url' => ['view', <?= $urlParams ?>]];
 $this->params['breadcrumbs'][] = <?= $generator->generateString('View') ?>;
 ?>
@@ -61,9 +61,9 @@ $this->params['breadcrumbs'][] = <?= $generator->generateString('View') ?>;
 
 
     <h1>
-        <?= "<?= Yii::t('{$generator->modelMessageCategory}', '{$modelName}') ?>" ?>
+        <?= "<?= Yii::t('{$generator->modelMessageCategory}', '{$modelName}') ?>\n" ?>
         <small>
-            <?= '<?= $model->'.$generator->getModelNameAttribute($generator->modelClass).' ?>' ?>
+            <?= '<?= $model->'.$generator->getModelNameAttribute($generator->modelClass)." ?>\n" ?>
         </small>
     </h1>
 
@@ -144,6 +144,7 @@ $this->params['breadcrumbs'][] = <?= $generator->generateString('View') ?>;
     'content' => \$this->blocks['{$generator->modelClass}'],
     'active'  => true,
 ],
+
 EOS;
 
     foreach ($generator->getModelRelations($generator->modelClass, ['has_many']) as $name => $relation) {
@@ -170,7 +171,7 @@ EOS;
         }
 
         // relation list, add, create buttons
-        echo "<div style='position: relative'><div style='position:absolute; right: 0px; top: 0px;'>\n";
+        echo "<div style='position: relative'>\n<div style='position:absolute; right: 0px; top: 0px;'>\n";
 
         echo "  <?= Html::a(
             '<span class=\"glyphicon glyphicon-list\"></span> ' . ".$generator->generateString('List All')." . ' ".
@@ -188,8 +189,7 @@ EOS;
         ); ?>\n";
         echo $addButton;
 
-        echo '</div></div>';#<div class='clearfix'></div>\n";
-
+        echo "</div>\n</div>\n"; #<div class='clearfix'></div>\n";
         // render pivot grid
         if ($relation->via !== null) {
             $pjaxId = "pjax-{$pivotName}";
@@ -206,8 +206,8 @@ EOS;
         // render relation grid
         if (!empty($output)):
             echo "<?php Pjax::begin(['id'=>'pjax-{$name}', 'enableReplaceState'=> false, 'linkSelector'=>'#pjax-{$name} ul.pagination a, th a', 'clientOptions' => ['pjax:success'=>'function(){alert(\"yo\")}']]) ?>\n";
-        echo '<?= '.$output."?>\n";
-        echo "<?php Pjax::end() ?>\n";
+            echo "<?=\n ".$output."\n?>\n";
+            echo "<?php Pjax::end() ?>\n";
         endif;
 
         echo "<?php \$this->endBlock() ?>\n\n";
@@ -219,7 +219,7 @@ EOS;
     'content' => \$this->blocks['$name'],
     'label'   => '<small>$label <span class="badge badge-default">'.count(\$model->get{$name}()->asArray()->all()).'</span></small>',
     'active'  => false,
-],
+],\n
 EOS;
     }
     ?>
@@ -230,7 +230,7 @@ EOS;
                  [
                      'id' => 'relation-tabs',
                      'encodeLabels' => false,
-                     'items' => [ $items ]
+                     'items' => [\n $items ]
                  ]
     );
     ?>";

src/generators/crud/providers/core/RelationProvider.php

@@ -324,20 +324,26 @@ EOS;
         $pageParam = Inflector::slug("page-{$name}");
         $firstPageLabel = $this->generator->generateString('First');
         $lastPageLabel = $this->generator->generateString('Last');
-        $code = '\'<div class="table-responsive">\' . ';
+        $code = "'<div class=\"table-responsive\">'\n . ";
         $code .= <<<EOS
 \\yii\\grid\\GridView::widget([
     'layout' => '{summary}{pager}<br/>{items}{pager}',
-    'dataProvider' => new \\yii\\data\\ActiveDataProvider([{$query}, 'pagination' => ['pageSize' => 20, 'pageParam'=>'{$pageParam}']]),
+    'dataProvider' => new \\yii\\data\\ActiveDataProvider([
+        {$query},
+        'pagination' => [
+            'pageSize' => 20,
+            'pageParam'=>'{$pageParam}',
+        ]
+    ]),
     'pager'        => [
         'class'          => yii\widgets\LinkPager::className(),
         'firstPageLabel' => {$firstPageLabel},
         'lastPageLabel'  => {$lastPageLabel}
     ],
-    'columns' => [$columns]
+    'columns' => [\n $columns]
 ])
 EOS;
-        $code .= ' . \'</div>\' ';
+        $code .= "\n . '</div>' ";
 
         return $code;
     }