Skip to content

Commit d268436

Browse files
jim-parryjim-parry
authored
Merge pull request #1685 from jim-parry/fix/admin
Fix admin - app starter creation
2 parents 13aa2ab + 04a9091 commit d268436

3 files changed

Lines changed: 112 additions & 13 deletions

File tree

‎admin/release-appstarter‎

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -23,10 +23,6 @@ done
2323
echo -e "${BOLD}Override as needed...${NORMAL}"
2424
cp -rf ${CI_DIR}/admin/starter/* .
2525

26-
############# this can only happen after composer create-project/update
27-
#echo -e "${BOLD}Fix paths...${NORMAL}"
28-
#sed -i "/public $systemDirectory = 'system';/s/'system'/'vendor/codeigniter4/framework/system'/" app/Config/Paths.php
29-
3026
#---------------------------------------------------
3127
# And finally, get ready for merging
3228
echo -e "${BOLD}Assemble the pieces...${NORMAL}"

‎admin/starter/app/Config/Paths.php‎

Lines changed: 77 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,77 @@
1+
<?php namespace Config;
2+
3+
/**
4+
* Holds the paths that are used by the system to
5+
* locate the main directories, app, system, etc.
6+
* Modifying these allows you to re-structure your application,
7+
* share a system folder between multiple applications, and more.
8+
*
9+
* All paths are relative to the project's root folder.
10+
*/
11+
12+
class Paths
13+
{
14+
/*
15+
*---------------------------------------------------------------
16+
* SYSTEM FOLDER NAME
17+
*---------------------------------------------------------------
18+
*
19+
* This variable must contain the name of your "system" folder.
20+
* Include the path if the folder is not in the same directory
21+
* as this file.
22+
*/
23+
public $systemDirectory = __DIR__ . '/../../vendor/codeigniter4/framework/system';
24+
25+
/*
26+
*---------------------------------------------------------------
27+
* APPLICATION FOLDER NAME
28+
*---------------------------------------------------------------
29+
*
30+
* If you want this front controller to use a different "app"
31+
* folder than the default one you can set its name here. The folder
32+
* can also be renamed or relocated anywhere on your getServer. If
33+
* you do, use a full getServer path. For more info please see the user guide:
34+
* http://codeigniter.com/user_guide/general/managing_apps.html
35+
*
36+
* NO TRAILING SLASH!
37+
*/
38+
public $appDirectory = __DIR__ . '/..';
39+
40+
/*
41+
* ---------------------------------------------------------------
42+
* WRITABLE DIRECTORY NAME
43+
* ---------------------------------------------------------------
44+
*
45+
* This variable must contain the name of your "writable" directory.
46+
* The writable directory allows you to group all directories that
47+
* need write permission to a single place that can be tucked away
48+
* for maximum security, keeping it out of the app and/or
49+
* system directories.
50+
*/
51+
public $writableDirectory = __DIR__ . '/../../writable';
52+
53+
/*
54+
* ---------------------------------------------------------------
55+
* TESTS DIRECTORY NAME
56+
* ---------------------------------------------------------------
57+
*
58+
* This variable must contain the name of your "tests" directory.
59+
* The writable directory allows you to group all directories that
60+
* need write permission to a single place that can be tucked away
61+
* for maximum security, keeping it out of the app and/or
62+
* system directories.
63+
*/
64+
public $testsDirectory = __DIR__ . '/../../tests';
65+
66+
/*
67+
* ---------------------------------------------------------------
68+
* VIEW DIRECTORY NAME
69+
* ---------------------------------------------------------------
70+
*
71+
* This variable must contain the name of the directory that
72+
* contains the view files used by your application. By
73+
* default this is in `app/Views`. This value
74+
* is used when no value is provided to `Services::renderer()`.
75+
*/
76+
public $viewDirectory = __DIR__ . '/../Views';
77+
}

‎user_guide_src/source/changelogs/next.rst‎

Lines changed: 35 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,8 @@ Release Date: Not released
88
- updated PHP dependency to 7.2
99
- new feature branches have been created for the email and queue modules, so they don't impact the release of 4.0.0
1010
- dropped several language messages that were unused (eg Migrations.missingTable) and added some new (eg Migrations.invalidType)
11-
- lots of bug fixes
11+
- lots of bug fixes, especially for the database support
12+
- revisited the installation and tutorial sections of the user guide
1213
- code coverage is up to 78%
1314

1415
The list of changed files follows, with PR numbers shown.
@@ -31,16 +32,22 @@ The list of changed files follows, with PR numbers shown.
3132
- Autoloader/
3233
- Autoloader #1665, #1672
3334
- FileLocator #1665
35+
- Commands/
36+
- Database/MigrationRollback #1683
3437
- Config/
3538
- BaseConfig #1635
3639
- BaseService #1635, #1665
3740
- Paths #1626
3841
- Services #614216, #3a4ade, #1643
3942
- View #1616
4043
- Database/
41-
- BaseBuilder #1640, #1663
44+
- BaseBuilder #1640, #1663, #1677
45+
- BaseConnection #1677
4246
- Config #6b8b8b, #1660
4347
- MigrationRunner #81d371, #1660
48+
- Query #1677
49+
- Database/Postgre/
50+
- Builder #d2b377
4451
- Debug/Toolbar/Collectors/
4552
- Logs #1654
4653
- Views #3a4ade
@@ -59,14 +66,18 @@ The list of changed files follows, with PR numbers shown.
5966
- xml_helper #1641
6067
- HTTP/
6168
- ContentSecurityPolicy #1641, #1642
69+
- URI #2e698a
6270
- Language/
6371
- /en/Files #1636
6472
- Language #1641
6573
- Log/
6674
- Handlers/FileHandler #1641
6775
- Router/
6876
- RouteCollection #1665
69-
- Router #9e435c, #7993a7
77+
- Router #9e435c, #7993a7, #1678
78+
- Session/Handlers/
79+
- BaseHandler #1684
80+
- FileHandler #1684
7081
- bootstrap #81d371, #1665
7182
- Common #1660
7283
- Entity #1623, #1622
@@ -89,16 +100,19 @@ The list of changed files follows, with PR numbers shown.
89100
- ConfigTest #1643
90101
- ServicesTest #1635, #1643
91102
- Database/Builder/
103+
- DeleteTest #1677
92104
- GroupTest #1640
93-
- InsertTest #1640
94-
- LikeTest #1640
105+
- InsertTest #1640, #1677
106+
- LikeTest #1640, #1677
95107
- SelectTest #1663
96-
- UpdateTest #1640
97-
- WhereTest #1640
108+
- UpdateTest #1640, #1677
109+
- WhereTest #1640, #1677
98110
- Database/Live/
99-
- ConnectTest #1660
111+
- AliasTest #1675
112+
- ConnectTest #1660, #1675
100113
- ForgeTest #6b8b8b
101-
- Migrations/MigrationRunnerTest #1660
114+
- InsertTest #1677
115+
- Migrations/MigrationRunnerTest #1660, #1675
102116
- ModelTest #1617
103117
- Events/
104118
- EventTest #1635
@@ -132,6 +146,9 @@ The list of changed files follows, with PR numbers shown.
132146
- modules #1613, #1665
133147
- helpers/
134148
- form_helper #1633
149+
- incoming/
150+
- index #4a1886
151+
- methodspoofing #4a1886
135152
- installation/
136153
- downloads.rst #1673
137154
- installation #1673
@@ -147,6 +164,15 @@ The list of changed files follows, with PR numbers shown.
147164
PRs merged:
148165
-----------
149166

167+
- #1684 Updating session id cleanup for filehandler
168+
- #1683 Fix migrate:refresh bug
169+
- #d2b377 Fix Postgres replace command to work new way of storing binds
170+
- #4a1886 Document method spoofing
171+
- #2e698a urldecode URI keys as well as values.
172+
- #1678 fix route not replacing forward slashes
173+
- #1677 Implement Don't Escape feature for db engine
174+
- #1675 Add missing test group directives
175+
- #1674 Update changelog
150176
- #1673 Updated download & installation docs
151177
- #1672 Update Autoloader.php
152178
- #1670 Update PHP dependency to 7.2

0 commit comments

Comments
 (0)