Skip to content

Commit c36685e

Browse files
authored
Merge pull request #7191 from objecttothis/patch-1
Correcting documentation mistakes in upgrading from one version to another
2 parents cd6ad5c + a3a6dae commit c36685e

File tree

3 files changed

+3
-3
lines changed

3 files changed

+3
-3
lines changed

user_guide_src/source/installation/upgrade_405.rst

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@ Additional related deprecations from the HTTP layer:
3939

4040
* ``Message::isJSON()``: Check the "Content-Type" header directly
4141
* ``Request[Interface]::isValidIP()``: Use the Validation class with ``valid_ip``
42-
* ``Request[Interface]::getMethod()``: The ``$upper`` parameter will be removed, use str_to_upper()
42+
* ``Request[Interface]::getMethod()``: The ``$upper`` parameter will be removed, use strtoupper()
4343
* ``Request[Trait]::$ipAddress``: This property will become private
4444
* ``Request::$proxyIPs``: This property will be removed; access ``config('App')->proxyIPs`` directly
4545
* ``Request::__construct()``: The constructor will no longer take ``Config\App`` and has been made nullable to aid transition

user_guide_src/source/installation/upgrade_412.rst

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,7 @@ BaseConnection::query() Return Values
4646
``BaseConnection::query()`` method in prior versions was incorrectly returning BaseResult objects
4747
even if the query failed. This method will now return ``false`` for failed queries (or throw an
4848
Exception if ``DBDebug`` is ``true``) and will return booleans for write-type queries. Review any use
49-
of ``query()`` method and be assess whether the value might be boolean instead of Result object.
49+
of ``query()`` method and assess whether the value might be boolean instead of Result object.
5050
For a better idea of what queries are write-type queries, check ``BaseConnection::isWriteType()``
5151
and any DBMS-specific override ``isWriteType()`` in the relevant Connection class.
5252

user_guide_src/source/installation/upgrade_431.rst

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -66,7 +66,7 @@ and it is recommended that you merge the updated versions with your application:
6666
Config
6767
------
6868

69-
- app/Config/Encryption.php
69+
- app/Config/Email.php
7070
- Set the default value ``''`` to ``$fromEmail``, ``$fromName``,
7171
``$recipients``, ``$SMTPHost``, ``$SMTPUser`` and ``$SMTPPass``
7272
to apply environment variable (**.env**) values.

0 commit comments

Comments
 (0)