Fixes #398, #397: Use strict mode when generating view folder name

.travis.yml

@@ -32,7 +32,7 @@ before_script:
     fi
 
 script:
-  - phpunit $PHPUNIT_FLAGS
+  - ./vendor/bin/phpunit $PHPUNIT_FLAGS
 
 after_script:
   - |

CHANGELOG.md

@@ -4,6 +4,7 @@ Yii Framework 2 gii extension Change Log
 2.1.0 under development
 -----------------------
 
+- Bug #398, #397: Use strict mode when generating view folder name (machour)
 - Enh #390, Bug #260: Create (bootstrap)-independent version (simialbi)
 - Enh #395: Made `yii\gii\CodeFile` indepdendent of controller context, do not apply `$newDirMode` and `$newFileMode` if module is not available (CeBe)
 

src/generators/crud/Generator.php

@@ -43,6 +43,11 @@ class Generator extends \yii\gii\Generator
      * @since 2.0.5
      */
     public $enablePjax = false;
+    /**
+     * @var bool whether to use strict inflection for controller IDs (insert a separator between two consecutive uppercase chars)
+     * @since 2.1.0
+     */
+    public $strictInflector = true;
 
 
     /**
@@ -195,7 +200,7 @@ public function getControllerID()
         $pos = strrpos($this->controllerClass, '\\');
         $class = substr(substr($this->controllerClass, $pos + 1), 0, -10);
 
-        return Inflector::camel2id($class);
+        return Inflector::camel2id($class, '-', $this->strictInflector);
     }
 
     /**

tests/generators/CrudGeneratorTest.php

@@ -39,4 +39,32 @@ public function testGenerateColumnFormat()
         $c = new ColumnSchema(['phpType' => 'string', 'type' => 'string', 'name' => 'url_lalala']);
         $this->assertEquals('url', $g->generateColumnFormat($c));
     }
-}
+
+    public function testGeneratedControllerId()
+    {
+        $g = new Generator();
+        $g->controllerClass = '\app\controllers\TestController';
+        $this->assertEquals('test', $g->getControllerID());
+
+        $g = new Generator();
+        $g->controllerClass = '\app\controllers\SomeTestController';
+        $this->assertEquals('some-test', $g->getControllerID());
+
+        $g = new Generator();
+        $g->controllerClass = '\app\controllers\ATestController';
+        $this->assertEquals('a-test', $g->getControllerID());
+
+        $g = new Generator();
+        $g->controllerClass = '\app\controllers\YoTestController';
+        $this->assertEquals('yo-test', $g->getControllerID());
+
+        $g = new Generator();
+        $g->controllerClass = '\app\controllers\ABCTestController';
+        $this->assertEquals('a-b-c-test', $g->getControllerID());
+
+        $g = new Generator();
+        $g->controllerClass = '\app\controllers\XYTestController';
+        $this->assertEquals('x-y-test', $g->getControllerID());
+    }
+
+}