Skip to content

Commit 220feac

Browse files
jim-parryjim-parry
authored
Merge pull request #1990 from jim-parry/prep/beta.3
Prep for beta.3
2 parents 80cc334 + e2d1ce6 commit 220feac

File tree

4 files changed

+184
-9
lines changed

4 files changed

+184
-9
lines changed

‎admin/release-appstarter

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,10 @@ for fff in $releasable ; do
2020
cp -rf ${CI_DIR}/$fff .
2121
done
2222

23+
rm -rf tests
24+
mkdir tests
25+
cp -rf ${CI_DIR}/tests/_support tests/
26+
2327
echo -e "${BOLD}Override as needed...${NORMAL}"
2428
cp -rf ${CI_DIR}/admin/starter/* .
2529

‎admin/release-deploy

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -7,18 +7,18 @@ echo '-------------------------------'
77

88
. admin/release-config
99

10-
echo -e "${BOLD}Merge release into master${NORMAL}"
11-
git checkout master
12-
git merge $branch
13-
git push origin master
14-
git push ${CI_ORG}/CodeIgniter4 master
15-
1610
echo -e "${BOLD}Merge release into develop${NORMAL}"
1711
git checkout develop
1812
git merge $branch
1913
git push origin develop
2014
git push ${CI_ORG}/CodeIgniter4 develop
2115

16+
echo -e "${BOLD}Merge develop into master${NORMAL}"
17+
git checkout master
18+
git merge develop
19+
git push origin master
20+
git push ${CI_ORG}/CodeIgniter4 master
21+
2222
echo -e "${BOLD}Pushing to the user guide repository${NORMAL}"
2323
cd ${CI_DIR}/dist/userguide
2424
git push origin master

‎phpdoc.dist.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<?xml version="1.0" encoding="UTF-8" ?>
22
<phpdoc>
3-
<title>CodeIgniter v4.0 API</title>
3+
<title>CodeIgniter v4.0.0 API</title>
44
<parser>
55
<target>api/data/</target>
66
</parser>

‎user_guide_src/source/changelogs/next.rst

Lines changed: 173 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,185 @@
1-
Version 4.0.0-dev
1+
Version |version|
22
====================================================
33

44
Release Date: Not released
55

6-
**Next release of CodeIgniter4**
6+
Highlights:
77

8+
- Type hinting added throughout & typos corrected (see API docs)
9+
- Fixed a number of model, database, validation & debug toolbar issues
10+
11+
New messages:
12+
13+
- Database.FieldNotExists
14+
- Validation.equals, not_equals
15+
16+
App changes:
17+
18+
- Removed $salt config item in app/Config/App
19+
- Enabled migrations by default in app/Config/Migrations
20+
- Simplified public/.htaccess
821

922
The list of changed files follows, with PR numbers shown.
1023

24+
- admin/
25+
- framework/composer.json #1935
26+
- starter/composer.json #1935
27+
28+
- app/
29+
- Config/
30+
- App #1973
31+
- Migrations #1973
32+
33+
- public/
34+
- .htaccess #1973
35+
36+
- system/
37+
- API/
38+
- ResponseTrait #1962
39+
- Commands/
40+
- Server/rewrite #1925
41+
- Config/
42+
- AutoloadConfig #1974
43+
- BaseConfig #1947
44+
- Database/ #1938
45+
- BaseBuilder #1923, #1933, #1950
46+
- BaseConnection #1950
47+
- BaseResult #1917
48+
- BaseUtils #1917
49+
- Forge #1917
50+
- SQLite3/
51+
- Connection #1917
52+
- Result #1917
53+
- Debug/
54+
- Toolbar #1916
55+
- Toolbar/Collectors/
56+
- BaseCollector #1972
57+
- Config #1973
58+
- History #1945
59+
- Routes #1949
60+
- Toolbar/Views/
61+
- _config.tpl.php #1973
62+
- toolbar.tpl.php #1972
63+
- toolbarloader.js #1931, #1961
64+
- Exceptions/
65+
- EntityException #1927
66+
- Filters/
67+
Filters #1970, #1985
68+
- Format/
69+
- FormatterInterface #1918
70+
- JSONFormatter #1918
71+
- XMLFormatter #1918
72+
- HTTP/
73+
- CLIRequest #1956
74+
- CURLRequest #1915
75+
- Images/Handlers/
76+
- BaseHandler #1956
77+
- Language/en/
78+
- Database #1917
79+
- Validation #1952
80+
- Router/
81+
- Router #1968
82+
- RouteCollection #1977
83+
- Session/Handlers/
84+
- RedisHandler #1980
85+
- Test/
86+
- FeatureResponse #1977
87+
- FeatureTestCase #1977
88+
- Validation/
89+
- FormatRules #1957
90+
- Rules #1952
91+
- View/
92+
- Table #1984
93+
- Entity #1911, #1927, #1943, #1950, #1955
94+
- Model #1930, #1943, #1963, #1981
95+
96+
- tests/system/
97+
- Config/
98+
- BaseConfigTest #1947
99+
- Database/
100+
- BaseQueryTest #1917
101+
- Live/
102+
- DbUtilsTest #1917, #1943
103+
- ForgeTest #1917
104+
- GetTest #1917, #1943
105+
- ModelTest #1930, #1943, #1981
106+
- Migrations/
107+
- MigrationRunnerTest #1917
108+
- MigrationTest #1943
109+
- Filters/
110+
- FilterTest #1985
111+
- Test/
112+
- FeatureTestCaseTest #1977
113+
- Validation/
114+
- FormatRulesTest #1957
115+
- RulesTest #1952, #cbe4b1d
116+
- View/
117+
- TableTest #1978, #1984
118+
- EntityTest #1911
119+
120+
- user_guide_src/
121+
- dbmgmt/
122+
- migrations #1973
123+
- installation/
124+
- installing_composer #1926
125+
- running #1935
126+
- libraries/
127+
- validation #1952, #1954, #1957
128+
- outgoing/
129+
- index #1978
130+
- table #1978, #1984
131+
- testing/
132+
- feature #1977
133+
- overview #1936
134+
135+
- .htaccess #1939
136+
- composer.json #1935
137+
- phpdoc.dist.xml #1987
11138

12139
PRs merged:
13140
-----------
14141

142+
- #1987 Correct API docblock problems for phpdocs
143+
- #1986 Update docblock version to 4.0.0
144+
- #1985 Fix filter processing. Fixes #1907
145+
- #cbe4b1d Fix SQLite tests
146+
- #1984 Add footing to HTML Table
147+
- #1981 Using soft deletes should not return an ambiguous field message when joining tables
148+
- #1980 Corrected return value for Session/RedisHandler::read
149+
- #1978 Implement HTML Table for CI4 (missed feature)
150+
- #1977 Test/featuretestcase
151+
- #1974 Remove framework classes from the autoloader classmap
152+
- #1973 Defaultfixes
153+
- #1972 Toolbar fix for custom collectors
154+
- #1970 Add back filter arguments
155+
- #1968 Fixed pathinfo mode 404 error
156+
- #1963 String type primary key should also wrap into an array during db update
157+
- #1962 Fix side issue
158+
- #1961 Fix Debugbar url tail slash issue
159+
- #1957 New generic string validation rule
160+
- #1956 Use Null Coalesce Operator
161+
- #1955 Travis-CI build failed fix
162+
- #1954 Fix validation table format
163+
- #1952 Add Validations for `equals()` and `not_equals()`
164+
- #1951 System typos changes & code cleanup
165+
- #1950 Fix some side issue
166+
- #1949 Toobar/Routes correction
167+
- #1947 Fix BaseConfig didn't load Registrar files properly
168+
- #1945 Fix datetime extraction from debugbar file
169+
- #1943 Model, Entity, Exception & Migration test cases
170+
- #1939 Remove section that prevents hotlinking
171+
- #1938 Database typos changes
172+
- #1936 Docs: improce app testing writeup
173+
- #1935 Update phpunit.xml scripts. Fixes #1932
174+
- #1933 having (Is NULL deletion)
175+
- #1931 Toolbar IE11 fix
176+
- #1930 Model Changes w.r.t. #1773
177+
- #1927 Entity exception for non existed props
178+
- #1926 Docs: update installation guide
179+
- #1925 removed $_SERVER['CI_ENVIRONMENT']
180+
- #1923 missing return
181+
- #1918 JSONFormatter
182+
- #1917 Database Test Cases
183+
- #1916 Check if the value is string
184+
- #1915 Fix for POST + JSON (Content-Length added)
185+
- #1911 JSON Cast exception test cases

0 commit comments

Comments
 (0)