Skip to content

Commit 621edbe

Browse files
authored
Merge pull request #7740 from paulbalandan/unicode-apostrophe
docs: replace `U+2019` with `U+0060`
2 parents f09575c + 1890d05 commit 621edbe

File tree

7 files changed

+8
-8
lines changed

7 files changed

+8
-8
lines changed

app/Config/Filters.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,7 @@ class Filters extends BaseConfig
4949
*
5050
* If you use this, you should disable auto-routing because auto-routing
5151
* permits any HTTP method to access a controller. Accessing the controller
52-
* with a method you dont expect could bypass the filter.
52+
* with a method you don't expect could bypass the filter.
5353
*/
5454
public array $methods = [];
5555

changelogs/CHANGELOG_4.0.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -515,7 +515,7 @@ These changes increase security when handling uploaded files as the client can n
515515
- Add hex2bin prefix handling for encryption key [\#3307](https://github.com/codeigniter4/CodeIgniter4/pull/3307) ([michalsn](https://github.com/michalsn))
516516
- add break; in foreach at Time::getDst\(\) when daylightSaving set [\#3305](https://github.com/codeigniter4/CodeIgniter4/pull/3305) ([samsonasik](https://github.com/samsonasik))
517517
- New command: cache:clear [\#3304](https://github.com/codeigniter4/CodeIgniter4/pull/3304) ([lonnieezell](https://github.com/lonnieezell))
518-
- force\_https didnt force https [\#3302](https://github.com/codeigniter4/CodeIgniter4/pull/3302) ([colethorsen](https://github.com/colethorsen))
518+
- force\_https didn't force https [\#3302](https://github.com/codeigniter4/CodeIgniter4/pull/3302) ([colethorsen](https://github.com/colethorsen))
519519
- add test for CommandRunner::\_remap\(\) with empty first params [\#3301](https://github.com/codeigniter4/CodeIgniter4/pull/3301) ([samsonasik](https://github.com/samsonasik))
520520
- FieldData -\> add typeName field and length field [\#3299](https://github.com/codeigniter4/CodeIgniter4/pull/3299) ([devorama](https://github.com/devorama))
521521
- reduce repetitive getDefaultNamespace\(\) and controllerName\(\) function call in Router [\#3298](https://github.com/codeigniter4/CodeIgniter4/pull/3298) ([samsonasik](https://github.com/samsonasik))
@@ -2380,7 +2380,7 @@ These changes increase security when handling uploaded files as the client can n
23802380
- Database can't save connect instances because var "$group" default is NULL [\#466](https://github.com/codeigniter4/CodeIgniter4/issues/466)
23812381
- redirect\(\) issue [\#465](https://github.com/codeigniter4/CodeIgniter4/issues/465)
23822382
- Join not working in Query Builder [\#464](https://github.com/codeigniter4/CodeIgniter4/issues/464)
2383-
- If the controllers method's parameter has a default value , the program will show 500 error [\#461](https://github.com/codeigniter4/CodeIgniter4/issues/461)
2383+
- 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)
23842384
- Wrong ROOTPATH on console [\#460](https://github.com/codeigniter4/CodeIgniter4/issues/460)
23852385
- Rename "public" Folder Not Working [\#453](https://github.com/codeigniter4/CodeIgniter4/issues/453)
23862386
- Environment File [\#452](https://github.com/codeigniter4/CodeIgniter4/issues/452)

contributing/pull_request.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ Before we look into how to contribute to CodeIgniter4, here are some guidelines.
2828
Your Pull Requests (PRs) need to meet our guidelines.
2929

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

3434
### PHP Style

system/Database/OCI8/Forge.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -187,7 +187,7 @@ protected function _attributeAutoIncrement(array &$attributes, array &$field)
187187
protected function _processColumn(array $field): string
188188
{
189189
$constraint = '';
190-
// @todo: cant cover multi pattern when set type.
190+
// @todo: can't cover multi pattern when set type.
191191
if ($field['type'] === 'VARCHAR2' && strpos($field['length'], "('") === 0) {
192192
$constraint = ' CHECK(' . $this->db->escapeIdentifiers($field['name'])
193193
. ' IN ' . $field['length'] . ')';

system/HTTP/ContentSecurityPolicy.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -327,7 +327,7 @@ public function reportOnly(bool $value = true)
327327
/**
328328
* Adds a new base_uri value. Can be either a URI class or a simple string.
329329
*
330-
* base_uri restricts the URLs that can appear in a pages <base> element.
330+
* base_uri restricts the URLs that can appear in a page's <base> element.
331331
*
332332
* @see http://www.w3.org/TR/CSP/#directive-base-uri
333333
*

user_guide_src/source/libraries/sessions.rst

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -392,7 +392,7 @@ necessary with our new implementation. However, it may happen that your
392392
application relied on these values, so here are alternative methods of
393393
accessing them:
394394

395-
- session_id: ``$session->session_id`` or ``session_id()`` (PHPs built-in function)
395+
- session_id: ``$session->session_id`` or ``session_id()`` (PHP's built-in function)
396396
- ip_address: ``$_SERVER['REMOTE_ADDR']``
397397
- user_agent: ``$_SERVER['HTTP_USER_AGENT']`` (unused by sessions)
398398
- last_activity: Depends on the storage, no straightforward way. Sorry!

user_guide_src/source/outgoing/response.rst

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -111,7 +111,7 @@ When you want to redirect back, use ``redirect()->back()``:
111111

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

116116
.. _response-redirect-status-code:
117117

0 commit comments

Comments
 (0)