Skip to content

Commit 40b77c2

Browse files
jlamimjlamim
committed
Merge remote-tracking branch 'upstream/master' into user_guide
2 parents cf4275c + 278a747 commit 40b77c2

11 files changed

Lines changed: 132 additions & 66 deletions

File tree

‎CHANGELOG.md‎

Lines changed: 33 additions & 17 deletions
Large diffs are not rendered by default.

‎admin/release-framework‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ cprm -rf tests
2525
mkdir tests
2626
cp -rf ${CI_DIR}/tests/_support tests/
2727

28-
-rf ${CI_DIR}/admin/framework/* .
28+
cp -rf ${CI_DIR}/admin/framework/* .
2929

3030
#---------------------------------------------------
3131
# And finally, get ready for merging

‎admin/starter/composer.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
"license": "MIT",
77
"require": {
88
"php": ">=7.2",
9-
"codeigniter4/framework": "^4.0"
9+
"codeigniter4/framework": "^4.0.1"
1010
},
1111
"require-dev": {
1212
"mikey179/vfsstream": "1.6.*",

‎system/CodeIgniter.php‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -66,7 +66,7 @@ class CodeIgniter
6666
/**
6767
* The current version of CodeIgniter Framework
6868
*/
69-
const CI_VERSION = '4.0.0';
69+
const CI_VERSION = '4.0.1';
7070

7171
/**
7272
* App startup time.

‎tests/_support/Commands/CommandsTestStreamFilter.php‎

Lines changed: 0 additions & 18 deletions
This file was deleted.

‎user_guide_src/source/_themes/sphinx_rtd_theme/static/css/citheme.css‎

Lines changed: 83 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,41 @@
11
@import 'theme.css';
22

3-
.highlighted {
4-
padding: 0px !important;
5-
font-weight: inherit !important;
6-
background-color: #f1d40f !important;
3+
/* Titles ------------------------------------------------------------------- */
4+
5+
h1 {
6+
margin-bottom: 2rem;
7+
}
8+
9+
h2, h3 {
10+
margin-bottom: 2rem;
11+
margin-top: 3rem;
12+
}
13+
14+
/* Images ------------------------------------------------------------------- */
15+
16+
.rst-content img {
17+
-webkit-box-shadow: 0px 0px 5px 0px rgba(0,0,0,0.75);
18+
-moz-box-shadow: 0px 0px 5px 0px rgba(0,0,0,0.75);
19+
box-shadow: 0px 0px 5px 0px rgba(0,0,0,0.75);
20+
display: block;
21+
height: auto!important;
22+
margin: 3rem auto!important;
23+
max-width: 700px;
24+
width: 100%!important;
725
}
826

27+
.rst-content img.align-left {
28+
margin-right: 2rem!important;
29+
max-width: 375px;
30+
}
31+
32+
.rst-content img.align-right {
33+
margin-left: 2rem!important;
34+
max-width: 400px;
35+
}
36+
37+
/* Navigation --------------------------------------------------------------- */
38+
939
#nav {
1040
background-color: #494949!important;
1141
margin: 0;
@@ -72,10 +102,24 @@ div#pulldown-menu {
72102
color: #aaaaaa;
73103
}
74104

105+
/* Side Menu ---------------------------------------------------------------- */
106+
75107
.wy-side-nav-search a {
76108
color: #ffffff;
77109
}
78110

111+
.wy-side-nav-search input[type=text] {
112+
border-color: #dd4815;
113+
}
114+
115+
.wy-nav-top {
116+
background-color: #dd4814;
117+
}
118+
119+
.wy-nav-top a {
120+
color: #ffffff!important;
121+
}
122+
79123
.wy-menu-vertical a:active {
80124
background-color: #dd4814;
81125
}
@@ -92,21 +136,51 @@ div#pulldown-menu {
92136
color: #97310e;
93137
}
94138

139+
/* Elements ----------------------------------------------------------------- */
140+
141+
.highlighted {
142+
padding: 0px !important;
143+
font-weight: inherit !important;
144+
background-color: #f1d40f !important;
145+
}
146+
95147
.wy-alert.wy-alert-success .wy-alert-title, .rst-content .wy-alert-success.note .wy-alert-title, .rst-content .wy-alert-success.attention .wy-alert-title, .rst-content .wy-alert-success.caution .wy-alert-title, .rst-content .wy-alert-success.danger .wy-alert-title, .rst-content .wy-alert-success.error .wy-alert-title, .rst-content .hint .wy-alert-title, .rst-content .important .wy-alert-title, .rst-content .tip .wy-alert-title, .rst-content .wy-alert-success.warning .wy-alert-title, .rst-content .wy-alert-success.seealso .wy-alert-title, .rst-content .wy-alert-success.admonition-todo .wy-alert-title, .wy-alert.wy-alert-success .rst-content .admonition-title, .rst-content .wy-alert.wy-alert-success .admonition-title, .rst-content .wy-alert-success.note .admonition-title, .rst-content .wy-alert-success.attention .admonition-title, .rst-content .wy-alert-success.caution .admonition-title, .rst-content .wy-alert-success.danger .admonition-title, .rst-content .wy-alert-success.error .admonition-title, .rst-content .hint .admonition-title, .rst-content .important .admonition-title, .rst-content .tip .admonition-title, .rst-content .wy-alert-success.warning .admonition-title, .rst-content .wy-alert-success.seealso .admonition-title, .rst-content .wy-alert-success.admonition-todo .admonition-title {
96148
background-color: #dd4814;
97149
}
98150

99151
.wy-alert.wy-alert-success, .rst-content .wy-alert-success.note, .rst-content .wy-alert-success.attention, .rst-content .wy-alert-success.caution, .rst-content .wy-alert-success.danger, .rst-content .wy-alert-success.error, .rst-content .hint, .rst-content .important, .rst-content .tip, .rst-content .wy-alert-success.warning, .rst-content .wy-alert-success.seealso, .rst-content .wy-alert-success.admonition-todo {
100-
background: rgba(0,0,0,0.05);
152+
background: rgba(0,0,0,0.05);
101153
}
102154

103155
/* override table width restrictions */
104156
.wy-table-responsive table td, .wy-table-responsive table th {
105-
white-space: normal;
157+
white-space: normal;
106158
}
107159

108160
.wy-table-responsive {
109-
margin-bottom: 24px;
110-
max-width: 100%;
111-
overflow: visible;
161+
margin-bottom: 24px;
162+
max-width: 100%;
163+
overflow: visible;
164+
}
165+
166+
.rst-content dl:not(.docutils) dt {
167+
background: #fbefeb;
168+
color: #dd4814;
169+
border-top: solid 3px #dd4814;
170+
}
171+
172+
.wy-plain-list-disc li ul, .rst-content .section ul li ul, .rst-content .toctree-wrapper ul li ul, article ul li ul {
173+
margin-bottom: 0.5rem;
174+
margin-top: -0.5rem;
175+
}
176+
177+
.rst-content dl:not(.docutils) dt:first-child {
178+
margin-top: 1rem;
179+
}
180+
181+
/* Footer ------------------------------------------------------------------- */
182+
183+
.rst-footer-buttons {
184+
margin-bottom: 2.5rem;
185+
margin-top: 2.5rem;
112186
}

‎user_guide_src/source/concepts/http.rst‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -99,8 +99,6 @@ The `isAJAX()` and `isSecure()` methods check several different methods to deter
9999

100100
.. note:: The ``isAJAX()`` method depends on the ``X-Requested-With`` header, which in some cases is not sent by default in XHR requests via JavaScript (i.e. fetch). See the :doc:`AJAX Requests </general/ajax>` section on how to avoid this problem.
101101

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

‎user_guide_src/source/incoming/filters.rst‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -168,8 +168,6 @@ would apply to every AJAX request.
168168

169169
.. note:: The AJAX requests depends on the ``X-Requested-With`` header, which in some cases is not sent by default in XHR requests via JavaScript (i.e. fetch). See the :doc:`AJAX Requests </general/ajax>` section on how to avoid this problem.
170170

171-
::
172-
173171
$filters
174172
========
175173

‎user_guide_src/source/incoming/incomingrequest.rst‎

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@ get a copy of it through the :doc:`Services class </concepts/services>`::
3838
It's preferable, though, to pass the request in as a dependency if the class is anything other than
3939
the controller, where you can save it as a class property::
4040

41-
<?php
41+
<?php
4242
use CodeIgniter\HTTP\RequestInterface;
4343

4444
class SomeClass
@@ -73,8 +73,6 @@ be checked with the ``isAJAX()`` and ``isCLI()`` methods::
7373

7474
.. note:: The ``isAJAX()`` method depends on the ``X-Requested-With`` header, which in some cases is not sent by default in XHR requests via JavaScript (i.e. fetch). See the :doc:`AJAX Requests </general/ajax>` section on how to avoid this problem.
7575

76-
::
77-
7876
You can check the HTTP method that this request represents with the ``method()`` method::
7977

8078
// Returns 'post'
@@ -261,7 +259,7 @@ You can retrieve a single file uploaded on its own, based on the filename given
261259

262260
$file = $request->getFile('uploadedfile');
263261

264-
You can retrieve an array of same-named files uploaded as part of a
262+
You can retrieve an array of same-named files uploaded as part of a
265263
multi-file upload, based on the filename given in the HTML file input::
266264

267265
$files = $request->getFileMultiple('uploadedfile');

‎user_guide_src/source/libraries/caching.rst‎

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -75,12 +75,12 @@ The settings for the Redis server that you wish to use when using the ``Redis``
7575
Class Reference
7676
***************
7777

78-
.. php:method:: isSupported()
78+
.. php:method:: ⠀isSupported()
7979
8080
:returns: TRUE if supported, FALSE if not
8181
:rtype: bool
8282

83-
.. php:method:: get($key)
83+
.. php:method:: ⠀get($key)
8484
8585
:param string $key: Cache item name
8686
:returns: Item value or NULL if not found
@@ -93,7 +93,7 @@ Class Reference
9393

9494
$foo = $cache->get('my_cached_item');
9595

96-
.. php:method:: save($key, $data[, $ttl = 60[, $raw = FALSE]])
96+
.. php:method:: ⠀save($key, $data[, $ttl = 60[, $raw = FALSE]])
9797
9898
:param string $key: Cache item name
9999
:param mixed $data: the data to save
@@ -112,7 +112,7 @@ Class Reference
112112
.. note:: The ``$raw`` parameter is only utilized by Memcache,
113113
in order to allow usage of ``increment()`` and ``decrement()``.
114114

115-
.. php:method:: delete($key)
115+
.. php:method:: ⠀delete($key)
116116
117117
:param string $key: name of cached item
118118
:returns: TRUE on success, FALSE on failure
@@ -125,7 +125,7 @@ Class Reference
125125

126126
$cache->delete('cache_item_id');
127127

128-
.. php:method:: increment($key[, $offset = 1])
128+
.. php:method:: ⠀increment($key[, $offset = 1])
129129
130130
:param string $key: Cache ID
131131
:param int $offset: Step/value to add
@@ -142,7 +142,7 @@ Class Reference
142142

143143
$cache->increment('iterator', 3); // 'iterator' is now 6
144144

145-
.. php:method:: decrement($key[, $offset = 1])
145+
.. php:method:: ⠀decrement($key[, $offset = 1])
146146
147147
:param string $key: Cache ID
148148
:param int $offset: Step/value to reduce by
@@ -159,7 +159,7 @@ Class Reference
159159

160160
$cache->decrement('iterator', 2); // 'iterator' is now 3
161161

162-
.. php:method:: clean()
162+
.. php:method:: ⠀clean()
163163
164164
:returns: TRUE on success, FALSE on failure
165165
:rtype: bool
@@ -171,7 +171,7 @@ Class Reference
171171

172172
$cache->clean();
173173

174-
.. php:method:: cache_info()
174+
.. php:method:: ⠀cache_info()
175175
176176
:returns: Information on the entire cache database
177177
:rtype: mixed
@@ -185,7 +185,7 @@ Class Reference
185185
.. note:: The information returned and the structure of the data is dependent
186186
on which adapter is being used.
187187

188-
.. php:method:: getMetadata($key)
188+
.. php:method:: ⠀getMetadata($key)
189189
190190
:param string $key: Cache item name
191191
:returns: Metadata for the cached item

0 commit comments

Comments
 (0)