revert

Author: Insolita

composer.json

@@ -24,7 +24,7 @@
 		"yiisoft/yii2-gii": "~2.0.0 | ~2.1.0 | ~2.2.0",
 		"fzaninotto/faker": "^1.8",
 		"laminas/laminas-code": "^3.4",
-		"insolita/yii2-fractal": "^2.0.0"
+		"insolita/yii2-fractal": "^1.0.0"
 	},
 	"require-dev": {
 		"cebe/indent": "*",

src/generator/default/controller_jsonapi.php

@@ -14,7 +14,6 @@
 namespace <?= $namespace ?>;
 
 use insolita\fractal\JsonApiController;
-use insolita\fractal\actions\JsonApiAction;
 use Yii;
 
 abstract class <?= $className ?> extends JsonApiController
@@ -40,12 +39,12 @@ public function actions()
      * to run the specified action against the specified data model.
      * If the user does not have access, a [[ForbiddenHttpException]] should be thrown.
      *
-     * @param JsonApiAction $action the ID of the action to be executed
+     * @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(JsonApiAction $action, $model = null, $params = []);
+    abstract public function checkAccess($action, $model = null, $params = []);
 <?php foreach ($actions as $action): ?>
 <?php if (!$action->shouldUseTemplate()):?>
 <?php if (!$action->shouldBeAbstract()):?>

src/lib/action_templates/deleteResource.php

@@ -2,7 +2,7 @@
 /**@var \cebe\yii2openapi\lib\items\FractalAction $action */
 ?>
         $model = $this-><?=$action->findModelMethodName?>($<?=$action->idParam?>);
-        $this->checkAccess($action, $model);
+        $this->checkAccess('<?=$action->id?>', $model);
         if ($model->delete() === false) {
             throw new \yii\web\ServerErrorHttpException('Failed to delete the object for unknown reason.');
         }

src/lib/action_templates/updateResource.php

@@ -3,7 +3,7 @@
 ?>
         $model = $this-><?=$action->findModelMethodName?>($<?=$action->idParam?>);
         $model->scenario = 'default';
-        $this->checkAccess($action, $model);
+        $this->checkAccess('<?=$action->id?>', $model);
         $model->load(Yii::$app->getRequest()->getBodyParams()['data']['attributes'] ?? [], '');
         if ($model->save() === false && !$model->hasErrors()) {
             throw new \yii\web\ServerErrorHttpException('Failed to update the object for unknown reason.');

src/lib/action_templates/viewResource.php

@@ -3,7 +3,7 @@
 
 ?>
         $model = $this-><?=$action->findModelMethodName?>($<?=$action->idParam?>);
-        $this->checkAccess($action, $model);
+        $this->checkAccess('<?=$action->id?>', $model);
 <?php if ($action->transformerFqn):?>
         $transformer = Yii::createObject(['class'=>\<?=$action->transformerFqn?>::class]);
 <?php else:?>