summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAndrey Andreev <narf@devilix.net>2016-12-01 13:45:07 +0100
committerAndrey Andreev <narf@devilix.net>2016-12-01 13:45:07 +0100
commitdd2dcde50355c85466991caa9630a66a46626e46 (patch)
tree498964054fafbe5dbdfe55c3b05e31ffffd2b5e8
parent9687441bc9b77514e847a5e3c56cf7e051f14be4 (diff)
Remove previously deprecated fetch_*() methods from CI_Router
-rw-r--r--system/core/Router.php43
-rw-r--r--user_guide_src/source/changelog.rst3
-rw-r--r--user_guide_src/source/installation/upgrade_320.rst3
3 files changed, 5 insertions, 44 deletions
diff --git a/system/core/Router.php b/system/core/Router.php
index 045d36687..42d0e2952 100644
--- a/system/core/Router.php
+++ b/system/core/Router.php
@@ -439,19 +439,6 @@ class CI_Router {
// --------------------------------------------------------------------
/**
- * Fetch the current class
- *
- * @deprecated 3.0.0 Read the 'class' property instead
- * @return string
- */
- public function fetch_class()
- {
- return $this->class;
- }
-
- // --------------------------------------------------------------------
-
- /**
* Set method name
*
* @param string $method Method name
@@ -465,19 +452,6 @@ class CI_Router {
// --------------------------------------------------------------------
/**
- * Fetch the current method
- *
- * @deprecated 3.0.0 Read the 'method' property instead
- * @return string
- */
- public function fetch_method()
- {
- return $this->method;
- }
-
- // --------------------------------------------------------------------
-
- /**
* Set directory name
*
* @param string $dir Directory name
@@ -495,21 +469,4 @@ class CI_Router {
$this->directory .= str_replace('.', '', trim($dir, '/')).'/';
}
}
-
- // --------------------------------------------------------------------
-
- /**
- * Fetch directory
- *
- * Feches the sub-directory (if any) that contains the requested
- * controller class.
- *
- * @deprecated 3.0.0 Read the 'directory' property instead
- * @return string
- */
- public function fetch_directory()
- {
- return $this->directory;
- }
-
}
diff --git a/user_guide_src/source/changelog.rst b/user_guide_src/source/changelog.rst
index 035255166..3d6d3e392 100644
--- a/user_guide_src/source/changelog.rst
+++ b/user_guide_src/source/changelog.rst
@@ -10,7 +10,8 @@ Release Date: Not Released
- Core
- Changed :doc:`URI Library <libraries/uri>` to ignore the ``$config['url_suffix']``, ``$config['permitted_uri_chars']`` configuration settings for CLI requests.
- - Removed previously deprecated method ``is_cli_request()`` from the :doc:`Input Library <libraries/input>` (use :php:func:`is_cli()` instead).
+ - Removed previously deprecated :doc:`Input Library <libraries/input>` method ``is_cli_request()`` (use :php:func:`is_cli()` instead).
+ - Removed previously deprecated :doc:`Routing Class <general/routing>` methods ``fetch_directory()``, ``fetch_class()`` and ``fetch_method()`` (use the respective class properties instead).
- Libraries
diff --git a/user_guide_src/source/installation/upgrade_320.rst b/user_guide_src/source/installation/upgrade_320.rst
index 469aa3429..02c78d373 100644
--- a/user_guide_src/source/installation/upgrade_320.rst
+++ b/user_guide_src/source/installation/upgrade_320.rst
@@ -132,3 +132,6 @@ The following is a list of functionalities deprecated in CodeIgniter
version 3.0.0, that have been removed in 3.2.0:
- ``CI_Input::is_cli_request()`` (use :php:func:`is_cli()` instead)
+- ``CI_Router::fetch_directory()`` (use ``CI_Router::$directory instead)
+- ``CI_Router::fetch_class()`` (use ``CI_Router::$class`` instead)
+- ``CI_Router::fetch_method()`` (use ``CI_Router::$method`` instead)