Skip to content

Commit

Permalink
Merge pull request #1243 from jim-parry/docs/structure2
Browse files Browse the repository at this point in the history
Move Response & APIResponseTrait to outgoing section of UG
  • Loading branch information
jim-parry authored Sep 26, 2018
2 parents a3d85f0 + 5e3a965 commit a384868
Show file tree
Hide file tree
Showing 9 changed files with 7 additions and 7 deletions.
2 changes: 1 addition & 1 deletion user_guide_src/source/concepts/http.rst
Original file line number Diff line number Diff line change
Expand Up @@ -97,7 +97,7 @@ is an object-oriented representation of the HTTP request. It provides everything
The request class does a lot of work in the background for you, that you never need to worry about.
The ``isAJAX()`` and ``isSecure()`` methods check several different methods to determine the correct answer.

CodeIgniter also provides a :doc:`Response class </incoming/response>` that is an object-oriented representation
CodeIgniter also provides a :doc:`Response class </outgoing/response>` that is an object-oriented representation
of the HTTP response. This gives you an easy and powerful way to construct your response to the client::

use CodeIgniter\HTTP\Response;
Expand Down
2 changes: 1 addition & 1 deletion user_guide_src/source/helpers/cookie_helper.rst
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@ The following functions are available:
:rtype: void

This helper function gives you friendlier syntax to set browser
cookies. Refer to the :doc:`Response Library </incoming/response>` for
cookies. Refer to the :doc:`Response Library </outgoing/response>` for
a description of its use, as this function is an alias for
``Response::setCookie()``.

Expand Down
2 changes: 1 addition & 1 deletion user_guide_src/source/incoming/controllers.rst
Original file line number Diff line number Diff line change
Expand Up @@ -250,7 +250,7 @@ as a class property, ``$this->request``.

**Response Object**

The application's main :doc:`Response Instance </incoming/response>` is always available
The application's main :doc:`Response Instance </outgoing/response>` is always available
as a class property, ``$this->response``.

**Logger Object**
Expand Down
2 changes: 0 additions & 2 deletions user_guide_src/source/incoming/index.rst
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,4 @@ Controllers handle incoming requests.
message
request
incomingrequest
response
api_responses
content_negotiation
2 changes: 1 addition & 1 deletion user_guide_src/source/incoming/message.rst
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ requests and responses, including the message body, protocol version, utilities
the headers, and methods for handling content negotiation.

This class is the parent class that both the :doc:`Request Class </incoming/request>` and the
:doc:`Response Class </incoming/response>` extend from. As such, some methods, such as the content
:doc:`Response Class </outgoing/response>` extend from. As such, some methods, such as the content
negotiation methods, may apply only to a request or response, and not the other one, but they have
been included here to keep the header methods together.

Expand Down
2 changes: 1 addition & 1 deletion user_guide_src/source/libraries/curlrequest.rst
Original file line number Diff line number Diff line change
Expand Up @@ -54,7 +54,7 @@ Working with the Library
************************

Working with CURL requests is simply a matter of creating the Request and getting a
:doc:`Response object </incoming/response>` back. It is meant to handle the communications. After that
:doc:`Response object </outgoing/response>` back. It is meant to handle the communications. After that
you have complete control over how the information is handled.

Making Requests
Expand Down
2 changes: 2 additions & 0 deletions user_guide_src/source/outgoing/index.rst
Original file line number Diff line number Diff line change
Expand Up @@ -11,5 +11,7 @@ View components are used to build what is returned to the user.
view_cells
view_renderer
view_parser
response
api_responses
localization
alternative_php
File renamed without changes.

0 comments on commit a384868

Please sign in to comment.