Skip to content

Commit

Permalink
Merge pull request #1685 from jim-parry/fix/admin
Browse files Browse the repository at this point in the history
Fix admin - app starter creation
  • Loading branch information
jim-parry authored Jan 24, 2019
2 parents 13aa2ab + 04a9091 commit d268436
Show file tree
Hide file tree
Showing 3 changed files with 112 additions and 13 deletions.
4 changes: 0 additions & 4 deletions admin/release-appstarter
Original file line number Diff line number Diff line change
Expand Up @@ -23,10 +23,6 @@ done
echo -e "${BOLD}Override as needed...${NORMAL}"
cp -rf ${CI_DIR}/admin/starter/* .

############# this can only happen after composer create-project/update
#echo -e "${BOLD}Fix paths...${NORMAL}"
#sed -i "/public $systemDirectory = 'system';/s/'system'/'vendor/codeigniter4/framework/system'/" app/Config/Paths.php

#---------------------------------------------------
# And finally, get ready for merging
echo -e "${BOLD}Assemble the pieces...${NORMAL}"
Expand Down
77 changes: 77 additions & 0 deletions admin/starter/app/Config/Paths.php
Original file line number Diff line number Diff line change
@@ -0,0 +1,77 @@
<?php namespace Config;

/**
* Holds the paths that are used by the system to
* locate the main directories, app, system, etc.
* Modifying these allows you to re-structure your application,
* share a system folder between multiple applications, and more.
*
* All paths are relative to the project's root folder.
*/

class Paths
{
/*
*---------------------------------------------------------------
* SYSTEM FOLDER NAME
*---------------------------------------------------------------
*
* This variable must contain the name of your "system" folder.
* Include the path if the folder is not in the same directory
* as this file.
*/
public $systemDirectory = __DIR__ . '/../../vendor/codeigniter4/framework/system';

/*
*---------------------------------------------------------------
* APPLICATION FOLDER NAME
*---------------------------------------------------------------
*
* If you want this front controller to use a different "app"
* folder than the default one you can set its name here. The folder
* can also be renamed or relocated anywhere on your getServer. If
* you do, use a full getServer path. For more info please see the user guide:
* http://codeigniter.com/user_guide/general/managing_apps.html
*
* NO TRAILING SLASH!
*/
public $appDirectory = __DIR__ . '/..';

/*
* ---------------------------------------------------------------
* WRITABLE DIRECTORY NAME
* ---------------------------------------------------------------
*
* This variable must contain the name of your "writable" directory.
* The writable directory allows you to group all directories that
* need write permission to a single place that can be tucked away
* for maximum security, keeping it out of the app and/or
* system directories.
*/
public $writableDirectory = __DIR__ . '/../../writable';

/*
* ---------------------------------------------------------------
* TESTS DIRECTORY NAME
* ---------------------------------------------------------------
*
* This variable must contain the name of your "tests" directory.
* The writable directory allows you to group all directories that
* need write permission to a single place that can be tucked away
* for maximum security, keeping it out of the app and/or
* system directories.
*/
public $testsDirectory = __DIR__ . '/../../tests';

/*
* ---------------------------------------------------------------
* VIEW DIRECTORY NAME
* ---------------------------------------------------------------
*
* This variable must contain the name of the directory that
* contains the view files used by your application. By
* default this is in `app/Views`. This value
* is used when no value is provided to `Services::renderer()`.
*/
public $viewDirectory = __DIR__ . '/../Views';
}
44 changes: 35 additions & 9 deletions user_guide_src/source/changelogs/next.rst
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,8 @@ Release Date: Not released
- updated PHP dependency to 7.2
- new feature branches have been created for the email and queue modules, so they don't impact the release of 4.0.0
- dropped several language messages that were unused (eg Migrations.missingTable) and added some new (eg Migrations.invalidType)
- lots of bug fixes
- lots of bug fixes, especially for the database support
- revisited the installation and tutorial sections of the user guide
- code coverage is up to 78%

The list of changed files follows, with PR numbers shown.
Expand All @@ -31,16 +32,22 @@ The list of changed files follows, with PR numbers shown.
- Autoloader/
- Autoloader #1665, #1672
- FileLocator #1665
- Commands/
- Database/MigrationRollback #1683
- Config/
- BaseConfig #1635
- BaseService #1635, #1665
- Paths #1626
- Services #614216, #3a4ade, #1643
- View #1616
- Database/
- BaseBuilder #1640, #1663
- BaseBuilder #1640, #1663, #1677
- BaseConnection #1677
- Config #6b8b8b, #1660
- MigrationRunner #81d371, #1660
- Query #1677
- Database/Postgre/
- Builder #d2b377
- Debug/Toolbar/Collectors/
- Logs #1654
- Views #3a4ade
Expand All @@ -59,14 +66,18 @@ The list of changed files follows, with PR numbers shown.
- xml_helper #1641
- HTTP/
- ContentSecurityPolicy #1641, #1642
- URI #2e698a
- Language/
- /en/Files #1636
- Language #1641
- Log/
- Handlers/FileHandler #1641
- Router/
- RouteCollection #1665
- Router #9e435c, #7993a7
- Router #9e435c, #7993a7, #1678
- Session/Handlers/
- BaseHandler #1684
- FileHandler #1684
- bootstrap #81d371, #1665
- Common #1660
- Entity #1623, #1622
Expand All @@ -89,16 +100,19 @@ The list of changed files follows, with PR numbers shown.
- ConfigTest #1643
- ServicesTest #1635, #1643
- Database/Builder/
- DeleteTest #1677
- GroupTest #1640
- InsertTest #1640
- LikeTest #1640
- InsertTest #1640, #1677
- LikeTest #1640, #1677
- SelectTest #1663
- UpdateTest #1640
- WhereTest #1640
- UpdateTest #1640, #1677
- WhereTest #1640, #1677
- Database/Live/
- ConnectTest #1660
- AliasTest #1675
- ConnectTest #1660, #1675
- ForgeTest #6b8b8b
- Migrations/MigrationRunnerTest #1660
- InsertTest #1677
- Migrations/MigrationRunnerTest #1660, #1675
- ModelTest #1617
- Events/
- EventTest #1635
Expand Down Expand Up @@ -132,6 +146,9 @@ The list of changed files follows, with PR numbers shown.
- modules #1613, #1665
- helpers/
- form_helper #1633
- incoming/
- index #4a1886
- methodspoofing #4a1886
- installation/
- downloads.rst #1673
- installation #1673
Expand All @@ -147,6 +164,15 @@ The list of changed files follows, with PR numbers shown.
PRs merged:
-----------

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

0 comments on commit d268436

Please sign in to comment.