Merge pull request #43 from SauravKumar-Webkul/master

webkul · web-flow · commit da33720e8592 · 2024-02-13T20:21:57.000+05:30
Fixed Area Code Issue
diff --git a/.vscode/launch.json b/.vscode/launch.json
diff --git a/Console/Command/Generate.php b/Console/Command/Generate.php
@@ -52,8 +52,6 @@ public function __construct(
         $this->validators = $validators;
         $this->optionsPool = \Magento\Framework\App\ObjectManager::getInstance()
         ->get(\Webkul\CodeGenerator\Model\OptionsPool::class);
-        $state = \Magento\Framework\App\ObjectManager::getInstance()->get(\Magento\Framework\App\State::class);
-        $state->setAreaCode("adminhtml");
         parent::__construct();
     }
 
diff --git a/Model/Generate/Model.php b/Model/Generate/Model.php
@@ -144,7 +144,7 @@ public function createApiClass($dir, $data, $columns)
                                 $column['type']
                             )]),
                             new Tag\ReturnTag([
-                                'datatype'  => $nameSpace.'\\'.$data['name'].'Interface',
+                                'datatype'  => '\\'.$nameSpace.'\\'.$data['name'].'Interface',
                             ]),
                         ],
                     ]),
@@ -299,7 +299,7 @@ public function createModelClass($dir, $data, $columns)
                     'tags'             => [
                         new Tag\ParamTag($camelCase, [$this->helper->getReturnType($column['type'])]),
                         new Tag\ReturnTag([
-                            'datatype'  => $nameSpace.'\\'.$data['name'].'Interface',
+                            'datatype'  => '\\'.$nameSpace.'\\'.$data['name'].'Interface',
                         ]),
                     ],
                 ]),
diff --git a/Model/Generate/NewModule.php b/Model/Generate/NewModule.php
@@ -3,7 +3,7 @@
  * Webkul Software.
  *
  * @package   Webkul_CodeGenerator
- * @author    Mahesh Singh
+ * @author    Webkul
  */
 
 namespace Webkul\CodeGenerator\Model\Generate;
diff --git a/Model/Generate/NewModule/Validator.php b/Model/Generate/NewModule/Validator.php
@@ -3,7 +3,7 @@
  * Webkul Software.
  *
  * @package   Webkul_CodeGenerator
- * @author    Mahesh Singh
+ * @author    Webkul
  */
 
 namespace Webkul\CodeGenerator\Model\Generate\NewModule;
diff --git a/Model/Generate/Shipping.php b/Model/Generate/Shipping.php
@@ -3,7 +3,7 @@
  * Webkul Software.
  *
  * @package   Webkul_CodeGenerator
- * @author    Mahesh Singh
+ * @author    Webkul
  */
 
 namespace Webkul\CodeGenerator\Model\Generate;
diff --git a/Model/Generate/Shipping/Validator.php b/Model/Generate/Shipping/Validator.php
@@ -3,7 +3,7 @@
  * Webkul Software.
  *
  * @package   Webkul_CodeGenerator
- * @author    Mahesh Singh
+ * @author    Webkul
  */
 
 namespace Webkul\CodeGenerator\Model\Generate\Shipping;
diff --git a/Model/Generate/View.php b/Model/Generate/View.php
@@ -3,7 +3,7 @@
  * Webkul Software.
  *
  * @package   Webkul_CodeGenerator
- * @author    Mahesh Singh
+ * @author    Webkul
  */
 
 namespace Webkul\CodeGenerator\Model\Generate;
diff --git a/Model/Generate/View/Validator.php b/Model/Generate/View/Validator.php
@@ -3,7 +3,7 @@
  * Webkul Software.
  *
  * @package   Webkul_CodeGenerator
- * @author    Mahesh Singh
+ * @author    Webkul
  */
 namespace Webkul\CodeGenerator\Model\Generate\View;
 
diff --git a/Model/XmlGenerator.php b/Model/XmlGenerator.php
@@ -3,7 +3,7 @@
  * Webkul Software.
  *
  * @package   Webkul_CodeGenerator
- * @author    Mahesh Singh
+ * @author    Webkul
  */
 
 namespace Webkul\CodeGenerator\Model;
diff --git a/templates/composer.json.dist b/templates/composer.json.dist
@@ -5,8 +5,7 @@
     "license": "proprietary",
     "authors": [
         {
-            "email": "mahesh721@webkul.com",
-            "name": "Mahesh Singh"
+            "name": "Webkul"
         }
     ],
     "require": {},
diff --git a/templates/module.xml.dist b/templates/module.xml.dist
@@ -11,5 +11,5 @@
  */
  -->
 <config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:framework:Module/etc/module.xsd">
-	<module name="%moduleName%" setup_version="1.0.0"/>
+	<module name="%moduleName%"/>
 </config>

Original file line number	Diff line number	Diff line change
`@@ -52,8 +52,6 @@ public function __construct(`
`52`	`52`	`$this->validators = $validators;`
`53`	`53`	`$this->optionsPool = \Magento\Framework\App\ObjectManager::getInstance()`
`54`	`54`	`->get(\Webkul\CodeGenerator\Model\OptionsPool::class);`
`55`		`- $state = \Magento\Framework\App\ObjectManager::getInstance()->get(\Magento\Framework\App\State::class);`
`56`		`- $state->setAreaCode("adminhtml");`
`57`	`55`	`parent::__construct();`
`58`	`56`	`}`
`59`	`57`
Original file line number	Diff line number	Diff line change
`@@ -3,7 +3,7 @@`
`3`	`3`	`* Webkul Software.`
`4`	`4`	`*`
`5`	`5`	`* @package Webkul_CodeGenerator`
`6`		`- * @author Mahesh Singh`
	`6`	`+ * @author Webkul`
`7`	`7`	`*/`
`8`	`8`
`9`	`9`	`namespace Webkul\CodeGenerator\Model\Generate;`
Original file line number	Diff line number	Diff line change
`@@ -5,8 +5,7 @@`
`5`	`5`	`"license": "proprietary",`
`6`	`6`	`"authors": [`
`7`	`7`	`{`
`8`		`- "email": "[email protected]",`
`9`		`- "name": "Mahesh Singh"`
	`8`	`+ "name": "Webkul"`
`10`	`9`	`}`
`11`	`10`	`],`
`12`	`11`	`"require": {},`