Refactor + complete the test

Author: SOHELAHMED7

src/lib/items/ActionHelperTrait.php

@@ -9,15 +9,10 @@
 
 trait ActionHelperTrait
 {
-    /**
-     * @var ?string
-     */
-    public $xRoute;
+    public ?string $xRoute;
 
-    /**
-     * @var array list of module this action is part of. 'key' is module ID and 'value' is path where Module.php file must be generated
-     */
-    public $modulesList = [];
+    # list of module this action is part of. 'key' is module ID and 'value' is path where Module.php file must be generated
+    public array $modulesList = [];
 
     public function getOptionsRoute():string
     {

tests/specs/issue_fix/14_nested_module_in_x_route/mysql/config/urls.rest.php

@@ -0,0 +1,10 @@
+<?php
+/**
+ * OpenAPI UrlRules
+ *
+ * This file is auto generated.
+ */
+return [
+    'GET ' => 'fruit/mango/alphonso/view',
+    '' => 'fruit/alphonso/options',
+];

tests/specs/issue_fix/14_nested_module_in_x_route/mysql/modules/fruit/Module.php

@@ -0,0 +1,21 @@
+<?php
+
+namespace app\fruit;
+
+class Module extends \yii\base\Module
+{
+
+    public function init()
+    {
+        parent::init();
+        $this->modules = [
+            'mango' => [
+                // you should consider using a shorter namespace here!
+                'class' => \app\fruit\mango\Module::class,
+            ],
+        ];
+    }
+
+
+}
+

tests/specs/issue_fix/14_nested_module_in_x_route/mysql/modules/fruit/modules/mango/Module.php

@@ -0,0 +1,15 @@
+<?php
+
+namespace app\fruit\mango;
+
+class Module extends \yii\base\Module
+{
+
+    public function init()
+    {
+        parent::init();
+    }
+
+
+}
+

tests/specs/issue_fix/14_nested_module_in_x_route/mysql/modules/fruit/modules/mango/controllers/AlphonsoController.php

@@ -0,0 +1,20 @@
+<?php
+
+namespace app\fruit\mango\controllers;
+
+class AlphonsoController extends \app\fruit\mango\controllers\base\AlphonsoController
+{
+
+    public function checkAccess($action, $model = null, $params = [])
+    {
+        //TODO implement checkAccess
+    }
+
+    public function actionView()
+    {
+        //TODO implement actionView
+    }
+
+
+}
+

tests/specs/issue_fix/14_nested_module_in_x_route/mysql/modules/fruit/modules/mango/controllers/base/AlphonsoController.php

@@ -0,0 +1,32 @@
+<?php
+
+namespace app\fruit\mango\controllers\base;
+
+abstract class AlphonsoController extends \yii\rest\Controller
+{
+    public function actions()
+    {
+        return [
+            'options' => [
+                'class' => \yii\rest\OptionsAction::class,
+            ],
+        ];
+    }
+
+    /**
+     * Checks the privilege of the current user.
+     *
+     * This method checks whether the current user has the privilege
+     * to run the specified action against the specified data model.
+     * If the user does not have access, a [[ForbiddenHttpException]] should be thrown.
+     *
+     * @param string $action the ID of the action to be executed
+     * @param object $model the model to be accessed. If null, it means no specific model is being accessed.
+     * @param array $params additional parameters
+     * @throws \yii\web\ForbiddenHttpException if the user does not have access
+     */
+    abstract public function checkAccess($action, $model = null, $params = []);
+
+    abstract public function actionView();
+
+}

tests/unit/issues/Issue14Test.php

@@ -4,7 +4,6 @@
 
 use tests\DbTestCase;
 use Yii;
-use yii\base\InvalidArgumentException;
 use yii\helpers\FileHelper;
 
 # https://github.com/php-openapi/yii2-openapi/issues/14
@@ -14,12 +13,12 @@ public function testNestedModuleInXRoute()
     {
         $testFile = Yii::getAlias("@specs/issue_fix/14_nested_module_in_x_route/index.php");
         $this->runGenerator($testFile);
-        // $actualFiles = FileHelper::findFiles(Yii::getAlias('@app'), [
-        //     'recursive' => true,
-        // ]);
-        // $expectedFiles = FileHelper::findFiles(Yii::getAlias("@specs/issue_fix/14_nested_module_in_x_route/mysql"), [
-        //     'recursive' => true,
-        // ]);
-        // $this->checkFiles($actualFiles, $expectedFiles);
+        $actualFiles = FileHelper::findFiles(Yii::getAlias('@app'), [
+            'recursive' => true,
+        ]);
+        $expectedFiles = FileHelper::findFiles(Yii::getAlias("@specs/issue_fix/14_nested_module_in_x_route/mysql"), [
+            'recursive' => true,
+        ]);
+        $this->checkFiles($actualFiles, $expectedFiles);
     }
 }