From 68157946bc90ea15b886edaccb2f4bb2d67683ea Mon Sep 17 00:00:00 2001 From: kenjis Date: Wed, 31 Aug 2022 18:23:11 +0900 Subject: [PATCH 1/4] docs: add @deprecated --- system/Cookie/CloneableCookieInterface.php | 2 ++ system/Cookie/Cookie.php | 2 ++ 2 files changed, 4 insertions(+) diff --git a/system/Cookie/CloneableCookieInterface.php b/system/Cookie/CloneableCookieInterface.php index 508c1359970e..93f6031e2010 100644 --- a/system/Cookie/CloneableCookieInterface.php +++ b/system/Cookie/CloneableCookieInterface.php @@ -60,6 +60,8 @@ public function withExpired(); * Creates a new Cookie that will virtually never expire from the browser. * * @return static + * + * @deprecated See https://github.com/codeigniter4/CodeIgniter4/pull/6413 */ public function withNeverExpiring(); diff --git a/system/Cookie/Cookie.php b/system/Cookie/Cookie.php index 22c01a7daa3c..eee91d2d5681 100644 --- a/system/Cookie/Cookie.php +++ b/system/Cookie/Cookie.php @@ -461,6 +461,8 @@ public function withExpired() /** * {@inheritDoc} + * + * @deprecated See https://github.com/codeigniter4/CodeIgniter4/pull/6413 */ public function withNeverExpiring() { From 1fe22d10608d691c8dbf8bfc666ced9143c87ae9 Mon Sep 17 00:00:00 2001 From: kenjis Date: Wed, 31 Aug 2022 18:23:53 +0900 Subject: [PATCH 2/4] docs: fix namespace --- user_guide_src/source/libraries/cookies.rst | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/user_guide_src/source/libraries/cookies.rst b/user_guide_src/source/libraries/cookies.rst index 1964eb4cf144..3bc986f58482 100644 --- a/user_guide_src/source/libraries/cookies.rst +++ b/user_guide_src/source/libraries/cookies.rst @@ -223,7 +223,7 @@ In runtime, you can manually supply a new default using the ``Cookie::setDefault Class Reference *************** -.. php:namespace:: CodeIgniter\HTTP\Cookie +.. php:namespace:: CodeIgniter\Cookie .. php:class:: Cookie From 97d1a51112749de1dc6f3b04d9d51c4a400f5192 Mon Sep 17 00:00:00 2001 From: kenjis Date: Wed, 31 Aug 2022 18:24:14 +0900 Subject: [PATCH 3/4] docs: add deprecation of Cookie::withNeverExpiring() --- user_guide_src/source/changelogs/v4.2.6.rst | 2 +- user_guide_src/source/libraries/cookies.rst | 2 ++ 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/user_guide_src/source/changelogs/v4.2.6.rst b/user_guide_src/source/changelogs/v4.2.6.rst index d1a467297660..4607984cf2ab 100644 --- a/user_guide_src/source/changelogs/v4.2.6.rst +++ b/user_guide_src/source/changelogs/v4.2.6.rst @@ -27,7 +27,7 @@ none. Deprecations ************ -none. +- :php:meth:`CodeIgniter\\Cookie\\Cookie::withNeverExpiring()` is deprecated. Bugs Fixed ********** diff --git a/user_guide_src/source/libraries/cookies.rst b/user_guide_src/source/libraries/cookies.rst index 3bc986f58482..6cfc37327106 100644 --- a/user_guide_src/source/libraries/cookies.rst +++ b/user_guide_src/source/libraries/cookies.rst @@ -326,6 +326,8 @@ Class Reference .. php:method:: withNeverExpiring() + .. important:: This method is deprecated. + :param string $name: :rtype: ``Cookie`` :returns: new ``Cookie`` instance From dcd4ab9ac2678fff1629bcbd384dab180a512f5b Mon Sep 17 00:00:00 2001 From: kenjis Date: Fri, 2 Sep 2022 11:37:51 +0900 Subject: [PATCH 4/4] docs: remove `@inheritDoc` --- system/Cookie/Cookie.php | 2 -- 1 file changed, 2 deletions(-) diff --git a/system/Cookie/Cookie.php b/system/Cookie/Cookie.php index eee91d2d5681..b153d8fe6e0f 100644 --- a/system/Cookie/Cookie.php +++ b/system/Cookie/Cookie.php @@ -460,8 +460,6 @@ public function withExpired() } /** - * {@inheritDoc} - * * @deprecated See https://github.com/codeigniter4/CodeIgniter4/pull/6413 */ public function withNeverExpiring()