Merge pull request #22 from ashutoshwebkul/dev

fixed controller create error and added router name option
webkul · Dec 20, 2019 · 1b895bf · 1b895bf
2 parents 138ceea + 070aef7
commit 1b895bf
Show file tree

Hide file tree

Showing 9 changed files with 27 additions and 29 deletions.
diff --git a/Model/Generate/Controller.php b/Model/Generate/Controller.php
@@ -129,10 +129,19 @@ private function createRoutesXmlFile($etcDirPath, $data)
         $controllerName = $data['name'];
         $module = $data['module'];
         $area = $data['area'];
+
         $xmlFilePath = $this->getRoutesXmlFilePath($etcDirPath);
         if ($this->fileDriver->isExists($xmlFilePath)) {
             return true;
         }
+
+        if (!isset($data['router']) || !$data['router']) {
+            throw new \RuntimeException(
+                __('Please provide router name')
+            );
+        }
+        $routeName = $data['router'];
+
         $xmlData = $this->helper->getTemplatesFiles('templates/routes.xml.dist');
         $this->helper->saveFile($xmlFilePath, $xmlData);
 
@@ -144,7 +153,7 @@ private function createRoutesXmlFile($etcDirPath, $data)
             );
         }
         $routesId = $area == 'adminhtml' ? 'admin' : 'standard';
-        $routeName = strtolower($this->helper->getClassName($controllerName));
+        // $routeName = strtolower($this->helper->getClassName($controllerName));
         $routerNode = $this->xmlGenerator->addXmlNode(
             $routesXml,
             'router',

diff --git a/Model/Generate/Controller/Validator.php b/Model/Generate/Controller/Validator.php
@@ -47,6 +47,11 @@ public function validate($data)
 
         $modulePath = $dir->getDir($module);
         $response["path"] = $modulePath;
+        if (isset($data['router'])) {
+            $response['router'] = $data['router'];
+        }
+
+        $response["module_path"] = $modulePath;
         if ($area == 'frontend') {
             $response["path"] = $modulePath.DIRECTORY_SEPARATOR.'Controller';
         } else {

diff --git a/Model/OptionsPool.php b/Model/OptionsPool.php
@@ -86,6 +86,13 @@ public function getOptions()
                 'enter area frontend or adminhtml'
             ),
 
+            new InputOption(
+                'router',
+                'r',
+                InputArgument::OPTIONAL,
+                'enter router name'
+            ),
+
             //plugin specific
             new InputOption(
                 'plugin',

diff --git a/README.md b/README.md
@@ -24,7 +24,7 @@ If you have created the db_schema file for the table in the above command, it wi
 
 - To create controller
 
-``` php bin/magento generate:code Module_Name --type=controller --name=ControllerName --area=frontend|adminhtml --path=RelativeToModuleControolerFolder ```
+``` php bin/magento generate:code Module_Name --type=controller --name=ControllerName --area=frontend|adminhtml --path=RelativeToModuleControolerFolder --router=RouteName ```
 
 - To create helper
 

diff --git a/composer.json b/composer.json
@@ -2,7 +2,7 @@
     "name": "webkul/code-generator",
     "description": "module lets you generate models, controller, helpers in seconds so that you can focus more on application logic ",
     "type": "magento2-module",
-    "version": "2.0.3",
+    "version": "2.0.4",
     "license": [
         "proprietary"
     ],

diff --git a/templates/config.xml.dist b/templates/config.xml.dist
@@ -1,12 +1,5 @@
 <?xml version="1.0"?>
-<!--
-/**
- * Webkul Software.
- *
- * @package   Webkul_CodeGenerator
- * @author    Mahesh Singh
- */
--->
+
 <config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:module:Magento_Store:etc/config.xsd">
     <default>
     </default>

diff --git a/templates/routes.xml.dist b/templates/routes.xml.dist
@@ -1,10 +1,3 @@
 <?xml version="1.0"?>
-<!-- /**
-/**
- * Webkul Software.
- *
- * @package   Webkul_CodeGenerator
- * @author    Mahesh Singh
- */ -->
 <config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:framework:App/etc/routes.xsd">
 </config>
diff --git a/templates/shipping/offline_shipping.php.dist b/templates/shipping/offline_shipping.php.dist
@@ -1,9 +1,5 @@
 <?php
-/**
- * shipping model
- *
- * @author Mahesh Singh
- */
+
 namespace %namespace%;
 
 use Magento\Quote\Model\Quote\Address\RateRequest;

diff --git a/templates/system.xml.dist b/templates/system.xml.dist
@@ -1,10 +1,5 @@
 <?xml version="1.0"?>
-<!--
-/**
- * Copyright © Magento, Inc. All rights reserved.
- * See COPYING.txt for license details.
- */
--->
+
 <config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:module:Magento_Config:etc/system_file.xsd">
     <system>
     </system>