Skip to content

Commit 28917b7

Browse files
committed
Merge branch 'develop' into feature/sqlite
2 parents b7e06c2 + 3dd106a commit 28917b7

69 files changed

Lines changed: 1021 additions & 571 deletions

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.
Lines changed: 36 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,36 @@
1+
---
2+
name: Bug report
3+
about: Create a report to help us improve
4+
5+
---
6+
7+
---
8+
name: Bug report
9+
about: Help us improve the framework by reporting bugs!
10+
11+
---
12+
13+
**Direction**
14+
We use github issues to track bugs, not for support.
15+
If you have a support question, or a feature request, raise these as threads on our
16+
[forum](https://forum.codeigniter.com/index.php).
17+
18+
**Describe the bug**
19+
A clear and concise description of what the bug is.
20+
21+
**CodeIgniter 4 version**
22+
Which version (and branch, if applicable) the bug is in.
23+
24+
**Affected module(s)**
25+
Which package or class is the bug in, if known.
26+
27+
**Expected behavior, and steps to reproduce if appropriate**
28+
A clear and concise description of what you expected to happen,
29+
and how you got there.
30+
Feel free to include a text/log extract, but use a pastebin facility for any
31+
screenshots you deem necessary.
32+
33+
**Context**
34+
- OS: [e.g. Windows 99]
35+
- Web server [e.g. Apache 1.2.3]
36+
- PHP version [e.g. 6.5.4]

.gitignore

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -57,6 +57,10 @@ writable/logs/*
5757
!writable/logs/index.html
5858
!writable/logs/.htaccess
5959

60+
writable/session/*
61+
!writable/session/index.html
62+
!writable/session/.htaccess
63+
6064
writable/uploads/*
6165
!writable/uploads/index.html
6266
!writable/uploads/.htaccess

CODE_OF_CONDUCT.md

Lines changed: 46 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,46 @@
1+
# Contributor Covenant Code of Conduct
2+
3+
## Our Pledge
4+
5+
In the interest of fostering an open and welcoming environment, we as contributors and maintainers pledge to making participation in our project and our community a harassment-free experience for everyone, regardless of age, body size, disability, ethnicity, gender identity and expression, level of experience, nationality, personal appearance, race, religion, or sexual identity and orientation.
6+
7+
## Our Standards
8+
9+
Examples of behavior that contributes to creating a positive environment include:
10+
11+
* Using welcoming and inclusive language
12+
* Being respectful of differing viewpoints and experiences
13+
* Gracefully accepting constructive criticism
14+
* Focusing on what is best for the community
15+
* Showing empathy towards other community members
16+
17+
Examples of unacceptable behavior by participants include:
18+
19+
* The use of sexualized language or imagery and unwelcome sexual attention or advances
20+
* Trolling, insulting/derogatory comments, and personal or political attacks
21+
* Public or private harassment
22+
* Publishing others' private information, such as a physical or electronic address, without explicit permission
23+
* Other conduct which could reasonably be considered inappropriate in a professional setting
24+
25+
## Our Responsibilities
26+
27+
Project maintainers are responsible for clarifying the standards of acceptable behavior and are expected to take appropriate and fair corrective action in response to any instances of unacceptable behavior.
28+
29+
Project maintainers have the right and responsibility to remove, edit, or reject comments, commits, code, wiki edits, issues, and other contributions that are not aligned to this Code of Conduct, or to ban temporarily or permanently any contributor for other behaviors that they deem inappropriate, threatening, offensive, or harmful.
30+
31+
## Scope
32+
33+
This Code of Conduct applies both within project spaces and in public spaces when an individual is representing the project or its community. Examples of representing a project or community include using an official project e-mail address, posting via an official social media account, or acting as an appointed representative at an online or offline event. Representation of a project may be further defined and clarified by project maintainers.
34+
35+
## Enforcement
36+
37+
Instances of abusive, harassing, or otherwise unacceptable behavior may be reported by contacting the project team at admin@codeigniter.com. The project team will review and investigate all complaints, and will respond in a way that it deems appropriate to the circumstances. The project team is obligated to maintain confidentiality with regard to the reporter of an incident. Further details of specific enforcement policies may be posted separately.
38+
39+
Project maintainers who do not follow or enforce the Code of Conduct in good faith may face temporary or permanent repercussions as determined by other members of the project's leadership.
40+
41+
## Attribution
42+
43+
This Code of Conduct is adapted from the [Contributor Covenant][homepage], version 1.4, available at [http://contributor-covenant.org/version/1/4][version]
44+
45+
[homepage]: http://contributor-covenant.org
46+
[version]: http://contributor-covenant.org/version/1/4/

PULL_REQUEST_TEMPLATE.md

Lines changed: 22 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,22 @@
1+
Each pull request should address a single issue, and have a meaningful title.
2+
3+
**Description**
4+
Explain what you have changed, and why.
5+
6+
**Checklist:**
7+
- [ ] Securely signed commits
8+
- [ ] Component(s) with PHPdocs
9+
- [ ] Unit testing, with >80% coverage
10+
- [ ] User guide updated
11+
- [ ] Conforms to style guide
12+
13+
---------Remove from here down in your description----------
14+
15+
**Notes**
16+
- Pull requests must be in English
17+
- If the PR solves an issue, reference it with a suitable verb and the issue number
18+
(e.g. fixes <hash>12345
19+
- Unsolicited PRs will be considered, but there is no guarantee of acceptance
20+
- Pull requests should be from a feature branch in the contributor's fork of the repository
21+
to the develop branch of the project repository
22+

application/Config/App.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -184,7 +184,7 @@ class App extends BaseConfig
184184
public $sessionDriver = 'CodeIgniter\Session\Handlers\FileHandler';
185185
public $sessionCookieName = 'ci_session';
186186
public $sessionExpiration = 7200;
187-
public $sessionSavePath = null;
187+
public $sessionSavePath = WRITEPATH . 'session';
188188
public $sessionMatchIP = false;
189189
public $sessionTimeToUpdate = 300;
190190
public $sessionRegenerateDestroy = false;

application/Config/Logger.php

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -18,15 +18,15 @@ class Logger extends BaseConfig
1818
| 2 = Alert Messages - Action Must Be Taken Immediately
1919
| 3 = Critical Messages - Application component unavailable, unexpected exception.
2020
| 4 = Runtime Errors - Don't need immediate action, but should be monitored.
21-
| 5 = Debug - Detailed debug information.
22-
| 6 = Warnings - Exceptional occurrences that are not errors.
23-
| 7 = Notices - Normal but significant events.
24-
| 8 = Info - Interesting events, like user logging in, etc.
21+
| 5 = Warnings - Exceptional occurrences that are not errors.
22+
| 6 = Notices - Normal but significant events.
23+
| 7 = Info - Interesting events, like user logging in, etc.
24+
| 8 = Debug - Detailed debug information.
2525
| 9 = All Messages
2626
|
2727
| You can also pass an array with threshold levels to show individual error types
2828
|
29-
| array(1, 2, 3, 5) = Emergency, Alert, Critical, and Debug messages
29+
| array(1, 2, 3, 8) = Emergency, Alert, Critical, and Debug messages
3030
|
3131
| For a live site you'll usually enable Critical or higher (3) to be logged otherwise
3232
| your log files will fill up very fast.

application/Config/Modules.php

Lines changed: 54 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,54 @@
1+
<?php namespace Config;
2+
3+
// Cannot extend BaseConfig or looping resources occurs.
4+
class Modules
5+
{
6+
/*
7+
|--------------------------------------------------------------------------
8+
| Auto-Discovery Enabled?
9+
|--------------------------------------------------------------------------
10+
|
11+
| If true, then auto-discovery will happen across all elements listed in
12+
| $activeExplorers below. If false, no auto-discovery will happen at all,
13+
| giving a slight performance boost.
14+
*/
15+
public $enabled = true;
16+
17+
/*
18+
|--------------------------------------------------------------------------
19+
| Auto-discover Rules
20+
|--------------------------------------------------------------------------
21+
|
22+
| Lists the aliases of all discovery classes that will be active
23+
| and used during the current application request. If it is not
24+
| listed here, only the base application elements will be used.
25+
*/
26+
public $activeExplorers = [
27+
'events',
28+
'registrars',
29+
'routes',
30+
'services',
31+
];
32+
33+
/**
34+
* Should the application auto-discover the requested resources.
35+
*
36+
* Valid values are:
37+
* - events
38+
* - registrars
39+
* - routes
40+
* - services
41+
*
42+
* @param string $alias
43+
*
44+
* @return bool
45+
*/
46+
public function shouldDiscover(string $alias)
47+
{
48+
if (! $this->enabled) return false;
49+
50+
$alias = strtolower($alias);
51+
52+
return in_array($alias, $this->activeExplorers);
53+
}
54+
}

application/Config/Routes.php

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -64,7 +64,6 @@
6464
$routes->setTranslateURIDashes(false);
6565
$routes->set404Override();
6666
$routes->setAutoRoute(true);
67-
$routes->discoverLocal(false);
6867

6968
/**
7069
* --------------------------------------------------------------------

composer.json

Lines changed: 33 additions & 35 deletions
Original file line numberDiff line numberDiff line change
@@ -1,37 +1,35 @@
11
{
2-
"description": "The CodeIgniter framework v4",
3-
"name": "codeigniter4/framework",
4-
"type": "project",
5-
"homepage": "https://codeigniter.com",
6-
"license": "MIT",
7-
"support": {
8-
"forum": "http://forum.codeigniter.com/",
9-
"wiki": "https://github.com/bcit-ci/CodeIgniter4/wiki",
10-
"slack": "https://codeigniterchat.slack.com",
11-
"source": "https://github.com/bcit-ci/CodeIgniter4"
12-
},
13-
"autoload": {
14-
"psr-4": {
15-
"CodeIgniter\\": "system/",
16-
"Psr\\Log\\": "system/ThirdParty/PSR/Log/"
17-
}
18-
},
19-
"require": {
20-
"php": ">=7.1",
21-
"zendframework/zend-escaper": "^2.5",
22-
"paragonie/sodium_compat": "^1.1",
23-
"kint-php/kint": "^2.1",
24-
"ext-intl": "*"
25-
},
26-
"require-dev": {
27-
"phpunit/phpunit": "^7.0",
28-
"mikey179/vfsStream": "1.6.*",
29-
"codeigniter4/codeigniter4-standard": "^1.0"
30-
},
31-
"scripts": {
32-
"post-update-cmd": [
33-
"composer dump-autoload",
34-
"CodeIgniter\\ComposerScripts::postUpdate"
35-
]
36-
}
2+
"description": "The CodeIgniter framework v4",
3+
"name": "codeigniter4/framework",
4+
"type": "project",
5+
"homepage": "https://codeigniter.com",
6+
"license": "MIT",
7+
"support": {
8+
"forum": "http://forum.codeigniter.com/",
9+
"slack": "https://codeigniterchat.slack.com",
10+
"source": "https://github.com/bcit-ci/CodeIgniter4"
11+
},
12+
"autoload": {
13+
"psr-4": {
14+
"CodeIgniter\\": "system/",
15+
"Psr\\Log\\": "system/ThirdParty/PSR/Log/"
16+
}
17+
},
18+
"require": {
19+
"php": ">=7.1",
20+
"zendframework/zend-escaper": "^2.5",
21+
"kint-php/kint": "^2.1",
22+
"ext-intl": "*"
23+
},
24+
"require-dev": {
25+
"phpunit/phpunit": "^7.0",
26+
"mikey179/vfsStream": "1.6.*",
27+
"codeigniter4/codeigniter4-standard": "^1.0"
28+
},
29+
"scripts": {
30+
"post-update-cmd": [
31+
"composer dump-autoload",
32+
"CodeIgniter\\ComposerScripts::postUpdate"
33+
]
34+
}
3735
}

contributing.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55

66
We expect all contributions to conform to our style guide, be commented (inside the PHP source files),
77
be documented (in the user guide), and unit tested (in the test folder).
8-
There is a [Contributing to CodeIgniter](https://bcit-ci.github.io/CodeIgniter4/contributing/index.html) section in the user guide which describes the contribution process; this page is an overview.
8+
There is a [Contributing to CodeIgniter](./contributing/index.rst) section in the repository which describes the contribution process; this page is an overview.
99

1010
## Issues
1111

@@ -35,7 +35,7 @@ If you change anything that requires a change to documentation then you will nee
3535

3636
### Compatibility
3737

38-
CodeIgniter4 requires PHP 7.
38+
CodeIgniter4 requires PHP 7.1.
3939

4040
### Branching
4141

0 commit comments

Comments
 (0)