diff --git a/src/Controller/IgnoreOriginInstanceRuleController.php b/src/Controller/IgnoreOriginInstanceRuleController.php index 5d8652c28..12a3782c4 100644 --- a/src/Controller/IgnoreOriginInstanceRuleController.php +++ b/src/Controller/IgnoreOriginInstanceRuleController.php @@ -17,8 +17,6 @@ use Wallabag\Repository\IgnoreOriginInstanceRuleRepository; /** * IgnoreOriginInstanceRuleController controller. - * - * @Route("/ignore-origin-instance-rules") */ class IgnoreOriginInstanceRuleController extends AbstractController { @@ -34,7 +32,7 @@ class IgnoreOriginInstanceRuleController extends AbstractController /** * Lists all IgnoreOriginInstanceRule entities. * - * @Route("/", name="ignore_origin_instance_rules_index", methods={"GET"}) + * @Route("/ignore-origin-instance-rules", name="ignore_origin_instance_rules_index", methods={"GET"}) * @IsGranted("LIST_IGNORE_ORIGIN_INSTANCE_RULES") */ public function indexAction(IgnoreOriginInstanceRuleRepository $repository) @@ -49,7 +47,7 @@ class IgnoreOriginInstanceRuleController extends AbstractController /** * Creates a new ignore origin instance rule entity. * - * @Route("/new", name="ignore_origin_instance_rules_new", methods={"GET", "POST"}) + * @Route("/ignore-origin-instance-rules/new", name="ignore_origin_instance_rules_new", methods={"GET", "POST"}) * @IsGranted("CREATE_IGNORE_ORIGIN_INSTANCE_RULES") * * @return Response @@ -82,7 +80,7 @@ class IgnoreOriginInstanceRuleController extends AbstractController /** * Displays a form to edit an existing ignore origin instance rule entity. * - * @Route("/{id}/edit", name="ignore_origin_instance_rules_edit", methods={"GET", "POST"}) + * @Route("/ignore-origin-instance-rules/{id}/edit", name="ignore_origin_instance_rules_edit", methods={"GET", "POST"}) * @IsGranted("EDIT", subject="ignoreOriginInstanceRule") * * @return Response @@ -115,7 +113,7 @@ class IgnoreOriginInstanceRuleController extends AbstractController /** * Deletes a site credential entity. * - * @Route("/{id}", name="ignore_origin_instance_rules_delete", methods={"DELETE"}) + * @Route("/ignore-origin-instance-rules/{id}", name="ignore_origin_instance_rules_delete", methods={"DELETE"}) * @IsGranted("DELETE", subject="ignoreOriginInstanceRule") * * @return RedirectResponse diff --git a/src/Controller/SiteCredentialController.php b/src/Controller/SiteCredentialController.php index e9cfb203f..9e90899eb 100644 --- a/src/Controller/SiteCredentialController.php +++ b/src/Controller/SiteCredentialController.php @@ -20,8 +20,6 @@ use Wallabag\Repository\SiteCredentialRepository; /** * SiteCredential controller. - * - * @Route("/site-credentials") */ class SiteCredentialController extends AbstractController { @@ -41,7 +39,7 @@ class SiteCredentialController extends AbstractController /** * Lists all User entities. * - * @Route("/", name="site_credentials_index", methods={"GET"}) + * @Route("/site-credentials", name="site_credentials_index", methods={"GET"}) * @IsGranted("LIST_SITE_CREDENTIALS") */ public function indexAction(SiteCredentialRepository $repository) @@ -58,7 +56,7 @@ class SiteCredentialController extends AbstractController /** * Creates a new site credential entity. * - * @Route("/new", name="site_credentials_new", methods={"GET", "POST"}) + * @Route("/site-credentials/new", name="site_credentials_new", methods={"GET", "POST"}) * @IsGranted("CREATE_SITE_CREDENTIALS") * * @return Response @@ -96,7 +94,7 @@ class SiteCredentialController extends AbstractController /** * Displays a form to edit an existing site credential entity. * - * @Route("/{id}/edit", name="site_credentials_edit", methods={"GET", "POST"}) + * @Route("/site-credentials/{id}/edit", name="site_credentials_edit", methods={"GET", "POST"}) * @IsGranted("EDIT", subject="siteCredential") * * @return Response @@ -134,7 +132,7 @@ class SiteCredentialController extends AbstractController /** * Deletes a site credential entity. * - * @Route("/{id}", name="site_credentials_delete", methods={"DELETE"}) + * @Route("/site-credentials/{id}", name="site_credentials_delete", methods={"DELETE"}) * @IsGranted("DELETE", subject="siteCredential") * * @return RedirectResponse diff --git a/tests/Controller/IgnoreOriginInstanceRuleControllerTest.php b/tests/Controller/IgnoreOriginInstanceRuleControllerTest.php index 6800c4d98..dd1305bc7 100644 --- a/tests/Controller/IgnoreOriginInstanceRuleControllerTest.php +++ b/tests/Controller/IgnoreOriginInstanceRuleControllerTest.php @@ -11,7 +11,7 @@ class IgnoreOriginInstanceRuleControllerTest extends WallabagTestCase $this->logInAs('admin'); $client = $this->getTestClient(); - $crawler = $client->request('GET', '/ignore-origin-instance-rules/'); + $crawler = $client->request('GET', '/ignore-origin-instance-rules'); $this->assertSame(200, $client->getResponse()->getStatusCode()); diff --git a/tests/Controller/SiteCredentialControllerTest.php b/tests/Controller/SiteCredentialControllerTest.php index 41a6cbd70..c773f5d0a 100644 --- a/tests/Controller/SiteCredentialControllerTest.php +++ b/tests/Controller/SiteCredentialControllerTest.php @@ -17,7 +17,7 @@ class SiteCredentialControllerTest extends WallabagTestCase $client->getContainer()->get(Config::class)->set('restricted_access', 0); - $client->request('GET', '/site-credentials/'); + $client->request('GET', '/site-credentials'); $this->assertSame(404, $client->getResponse()->getStatusCode()); @@ -29,7 +29,7 @@ class SiteCredentialControllerTest extends WallabagTestCase $this->logInAs('admin'); $client = $this->getTestClient(); - $crawler = $client->request('GET', '/site-credentials/'); + $crawler = $client->request('GET', '/site-credentials'); $this->assertSame(200, $client->getResponse()->getStatusCode());