Merge pull request #5345 from kenjis/fix-request-uri

docs: don't use `IncomingRequest::$uri`

system/HTTP/IncomingRequest.php

@@ -64,6 +64,8 @@ class IncomingRequest extends Request
      * AFTER the script name. So, if hosted in a sub-folder this will
      * appear different than actual URL. If you need that use getPath().
      *
+     * @TODO should be protected. Use getUri() instead.
+     *
      * @var URI
      */
     public $uri;

user_guide_src/source/concepts/http.rst

@@ -75,7 +75,7 @@ is an object-oriented representation of the HTTP request. It provides everything
     $request = service('request');
 
     // the URI being requested (i.e., /about)
-    $request->uri->getPath();
+    $request->getUri()->getPath();
 
     // Retrieve $_GET and $_POST variables
     $request->getGet('foo');

user_guide_src/source/incoming/incomingrequest.rst

@@ -249,13 +249,13 @@ The Request URL
 ---------------
 
 You can retrieve a :doc:`URI </libraries/uri>` object that represents the current URI for this request through the
-``$request->uri`` property. You can cast this object as a string to get a full URL for the current request::
+``$request->getUri()`` method. You can cast this object as a string to get a full URL for the current request::
 
-    $uri = (string)$request->uri;
+    $uri = (string) $request->getUri();
 
 The object gives you full abilities to grab any part of the request on it's own::
 
-    $uri = $request->uri;
+    $uri = $request->getUri();
 
     echo $uri->getScheme();         // http
     echo $uri->getAuthority();      // snoopy:[email protected]:88