Fix bug

Author: SOHELAHMED7

src/lib/generators/JsonActionGenerator.php

@@ -26,8 +26,12 @@ class JsonActionGenerator extends RestActionGenerator
      * @throws \yii\base\InvalidConfigException
      * @throws \cebe\openapi\exceptions\UnresolvableReferenceException
      */
-    protected function prepareAction(string $method, Operation $operation, RouteData $routeData, $customRoute = null):BaseObject
-    {
+    protected function prepareAction(
+        string    $method,
+        Operation $operation,
+        RouteData $routeData,
+        ?string   $customRoute = null
+    ): BaseObject {
         $actionType = $this->resolveActionType($routeData, $method);
         $modelClass = ResponseSchema::guessModelClass($operation, $actionType);
         $expectedRelations = in_array($actionType, ['list', 'view'])

src/lib/generators/RestActionGenerator.php

@@ -89,8 +89,12 @@ protected function resolvePath(string $path, PathItem $pathItem):array
      * @throws \cebe\openapi\exceptions\UnresolvableReferenceException
      * @throws \yii\base\InvalidConfigException
      */
-    protected function prepareAction(string $method, Operation $operation, RouteData $routeData, $customRoute = null):BaseObject
-    {
+    protected function prepareAction(
+        string    $method,
+        Operation $operation,
+        RouteData $routeData,
+        ?string   $customRoute = null
+    ): BaseObject {
         $actionType = $this->resolveActionType($routeData, $method);
         $modelClass = ResponseSchema::guessModelClass($operation, $actionType);
         $responseWrapper = ResponseSchema::findResponseWrapper($operation, $modelClass);

src/lib/items/RouteData.php

@@ -166,7 +166,6 @@ final class RouteData extends BaseObject
 
     public function __construct(PathItem $pathItem, string $path, array $urlPrefixes = [], $config = [])
     {
-        // TODO url rules config php file should have path but not the x-route
         $this->path = $this->unprefixedPath = $path;
         $this->parts = explode('/', trim($path, '/'));
         $this->pathItem = $pathItem;

tests/specs/issue_fix/144_methods_naming_for_non_crud_actions/index.yaml

@@ -11,6 +11,49 @@ tags:
       description: Find out more
       url: https://developer.adiuta.com/book/payments
 paths:
+  /fruit/mango:
+    get:
+      x-route: fruits/mango
+      operationId: opnid9
+      summary: Lorem ipsum
+      description: Lorem ipsum description
+      responses:
+        '200':
+          description: The Response
+
+
+  /fruits/mango:
+    get:
+      operationId: opnid8
+      summary: Lorem ipsum
+      description: Lorem ipsum description
+      responses:
+        '200':
+          description: The Response
+    post:
+      operationId: opnid9
+      summary: Lorem ipsum
+      description: Lorem ipsum description
+      responses:
+        '200':
+          description: The Response
+
+  /animal/goat:
+    get:
+      operationId: opnid8
+      summary: Lorem ipsum
+      description: Lorem ipsum description
+      responses:
+        '200':
+          description: The Response
+    post:
+      operationId: opnid9
+      summary: Lorem ipsum
+      description: Lorem ipsum description
+      responses:
+        '200':
+          description: The Response
+
   /payments/invoice/{invoice}:
     parameters:
       - name: invoice
@@ -66,8 +109,8 @@ paths:
           description: The Response
 
   /aa2/bb2:
-#    x-route: 'payment/xyz2'
     get:
+      x-route: 'payments/xyz2'
       operationId: opnid7
       summary: List
       description: Lists

tests/unit/IssueFixTest.php

@@ -349,10 +349,6 @@ public function test159BugGiiapiGeneratedRulesEmailid()
     // https://github.com/cebe/yii2-openapi/issues/158
     public function test158BugGiiapiGeneratedRulesEnumWithTrim()
     {
-        // TODO add more test case
-        // one new controller new action
-        // one new action in exiting controller
-
         $this->changeDbToMariadb();
         $testFile = Yii::getAlias("@specs/issue_fix/158_bug_giiapi_generated_rules_enum_with_trim/index.php");
         $this->runGenerator($testFile, 'maria');