Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion app/Config/Filters.php
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,7 @@ class Filters extends BaseConfig
*
* If you use this, you should disable auto-routing because auto-routing
* permits any HTTP method to access a controller. Accessing the controller
* with a method you dont expect could bypass the filter.
* with a method you don't expect could bypass the filter.
*/
public array $methods = [];

Expand Down
4 changes: 2 additions & 2 deletions changelogs/CHANGELOG_4.0.md
Original file line number Diff line number Diff line change
Expand Up @@ -515,7 +515,7 @@ These changes increase security when handling uploaded files as the client can n
- Add hex2bin prefix handling for encryption key [\#3307](https://github.com/codeigniter4/CodeIgniter4/pull/3307) ([michalsn](https://github.com/michalsn))
- add break; in foreach at Time::getDst\(\) when daylightSaving set [\#3305](https://github.com/codeigniter4/CodeIgniter4/pull/3305) ([samsonasik](https://github.com/samsonasik))
- New command: cache:clear [\#3304](https://github.com/codeigniter4/CodeIgniter4/pull/3304) ([lonnieezell](https://github.com/lonnieezell))
- force\_https didnt force https [\#3302](https://github.com/codeigniter4/CodeIgniter4/pull/3302) ([colethorsen](https://github.com/colethorsen))
- force\_https didn't force https [\#3302](https://github.com/codeigniter4/CodeIgniter4/pull/3302) ([colethorsen](https://github.com/colethorsen))
- add test for CommandRunner::\_remap\(\) with empty first params [\#3301](https://github.com/codeigniter4/CodeIgniter4/pull/3301) ([samsonasik](https://github.com/samsonasik))
- FieldData -\> add typeName field and length field [\#3299](https://github.com/codeigniter4/CodeIgniter4/pull/3299) ([devorama](https://github.com/devorama))
- reduce repetitive getDefaultNamespace\(\) and controllerName\(\) function call in Router [\#3298](https://github.com/codeigniter4/CodeIgniter4/pull/3298) ([samsonasik](https://github.com/samsonasik))
Expand Down Expand Up @@ -2380,7 +2380,7 @@ These changes increase security when handling uploaded files as the client can n
- Database can't save connect instances because var "$group" default is NULL [\#466](https://github.com/codeigniter4/CodeIgniter4/issues/466)
- redirect\(\) issue [\#465](https://github.com/codeigniter4/CodeIgniter4/issues/465)
- Join not working in Query Builder [\#464](https://github.com/codeigniter4/CodeIgniter4/issues/464)
- If the controllers method's parameter has a default value , the program will show 500 error [\#461](https://github.com/codeigniter4/CodeIgniter4/issues/461)
- If the controller's method's parameter has a default value , the program will show 500 error [\#461](https://github.com/codeigniter4/CodeIgniter4/issues/461)
- Wrong ROOTPATH on console [\#460](https://github.com/codeigniter4/CodeIgniter4/issues/460)
- Rename "public" Folder Not Working [\#453](https://github.com/codeigniter4/CodeIgniter4/issues/453)
- Environment File [\#452](https://github.com/codeigniter4/CodeIgniter4/issues/452)
Expand Down
2 changes: 1 addition & 1 deletion contributing/pull_request.md
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ Before we look into how to contribute to CodeIgniter4, here are some guidelines.
Your Pull Requests (PRs) need to meet our guidelines.

If your Pull Requests fail to pass these guidelines, they will be declined,
and you will need to re-submit when youve made the changes.
and you will need to re-submit when you've made the changes.
This might sound a bit tough, but it is required for us to maintain the quality of the codebase.

### PHP Style
Expand Down
2 changes: 1 addition & 1 deletion system/Database/OCI8/Forge.php
Original file line number Diff line number Diff line change
Expand Up @@ -187,7 +187,7 @@ protected function _attributeAutoIncrement(array &$attributes, array &$field)
protected function _processColumn(array $field): string
{
$constraint = '';
// @todo: cant cover multi pattern when set type.
// @todo: can't cover multi pattern when set type.
if ($field['type'] === 'VARCHAR2' && strpos($field['length'], "('") === 0) {
$constraint = ' CHECK(' . $this->db->escapeIdentifiers($field['name'])
. ' IN ' . $field['length'] . ')';
Expand Down
2 changes: 1 addition & 1 deletion system/HTTP/ContentSecurityPolicy.php
Original file line number Diff line number Diff line change
Expand Up @@ -327,7 +327,7 @@ public function reportOnly(bool $value = true)
/**
* Adds a new base_uri value. Can be either a URI class or a simple string.
*
* base_uri restricts the URLs that can appear in a pages <base> element.
* base_uri restricts the URLs that can appear in a page's <base> element.
*
* @see http://www.w3.org/TR/CSP/#directive-base-uri
*
Expand Down
2 changes: 1 addition & 1 deletion user_guide_src/source/libraries/sessions.rst
Original file line number Diff line number Diff line change
Expand Up @@ -392,7 +392,7 @@ necessary with our new implementation. However, it may happen that your
application relied on these values, so here are alternative methods of
accessing them:

- session_id: ``$session->session_id`` or ``session_id()`` (PHPs built-in function)
- session_id: ``$session->session_id`` or ``session_id()`` (PHP's built-in function)
- ip_address: ``$_SERVER['REMOTE_ADDR']``
- user_agent: ``$_SERVER['HTTP_USER_AGENT']`` (unused by sessions)
- last_activity: Depends on the storage, no straightforward way. Sorry!
Expand Down
2 changes: 1 addition & 1 deletion user_guide_src/source/outgoing/response.rst
Original file line number Diff line number Diff line change
Expand Up @@ -111,7 +111,7 @@ When you want to redirect back, use ``redirect()->back()``:

.. note:: ``redirect()->back()`` is not the same as browser "back" button.
It takes a visitor to "the last page viewed during the Session" when the Session is available.
If the Session hasnt been loaded, or is otherwise unavailable, then a sanitized version of HTTP_REFERER will be used.
If the Session hasn't been loaded, or is otherwise unavailable, then a sanitized version of HTTP_REFERER will be used.

.. _response-redirect-status-code:

Expand Down