fixing indent & comply PSR-2

src/generators/crud/Generator.php

@@ -392,8 +392,8 @@ class Generator extends \yii\gii\generators\crud\Generator
             FileHelper::createDirectory($tmpDir);
             $tmpFile = $tmpDir.'/'.md5($template);
             file_put_contents($tmpFile, $code);
-
-            shell_exec('..'.DIRECTORY_SEPARATOR.'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/view.php

@@ -10,17 +10,16 @@ use yii\helpers\StringHelper;
 
 /** @var \yii\db\ActiveRecord $model */
 /** @var $generator \schmunk42\giiant\generators\crud\Generator */
+
 ## TODO: move to generator (?); cleanup
 $model = new $generator->modelClass();
 $model->setScenario('crud');
 $safeAttributes = $model->safeAttributes();
-if (empty($safeAttributes))
-{
+if (empty($safeAttributes)) {
     $model->setScenario('default');
     $safeAttributes = $model->safeAttributes();
 }
-if (empty($safeAttributes))
-{
+if (empty($safeAttributes)) {
     $safeAttributes = $model->getTableSchema()->columnNames;
 }
 
@@ -108,15 +107,11 @@ $this->params['breadcrumbs'][] = <?= $generator->generateString('View') ?>;
     'model' => $model,
     'attributes' => [
     <?php
-    foreach ($safeAttributes as $attribute)
-    {
+    foreach ($safeAttributes as $attribute) {
         $format = $generator->attributeFormat($attribute);
-        if (!$format)
-        {
+        if (!$format) {
             continue;
-        }
-        else
-        {
+        } else {
             echo $format.",\n";
         }
     }
@@ -128,11 +123,9 @@ $this->params['breadcrumbs'][] = <?= $generator->generateString('View') ?>;
 
     <hr/>
 
-        <?= '<?= ' ?>Html::a('<span class="glyphicon glyphicon-trash"></span> ' . <?=
-    $generator->generateString(
+    <?= '<?= ' ?>Html::a('<span class="glyphicon glyphicon-trash"></span> ' . <?= $generator->generateString(
         'Delete'
-    )
-    ?>, ['delete', <?= $urlParams ?>],
+    ) ?>, ['delete', <?= $urlParams ?>],
     [
     'class' => 'btn btn-danger',
     'data-confirm' => '' . <?= $generator->generateString('Are you sure to delete this item?') ?> . '',
@@ -141,10 +134,11 @@ $this->params['breadcrumbs'][] = <?= $generator->generateString('View') ?>;
     <?= "<?php \$this->endBlock(); ?>\n\n"; ?>
 
     <?php
+
     // get relation info $ prepare add button
     $model = new $generator->modelClass();
     $label = substr(strrchr($model::className(), '\\'), 1);
-$items = <<<EOS
+    $items = <<<EOS
 [
     'label'   => '<b class=""># '.\$model->{$model->primaryKey()[0]}.'</b>',
     'content' => \$this->blocks['{$label}'],
@@ -153,14 +147,12 @@ $items = <<<EOS
 
 EOS;
 
-    foreach ($generator->getModelRelations($generator->modelClass, ['has_many']) as $name => $relation)
-    {
+    foreach ($generator->getModelRelations($generator->modelClass, ['has_many']) as $name => $relation) {
         echo "\n<?php \$this->beginBlock('$name'); ?>\n";
 
         $showAllRecords = false;
 
-        if ($relation->via !== null)
-        {
+        if ($relation->via !== null) {
             $pivotName = Inflector::pluralize($generator->getModelByTableName($relation->via->from[0]));
             $pivotRelation = $model->{'get'.$pivotName}();
             $pivotPk = key($pivotRelation->link);
@@ -174,9 +166,7 @@ EOS;
                 )."'=>\$model->{$model->primaryKey()[0]}]],
             ['class'=>'btn btn-info btn-xs']
         ) ?>\n";
-        }
-        else
-        {
+        } else {
             $addButton = '';
         }
 
@@ -201,14 +191,11 @@ EOS;
 
         echo "</div>\n</div>\n"; #<div class='clearfix'></div>\n";
         // render pivot grid
-        if ($relation->via !== null)
-        {
+        if ($relation->via !== null) {
             $pjaxId = "pjax-{$pivotName}";
             $gridRelation = $pivotRelation;
             $gridName = $pivotName;
-        }
-        else
-        {
+        } else {
             $pjaxId = "pjax-{$name}";
             $gridRelation = $relation;
             $gridName = $name;
@@ -238,7 +225,7 @@ EOS;
     ?>
 
     <?=
-// render tabs
+    // render tabs
     "<?= Tabs::widget(
                  [
                      'id' => 'relation-tabs',
@@ -247,6 +234,6 @@ EOS;
                  ]
     );
     ?>";
-?>
+    ?>
 
 </div>