Fix failing tests

Author: SOHELAHMED7

src/generator/ApiGenerator.php

@@ -7,10 +7,6 @@
 
 namespace cebe\yii2openapi\generator;
 
-use cebe\yii2openapi\lib\items\RestAction;
-use yii\db\mysql\Schema as MySqlSchema;
-use SamIT\Yii2\MariaDb\Schema as MariaDbSchema;
-use yii\db\pgsql\Schema as PgSqlSchema;
 use cebe\openapi\Reader;
 use cebe\openapi\spec\OpenApi;
 use cebe\yii2openapi\lib\Config;
@@ -21,9 +17,13 @@
 use cebe\yii2openapi\lib\generators\RestActionGenerator;
 use cebe\yii2openapi\lib\generators\TransformersGenerator;
 use cebe\yii2openapi\lib\generators\UrlRulesGenerator;
+use cebe\yii2openapi\lib\items\FractalAction;
+use cebe\yii2openapi\lib\items\RestAction;
 use cebe\yii2openapi\lib\PathAutoCompletion;
 use cebe\yii2openapi\lib\SchemaToDatabase;
 use Yii;
+use yii\db\mysql\Schema as MySqlSchema;
+use yii\db\pgsql\Schema as PgSqlSchema;
 use yii\gii\CodeFile;
 use yii\gii\Generator;
 use yii\helpers\Html;
@@ -525,21 +525,23 @@ public static function isMariaDb():bool
     }
 
     /**
-     * @param RestAction[] $actions
-     * @return RestAction[]
+     * @param RestAction[]|FractalAction[] $actions
+     * @return RestAction[]|FractalAction[]
      * https://github.com/cebe/yii2-openapi/issues/84
      */
     public static function removeDuplicateActions(array $actions): array
     {
-        $actions = array_filter($actions, function (RestAction $action) {
-            if ($action->isDuplicate) {
+        $actions = array_filter($actions, function ($action) {
+            /** @var $action RestAction|FractalAction */
+            if ($action instanceof RestAction && $action->isDuplicate) {
                 return false;
             }
             return true;
         });
 
-        $actions = array_map(function (RestAction $action) {
-            if ($action->isOriginalForCustomRoute) {
+        $actions = array_map(function ($action) {
+            /** @var $action RestAction|FractalAction */
+            if ($action instanceof RestAction && $action->isOriginalForCustomRoute) {
                 $action->idParam = null;
                 $action->params = [];
             }

src/lib/generators/RestActionGenerator.php

@@ -77,19 +77,18 @@ protected function resolvePath(string $path, PathItem $pathItem):array
             if (isset($operation->{CustomSpecAttr::ROUTE})) { # https://github.com/cebe/yii2-openapi/issues/144
                 $customRoute = $operation->{CustomSpecAttr::ROUTE};
             }
-            if ($customRoute === null) {
-                $actions[] = $this->prepareAction($method, $operation, $routeData, $customRoute);
-            } else {
-                // TODO rename
-                $actionHere = $this->prepareAction($method, $operation, $routeData, $customRoute);
-                $actionHere->isOriginalForCustomRoute = true;
-                if (!in_array($customRoute, $this->allCustomRoutes)) {
-                    $actionHere->isOriginalForCustomRoute = false;
+
+            // TODO rename
+            $actionHere = $this->prepareAction($method, $operation, $routeData, $customRoute);
+            if ($customRoute !== null) {
+                if (in_array($customRoute, $this->allCustomRoutes)) {
                     $actionHere->isDuplicate = true;
+                } else {
+                    $actionHere->isDuplicate = false;
                     $this->allCustomRoutes[] = $customRoute;
                 }
-                $actions[] = $actionHere;
             }
+            $actions[] = $actionHere;
         }
         return $actions;
     }

tests/specs/issue_fix/144_methods_naming_for_non_crud_actions/app/controllers/base/AbcController.php

@@ -29,6 +29,4 @@ abstract public function checkAccess($action, $model = null, $params = []);
 
     abstract public function actionXyz();
 
-    abstract public function actionXyz();
-
 }