Merge pull request #36 from VikasTiwari-Webkul/feature/compatible-with-m2.4.6

Feature: Compatible with Magento 2.4.6

Author: Ashutosh Srivastva

Console/Command/Generate.php

@@ -51,6 +51,7 @@ protected function configure()
             );
         parent::configure();
     }
+
     /**
      * {@inheritdoc}
      */
@@ -62,18 +63,21 @@ protected function execute(InputInterface $input, OutputInterface $output)
 
         if (isset($this->validators[$data['type']])) {
             $data = $this->validators[$data['type']]->validate($data);
-            $this->generate($data, $output);
+            if ($this->generate($data, $output)){
+                return 0;
+            }
         } else {
             throw new \InvalidArgumentException(__("invalid type"));
         }
+        exit;
     }
 
     /**
      * generate code
      *
      * @param [] $data
      * @param Output $output
-     * @return void
+     * @return bool
      */
     private function generate($data, $output)
     {
@@ -88,10 +92,12 @@ private function generate($data, $output)
                 $output->writeln("<error>====> ".$response['message'].'</error>');
             } else {
                 $output->writeln("<info>====> ".$response['message'].'</info>');
+                return true;
             }
         } catch (\Exception $e) {
             $output->writeln("<error>====> ".$e->getMessage().'</error>');
         }
+        return false;
     }
 }
 

Model/Generate/Command.php

@@ -22,7 +22,7 @@ class Command implements GenerateInterface
 {
     protected $helper;
 
-    protected $xmlGeneratorFactory;
+    protected $xmlGenerator;
 
     /**
      * Constructor

Model/Generate/Controller.php

@@ -20,9 +20,17 @@
  */
 class Controller implements GenerateInterface
 {
+    protected $helper;
+
+    /**
+     * @var \Magento\Framework\Filesystem\Driver\File
+     */
     protected $fileDriver;
 
-    protected $helper;
+    /**
+     * @var Webkul\CodeGenerator\Model\XmlGenerator
+     */
+    protected $xmlGenerator;
 
     public function __construct(
         CodeHelper $helper,
@@ -106,7 +114,9 @@ public function createAdminController($dir, $data)
         $nameArray = explode("_", $nameSpace);
         $nameSpace = implode("\\", $nameArray);
         $actionPath = explode("/", $pathParts[1]);
+
         $nameSpace = $nameSpace . "\\Controller\\Adminhtml\\" . implode("\\", $actionPath);
+
         $controllerFile = $this->helper->getTemplatesFiles('templates/controller/controller_admin.php.dist');
         $controllerFile = str_replace('%module_name%', $data['module'], $controllerFile);
         $controllerFile = str_replace('%class_name%', $fileName, $controllerFile);

Model/Generate/Cron.php

@@ -22,7 +22,7 @@ class Cron implements GenerateInterface
 {
     protected $helper;
 
-    protected $xmlGeneratorFactory;
+    protected $xmlGenerator;
 
     /**
      * Constructor

Model/Generate/Email.php

@@ -22,7 +22,7 @@ class Email implements GenerateInterface
 {
     protected $helper;
 
-    protected $xmlGeneratorFactory;
+    protected $xmlGenerator;
 
     /**
      * Constructor

Model/Generate/Logger.php

@@ -22,7 +22,7 @@ class Logger implements GenerateInterface
 {
     protected $helper;
 
-    protected $xmlGeneratorFactory;
+    protected $xmlGenerator;
 
     /**
      * Constructor

Model/Generate/NewModule.php

@@ -29,6 +29,17 @@ class NewModule implements GenerateInterface
 
     protected $helper;
 
+    /**
+     * @var \Magento\Framework\Module\Status
+     */
+    protected $moduleStatus;
+
+    /**
+     * Construct
+     *
+     * @param Helper $helper
+     * @param StatusFactory $moduleStatusFactory
+     */
     public function __construct(
         Helper $helper,
         StatusFactory $moduleStatusFactory

Model/Generate/Observer.php

@@ -19,7 +19,7 @@ class Observer implements GenerateInterface
 {
     protected $helper;
 
-    protected $xmlGeneratorFactory;
+    protected $xmlGenerator;
     /**
      * Constructor
      *

Model/Generate/Payment.php

@@ -27,6 +27,26 @@ class Payment implements GenerateInterface
 
     protected $helper;
 
+    /**
+     * @var \Magento\Framework\Filesystem\Driver\File
+     */
+    protected $fileDriver;
+
+    /**
+     * @var \Magento\Framework\Filesystem\Io\File
+     */
+    protected $file;
+
+    /**
+     * @var Json
+     */
+    protected $jsonHelper;
+
+    /**
+     * @var Webkul\CodeGenerator\Model\XmlGenerator
+     */
+    protected $xmlGenerator;
+
     /**
      * Default xml node attributes
      *

Model/Generate/Plugin.php

@@ -21,8 +21,11 @@
 class Plugin implements GenerateInterface
 {
     protected $helper;
-    
-    protected $xmlGeneratorFactory;
+
+    /**
+     * @var Webkul\CodeGenerator\Model\XmlGenerator
+     */
+    protected $xmlGenerator;
 
     /**
      * Constructor