Skip to content

Commit e824afb

Browse files
committed
Fix another test
1 parent f60960c commit e824afb

File tree

18 files changed

+162
-32
lines changed

18 files changed

+162
-32
lines changed

tests/specs/issue_fix/35_resolve_todo_re_check_options_route_in_fractal_action/mysql/controllers/PetCommentController.php

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,12 @@
55
class PetCommentController extends \app\controllers\base\PetCommentController
66
{
77

8+
public function actions()
9+
{
10+
$actions = parent::actions();
11+
return $actions;
12+
}
13+
814
public function checkAccess($action, $model = null, $params = [])
915
{
1016
//TODO implement checkAccess

tests/specs/issue_fix/35_resolve_todo_re_check_options_route_in_fractal_action/mysql/controllers/PetController.php

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,12 @@
55
class PetController extends \app\controllers\base\PetController
66
{
77

8+
public function actions()
9+
{
10+
$actions = parent::actions();
11+
return $actions;
12+
}
13+
814
public function checkAccess($action, $model = null, $params = [])
915
{
1016
//TODO implement checkAccess

tests/specs/issue_fix/35_resolve_todo_re_check_options_route_in_fractal_action/mysql/controllers/base/PetCommentController.php

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,10 @@
11
<?php
2-
32
namespace app\controllers\base;
43

5-
abstract class PetCommentController extends \yii\rest\Controller
4+
use insolita\fractal\JsonApiController;
5+
use Yii;
6+
7+
abstract class PetCommentController extends JsonApiController
68
{
79
public function actions()
810
{
@@ -28,5 +30,4 @@ public function actions()
2830
abstract public function checkAccess($action, $model = null, $params = []);
2931

3032
abstract public function actionList();
31-
3233
}

tests/specs/issue_fix/35_resolve_todo_re_check_options_route_in_fractal_action/mysql/controllers/base/PetController.php

Lines changed: 20 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,26 +1,37 @@
11
<?php
2-
32
namespace app\controllers\base;
43

5-
abstract class PetController extends \yii\rest\Controller
4+
use insolita\fractal\JsonApiController;
5+
use Yii;
6+
7+
abstract class PetController extends JsonApiController
68
{
79
public function actions()
810
{
911
return [
1012
'view' => [
11-
'class' => \yii\rest\ViewAction::class,
12-
'modelClass' => \app\models\Pet::class,
13+
'class' => \insolita\fractal\actions\ViewAction::class,
1314
'checkAccess' => [$this, 'checkAccess'],
15+
'transformer' => \app\transformers\PetTransformer::class,
16+
'modelClass' => \app\models\Pet::class,
17+
'resourceKey' => 'pets',
18+
'findModel' => null
1419
],
1520
'delete' => [
16-
'class' => \yii\rest\DeleteAction::class,
17-
'modelClass' => \app\models\Pet::class,
21+
'class' => \insolita\fractal\actions\DeleteAction::class,
1822
'checkAccess' => [$this, 'checkAccess'],
19-
],
20-
'update' => [
21-
'class' => \yii\rest\UpdateAction::class,
2223
'modelClass' => \app\models\Pet::class,
24+
'findModel' => null
25+
],
26+
'update' => [
27+
'class' => \insolita\fractal\actions\UpdateAction::class,
2328
'checkAccess' => [$this, 'checkAccess'],
29+
'transformer' => \app\transformers\PetTransformer::class,
30+
'modelClass' => \app\models\Pet::class,
31+
'resourceKey' => 'pets',
32+
'findModel' => null,
33+
'allowedRelations'=>[],
34+
'scenario' => 'default'
2435
],
2536
'options' => [
2637
'class' => \yii\rest\OptionsAction::class,
@@ -41,5 +52,4 @@ public function actions()
4152
* @throws \yii\web\ForbiddenHttpException if the user does not have access
4253
*/
4354
abstract public function checkAccess($action, $model = null, $params = []);
44-
4555
}

tests/specs/issue_fix/35_resolve_todo_re_check_options_route_in_fractal_action/mysql/modules/api/v2/controllers/CommentController.php

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,12 @@
55
class CommentController extends \app\some\controllers\base\CommentController
66
{
77

8+
public function actions()
9+
{
10+
$actions = parent::actions();
11+
return $actions;
12+
}
13+
814
public function checkAccess($action, $model = null, $params = [])
915
{
1016
//TODO implement checkAccess

tests/specs/issue_fix/35_resolve_todo_re_check_options_route_in_fractal_action/mysql/modules/api/v2/controllers/base/CommentController.php

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,10 @@
11
<?php
2-
32
namespace app\some\controllers\base;
43

5-
abstract class CommentController extends \yii\rest\Controller
4+
use insolita\fractal\JsonApiController;
5+
use Yii;
6+
7+
abstract class CommentController extends JsonApiController
68
{
79
public function actions()
810
{
@@ -28,5 +30,4 @@ public function actions()
2830
abstract public function checkAccess($action, $model = null, $params = []);
2931

3032
abstract public function actionList();
31-
3233
}

tests/specs/issue_fix/35_resolve_todo_re_check_options_route_in_fractal_action/mysql/modules/forum/controllers/Pet2DetailController.php

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,12 @@
55
class Pet2DetailController extends \app\modules\forum\controllers\base\Pet2DetailController
66
{
77

8+
public function actions()
9+
{
10+
$actions = parent::actions();
11+
return $actions;
12+
}
13+
814
public function checkAccess($action, $model = null, $params = [])
915
{
1016
//TODO implement checkAccess

tests/specs/issue_fix/35_resolve_todo_re_check_options_route_in_fractal_action/mysql/modules/forum/controllers/base/Pet2DetailController.php

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,10 @@
11
<?php
2-
32
namespace app\modules\forum\controllers\base;
43

5-
abstract class Pet2DetailController extends \yii\rest\Controller
4+
use insolita\fractal\JsonApiController;
5+
use Yii;
6+
7+
abstract class Pet2DetailController extends JsonApiController
68
{
79
public function actions()
810
{
@@ -28,5 +30,4 @@ public function actions()
2830
abstract public function checkAccess($action, $model = null, $params = []);
2931

3032
abstract public function actionList();
31-
3233
}

tests/specs/issue_fix/35_resolve_todo_re_check_options_route_in_fractal_action/mysql/modules/forum2/controllers/Pet3DetailController.php

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,12 @@
55
class Pet3DetailController extends \app\forum2\controllers\base\Pet3DetailController
66
{
77

8+
public function actions()
9+
{
10+
$actions = parent::actions();
11+
return $actions;
12+
}
13+
814
public function checkAccess($action, $model = null, $params = [])
915
{
1016
//TODO implement checkAccess

tests/specs/issue_fix/35_resolve_todo_re_check_options_route_in_fractal_action/mysql/modules/forum2/controllers/base/Pet3DetailController.php

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,10 @@
11
<?php
2-
32
namespace app\forum2\controllers\base;
43

5-
abstract class Pet3DetailController extends \yii\rest\Controller
4+
use insolita\fractal\JsonApiController;
5+
use Yii;
6+
7+
abstract class Pet3DetailController extends JsonApiController
68
{
79
public function actions()
810
{
@@ -28,5 +30,4 @@ public function actions()
2830
abstract public function checkAccess($action, $model = null, $params = []);
2931

3032
abstract public function actionList();
31-
3233
}

0 commit comments

Comments
 (0)