From ca90ee356f52fd8941bd849b6741e7bcc185b6e6 Mon Sep 17 00:00:00 2001 From: Nikola Mijajlovic Date: Mon, 19 Jun 2017 23:55:41 +0200 Subject: [PATCH 1/4] - removal of unused function in AuthorizeController --- Controller/AuthorizeController.php | 12 ------------ 1 file changed, 12 deletions(-) diff --git a/Controller/AuthorizeController.php b/Controller/AuthorizeController.php index 1a9e9478..ac6d2e1c 100644 --- a/Controller/AuthorizeController.php +++ b/Controller/AuthorizeController.php @@ -128,18 +128,6 @@ protected function processSuccess(UserInterface $user, AuthorizeFormHandler $for } } - /** - * Generate the redirection url when the authorize is completed. - * - * @param UserInterface $user - * - * @return string - */ - protected function getRedirectionUrl(UserInterface $user) - { - return $this->container->get('router')->generate('fos_oauth_server_profile_show'); - } - /** * @return ClientInterface. */ From 7741928c38d635829cb8f44e8504a5da52328732 Mon Sep 17 00:00:00 2001 From: Nikola Mijajlovic Date: Thu, 15 Feb 2018 20:36:25 +0100 Subject: [PATCH 2/4] added deprecation notice --- Controller/AuthorizeController.php | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) diff --git a/Controller/AuthorizeController.php b/Controller/AuthorizeController.php index ac6d2e1c..c2b1e2a3 100644 --- a/Controller/AuthorizeController.php +++ b/Controller/AuthorizeController.php @@ -128,6 +128,22 @@ protected function processSuccess(UserInterface $user, AuthorizeFormHandler $for } } + /** + * Generate the redirection url when the authorize is completed. + * + * @param UserInterface $user + * + * @return string + * + * @deprecated since 1.5.2, to be removed in 2.0 + */ + protected function getRedirectionUrl(UserInterface $user) + { + @trigger_error('deprecated', E_USER_DEPRECATED); + + return $this->container->get('router')->generate('fos_oauth_server_profile_show'); + } + /** * @return ClientInterface. */ From 1cea49fa3d1a4e018dadc2568a5afcb475cc4c0a Mon Sep 17 00:00:00 2001 From: Nikola Mijajlovic Date: Sat, 17 Feb 2018 00:20:07 +0100 Subject: [PATCH 3/4] fixed deprecation notice --- Controller/AuthorizeController.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Controller/AuthorizeController.php b/Controller/AuthorizeController.php index c2b1e2a3..17e70c04 100644 --- a/Controller/AuthorizeController.php +++ b/Controller/AuthorizeController.php @@ -135,11 +135,11 @@ protected function processSuccess(UserInterface $user, AuthorizeFormHandler $for * * @return string * - * @deprecated since 1.5.2, to be removed in 2.0 + * @deprecated since 1.6, to be removed in 2.0 */ protected function getRedirectionUrl(UserInterface $user) { - @trigger_error('deprecated', E_USER_DEPRECATED); + @trigger_error(sprintf('%s() is deprecated since version 1.6 and will be removed in 2.0', __METHOD__)); return $this->container->get('router')->generate('fos_oauth_server_profile_show'); } From 00076b02a590de1bcb9610070dde1982f9a9e0d3 Mon Sep 17 00:00:00 2001 From: Nikola Mijajlovic Date: Sun, 18 Feb 2018 14:00:20 +0100 Subject: [PATCH 4/4] fixed cs spacing issue --- Controller/AuthorizeController.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Controller/AuthorizeController.php b/Controller/AuthorizeController.php index 35fe2c64..f7eceda0 100644 --- a/Controller/AuthorizeController.php +++ b/Controller/AuthorizeController.php @@ -248,7 +248,7 @@ protected function processSuccess(UserInterface $user, AuthorizeFormHandler $for protected function getRedirectionUrl(UserInterface $user) { @trigger_error(sprintf('%s() is deprecated since version 1.6 and will be removed in 2.0', __METHOD__)); - + return $this->router->generate('fos_oauth_server_profile_show'); }