Merge commit '1dbc6ede1e69d0a1d5064f8826fa2f2961d93b23' into feature/…

…gabo

# Conflicts:
#	src/generators/crud/default/views/view.php - FIXED -

CHANGELOG.md

@@ -5,6 +5,7 @@ Changelog
 
 - do not use auto-pluralization in views, pluralize via I18N
 - Improved model generation performance (see`modelCacheRelationsData`)
+- updated php-cs-fixer to version 3
 
 ### 0.13.0
 

composer.json

@@ -17,7 +17,7 @@
         "dmstr/yii2-bootstrap": "^0.1.2 || ^0.2.1",
         "dmstr/yii2-helpers": "*",
         "dmstr/yii2-db": "*",
-        "friendsofphp/php-cs-fixer": "1.* || 2.*",
+        "friendsofphp/php-cs-fixer": "1.* || 2.* || 3.*",
         "yiisoft/yii2": "~2.0.13",
         "yiisoft/yii2-gii": "^2.2.0"
     },

src/commands/BatchController.php

@@ -259,6 +259,11 @@ class BatchController extends Controller
 
     public $crudActionButtonColumnPosition = 'left';
 
+    /**
+     * @var string Class name of the model generator
+     */
+    public $modelGeneratorClass = 'schmunk42\giiant\generators\model\Generator';
+
     /**
      * @var bool indicates whether to generate ActiveQuery for the ActiveRecord class
      */
@@ -390,7 +395,7 @@ public function beforeAction($action)
     {
         $this->appConfig = $this->getYiiConfiguration();
         $this->appConfig['id'] = 'temp';
-        $this->modelGenerator = new ModelGenerator(['db' => $this->modelDb]);
+        $this->modelGenerator = Yii::createObject($this->modelGeneratorClass, ['db' => $this->modelDb]);
 
         if ($this->tables && $this->skipTables) {
             $this->stderr("Only one property of 'tables' or 'skipTables' can be set." . PHP_EOL);

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

@@ -40,9 +40,9 @@
 */
 $copyParams = $model->attributes;
 
-$this->title = <?= $generator->generateString($modelName) ?>;
-$this->params['breadcrumbs'][] = ['label' => <?= $generator->generateString($modelName) ?>, 'url' => ['index']];
-$this->params['breadcrumbs'][] = ['label' => (string)$model-><?= $generator->getNameAttribute() ?>, 'url' => ['view', <?= $urlParams ?>]];
+$this->title = Yii::t('<?= $generator->modelMessageCategory ?>', '<?= $modelName ?>');
+$this->params['breadcrumbs'][] = ['label' => Yii::t('<?= $generator->modelMessageCategory ?>.plural', '<?= $modelName ?>'), 'url' => ['index']];
+$this->params['breadcrumbs'][] = ['label' => (string)$model-><?= $generator->getModelNameAttribute($model)?>, 'url' => ['view', <?= $urlParams ?>]];
 $this->params['breadcrumbs'][] = <?= $generator->generateString('View') ?>;
 ?>
 <div class="giiant-crud <?= Inflector::camel2id(StringHelper::basename($generator->modelClass), '-', true) ?>-view">