WARNING: THIS SITE IS A MIRROR OF GITHUB.COM / IT CANNOT LOGIN OR REGISTER ACCOUNTS / THE CONTENTS ARE PROVIDED AS-IS / THIS SITE ASSUMES NO RESPONSIBILITY FOR ANY DISPLAYED CONTENT OR LINKS / IF YOU FOUND SOMETHING MAY NOT GOOD FOR EVERYONE, CONTACT ADMIN AT ilovescratch@foxmail.com
Skip to content

Commit 516e069

Browse files
mamazumamazu
committed
Migreate rest routing to symfony routing
1 parent b01a156 commit 516e069

File tree

6 files changed

+158
-28
lines changed

6 files changed

+158
-28
lines changed

‎Controller/DynamicController.php‎

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -12,8 +12,6 @@
1212
namespace Sulu\Bundle\FormBundle\Controller;
1313

1414
use Doctrine\ORM\EntityManager;
15-
use FOS\RestBundle\Controller\ControllerTrait;
16-
use FOS\RestBundle\Routing\ClassResourceInterface;
1715
use FOS\RestBundle\View\ViewHandler;
1816
use Sulu\Bundle\FormBundle\Entity\Dynamic;
1917
use Sulu\Bundle\FormBundle\Entity\Form;
@@ -30,10 +28,8 @@
3028
/**
3129
* Controller to create dynamic form entries list.
3230
*/
33-
class DynamicController implements ClassResourceInterface
31+
class DynamicController
3432
{
35-
use ControllerTrait;
36-
3733
/**
3834
* @var DynamicRepository
3935
*/

‎Controller/FormController.php‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,6 @@
1111

1212
namespace Sulu\Bundle\FormBundle\Controller;
1313

14-
use FOS\RestBundle\Routing\ClassResourceInterface;
1514
use FOS\RestBundle\View\ViewHandlerInterface;
1615
use Sulu\Bundle\FormBundle\Admin\FormAdmin;
1716
use Sulu\Bundle\FormBundle\Entity\Form;
@@ -31,7 +30,7 @@
3130
use Symfony\Component\HttpKernel\Exception\NotFoundHttpException;
3231
use Symfony\Component\Security\Core\Authentication\Token\Storage\TokenStorageInterface;
3332

34-
class FormController extends AbstractRestController implements ClassResourceInterface, SecuredControllerInterface
33+
class FormController extends AbstractRestController implements SecuredControllerInterface
3534
{
3635
/**
3736
* @var FormManager

‎Controller/ListController.php‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,6 @@
1111

1212
namespace Sulu\Bundle\FormBundle\Controller;
1313

14-
use FOS\RestBundle\Routing\ClassResourceInterface;
1514
use FOS\RestBundle\View\ViewHandlerInterface;
1615
use Sulu\Bundle\FormBundle\Provider\ListProviderRegistry;
1716
use Sulu\Component\Rest\AbstractRestController;
@@ -23,7 +22,7 @@
2322
use Symfony\Component\HttpKernel\Exception\NotFoundHttpException;
2423
use Symfony\Component\Security\Core\Authentication\Token\Storage\TokenStorageInterface;
2524

26-
class ListController extends AbstractRestController implements ClassResourceInterface
25+
class ListController extends AbstractRestController
2726
{
2827
/**
2928
* @var RestHelperInterface

‎Resources/config/routing_api.yaml‎

Lines changed: 69 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,69 @@
1+
sulu_form.get_lists_fields:
2+
path: '/form/lists/fields.{_format}'
3+
methods: GET
4+
controller: 'sulu_form.list_controller::cgetFieldsAction'
5+
format: json
6+
requirements: { _format: json|csv }
7+
8+
sulu_form.get_lists:
9+
path: '/form/lists.{_format}'
10+
methods: GET
11+
controller: 'sulu_form.list_controller::cgetAction'
12+
format: json
13+
requirements: { _format: json|csv }
14+
15+
sulu_form.get_forms:
16+
path: '/forms.{_format}'
17+
methods: GET
18+
controller: 'sulu_form.form_controller::cgetAction'
19+
format: json
20+
requirements: { _format: json|csv }
21+
22+
sulu_form.get_form:
23+
path: '/forms/{id}.{_format}'
24+
methods: GET
25+
controller: 'sulu_form.form_controller::getAction'
26+
format: json
27+
requirements: { _format: json|csv }
28+
29+
sulu_form.post_form:
30+
path: '/forms.{_format}'
31+
methods: POST
32+
controller: 'sulu_form.form_controller::postAction'
33+
format: json
34+
requirements: { _format: json|csv }
35+
36+
sulu_form.put_form:
37+
path: '/forms/{id}.{_format}'
38+
methods: PUT
39+
controller: 'sulu_form.form_controller::putAction'
40+
format: json
41+
requirements: { _format: json|csv }
42+
43+
sulu_form.delete_form:
44+
path: '/forms/{id}.{_format}'
45+
methods: DELETE
46+
controller: 'sulu_form.form_controller::deleteAction'
47+
format: json
48+
requirements: { _format: json|csv }
49+
50+
sulu_form.post_form_trigger:
51+
path: '/forms/{id}.{_format}'
52+
methods: POST
53+
controller: 'sulu_form.form_controller::postTriggerAction'
54+
format: json
55+
requirements: { _format: json|csv }
56+
57+
sulu_form.get_dynamics:
58+
path: '/form/dynamics.{_format}'
59+
methods: GET
60+
controller: 'sulu_form.dynamic_controller::cgetAction'
61+
format: json
62+
requirements: { _format: json|csv }
63+
64+
sulu_form.delete_dynamic:
65+
path: '/form/dynamics/{id}.{_format}'
66+
methods: DELETE
67+
controller: 'sulu_form.dynamic_controller::deleteAction'
68+
format: json
69+
requirements: { _format: json|csv }

‎Resources/config/routing_api.yml‎

Lines changed: 67 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -1,23 +1,71 @@
1-
sulu_form.list:
2-
type: rest
3-
resource: sulu_form.list_controller
4-
prefix: form
5-
name_prefix: sulu_form.
1+
# Deprecated use the routing.yaml file
62

7-
sulu_form.forms:
8-
type: rest
9-
resource: sulu_form.form_controller
10-
name_prefix: sulu_form.
3+
sulu_form.get_lists_fields:
4+
path: '/form/lists/fields.{_format}'
5+
methods: GET
6+
controller: 'sulu_form.list_controller::cgetFieldsAction'
7+
format: json
8+
requirements: { _format: json|csv }
9+
10+
sulu_form.get_lists:
11+
path: '/form/lists.{_format}'
12+
methods: GET
13+
controller: 'sulu_form.list_controller::cgetAction'
14+
format: json
15+
requirements: { _format: json|csv }
16+
17+
sulu_form.get_forms:
18+
path: '/forms.{_format}'
19+
methods: GET
20+
controller: 'sulu_form.form_controller::cgetAction'
21+
format: json
22+
requirements: { _format: json|csv }
23+
24+
sulu_form.get_form:
25+
path: '/forms/{id}.{_format}'
26+
methods: GET
27+
controller: 'sulu_form.form_controller::getAction'
28+
format: json
29+
requirements: { _format: json|csv }
30+
31+
sulu_form.post_form:
32+
path: '/forms.{_format}'
33+
methods: POST
34+
controller: 'sulu_form.form_controller::postAction'
35+
format: json
36+
requirements: { _format: json|csv }
37+
38+
sulu_form.put_form:
39+
path: '/forms/{id}.{_format}'
40+
methods: PUT
41+
controller: 'sulu_form.form_controller::putAction'
42+
format: json
43+
requirements: { _format: json|csv }
44+
45+
sulu_form.delete_form:
46+
path: '/forms/{id}.{_format}'
47+
methods: DELETE
48+
controller: 'sulu_form.form_controller::deleteAction'
49+
format: json
50+
requirements: { _format: json|csv }
1151

1252
sulu_form.post_form_trigger:
13-
path: /forms/{id}.{_format}
53+
path: '/forms/{id}.{_format}'
1454
methods: POST
15-
defaults:
16-
_controller: sulu_form.form_controller::postTriggerAction
17-
_format: json
18-
19-
sulu_form.dynamic:
20-
type: rest
21-
resource: sulu_form.dynamic_controller
22-
prefix: form
23-
name_prefix: sulu_form.
55+
controller: 'sulu_form.form_controller::postTriggerAction'
56+
format: json
57+
requirements: { _format: json|csv }
58+
59+
sulu_form.get_dynamics:
60+
path: '/form/dynamics.{_format}'
61+
methods: GET
62+
controller: 'sulu_form.dynamic_controller::cgetAction'
63+
format: json
64+
requirements: { _format: json|csv }
65+
66+
sulu_form.delete_dynamic:
67+
path: '/form/dynamics/{id}.{_format}'
68+
methods: DELETE
69+
controller: 'sulu_form.dynamic_controller::deleteAction'
70+
format: json
71+
requirements: { _format: json|csv }

‎UPGRADE.md‎

Lines changed: 19 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,24 @@
11
# Upgrade
22

3+
## 2.6.0
4+
5+
### Deprecate usage of fos rest routing
6+
7+
We are no longer considering the [fos rest routing](https://github.com/handcraftedinthealps/RestRoutingBundle) as a best practice.
8+
All bundles should use the Symfony routing system instead.
9+
10+
Inside your `config/routes/sulu_admin.yaml` you can remove the fos rest routing configuration.
11+
First, remove all instances of `type: rest` and also replace `.yml` with `.yaml`:
12+
13+
```diff
14+
# config/routes/sulu_admin.yaml`
15+
sulu_form_api:
16+
- type: rest
17+
- resource: "@SuluFormBundle/Resources/config/routing_api.yml"
18+
+ resource: "@SuluFormBundle/Resources/config/routing_api.yaml"
19+
prefix: /admin/api
20+
```
21+
322
## 2.5.3
423

524
### Deprecate attribute max on AttachmentType

0 commit comments

Comments
 (0)