Skip to content

Commit 45ca5a9

Browse files
authored
Merge pull request #2273 from jim-parry/prep/rc.2b
Fix changelog [ci skip]
2 parents 04cd07e + 6245a1b commit 45ca5a9

File tree

2 files changed

+9
-8
lines changed

2 files changed

+9
-8
lines changed

user_guide_src/source/changelogs/next.rst

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ Release Date: Not released
88
Enhancements:
99

1010
- query builder testability simplified with new property, but dropped
11-
method parameters (breaking change)
11+
method parameters (breaking change)
1212
- database, migrations and sessions beefed up
1313
- numerous smaller bugs corrected
1414

@@ -37,10 +37,10 @@ The list of changed files follows, with PR numbers shown.
3737
- Database/
3838
- MySQLi/Connection #2201, 2229
3939
- Postgre/
40-
- BaseBuilder #2269
40+
- BaseBuilder #2269
4141
- Connection #2201
4242
- SQLite3/Connection #2201, 2228, 2230
43-
- BaseBuilder #2257, 2232, 2269
43+
- BaseBuilder #2257, 2232, 2269, 2270
4444
- BaseConnection #2208, 2213, 2231
4545
- Config #2224
4646
- Forge #2205
@@ -164,9 +164,10 @@ The list of changed files follows, with PR numbers shown.
164164

165165

166166
PRs merged:
167-
----------
167+
--------------------------
168168

169169
- #2271 fix ResourcePresenter::setModel()
170+
- #2270 groupStart() refactorization
170171
- #2269 testMode() method for BaseBuilder
171172
- #2268 Validation session use only if exists
172173
- #2267 Tests setUp and tearDown: void

user_guide_src/source/database/query_builder.rst

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1333,10 +1333,10 @@ Class Reference
13331333

13341334
.. php:method:: from($from[, $overwrite = FALSE])
13351335
1336-
:param mixed $from: Table name(s); string or array
1337-
:param bool $overwrite Should we remove the first table existing?
1338-
:returns: BaseBuilder instance (method chaining)
1339-
:rtype: BaseBuilder
1336+
:param mixed $from: Table name(s); string or array
1337+
:param bool $overwrite: Should we remove the first table existing?
1338+
:returns: BaseBuilder instance (method chaining)
1339+
:rtype: BaseBuilder
13401340

13411341
Specifies the FROM clause of a query.
13421342

0 commit comments

Comments
 (0)