Skip to content

Commit ef49fed

Browse files
committed
Merge branch 'develop' of https://github.com/codeIgniter4/CodeIgniter4 into tests-refactor
2 parents 1ea7b72 + 84c261d commit ef49fed

117 files changed

Lines changed: 11099 additions & 471 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

CONTRIBUTING.md

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ We expect all contributions to conform to our [style guide](https://github.com/c
77
be documented (in the [user guide](https://codeigniter4.github.io/userguide/)), and unit tested (in the [test folder](https://github.com/codeigniter4/CodeIgniter4/tree/develop/tests)).
88
There is a [Contributing to CodeIgniter](./contributing/README.rst) section in the repository which describes the contribution process; this page is an overview.
99

10-
Note, we expect all code changes or bug-fixes to be accompanied by one or more tests added to our test suite to prove the code works. If pull requests are not accompanied by relevant tests, they will likely be closed. Since we are a team of volunteers, we don't have any more time to work on the framework than you do. Please make it as painless for your contributions to be included as possible. If you need help with getting tests running on your local machines, ask for help on the forusm. We would be happy to help out.
10+
Note, we expect all code changes or bug-fixes to be accompanied by one or more tests added to our test suite to prove the code works. If pull requests are not accompanied by relevant tests, they will likely be closed. Since we are a team of volunteers, we don't have any more time to work on the framework than you do. Please make it as painless for your contributions to be included as possible. If you need help with getting tests running on your local machines, ask for help on the forums. We would be happy to help out.
1111

1212
The [Open Source Guide](https://opensource.guide/) is a good first read for those new to contributing to open source!
1313
## Issues
@@ -25,7 +25,7 @@ Reporting Issues is helpful, but an even [better approach](./contributing/workfl
2525
Before we look into how to contribute to CodeIgniter4, here are some guidelines. If your Pull Requests fail
2626
to pass these guidelines, they will be declined, and you will need to re-submit
2727
when you’ve made the changes. This might sound a bit tough, but it is required
28-
for us to maintain quality of the codebase.
28+
for us to maintain the quality of the codebase.
2929

3030
### PHP Style
3131

@@ -61,7 +61,7 @@ each other and from whatever else you are doing with your repository!
6161

6262
### Signing
6363

64-
You must [GPG-sign](./contributing/signing.rst) your work, certifying that you either wrote the work or otherwise have the right to pass it on to an open source project. This is *not* just a "signed-off-by" commit, but instead, a digitally signed one.
64+
You must [GPG-sign](./contributing/signing.rst) your work, certifying that you either wrote the work or otherwise have the right to pass it on to an open-source project. This is *not* just a "signed-off-by" commit, but instead, a digitally signed one.
6565

6666
## How-to Guide
6767

admin/userguide/README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ It has been built from the
1313

1414
More information about the plans for version 4 can be found in [the announcement](http://forum.codeigniter.com/thread-62615.html) on the forums.
1515

16-
##Installation & updates
16+
## Installation & updates
1717

1818
`composer require codeigniter4/userguide` will install a copy
1919
of the user guide inside your project, at

app/Config/App.php

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -265,5 +265,4 @@ class App extends BaseConfig
265265
| - http://www.w3.org/TR/CSP/
266266
*/
267267
public $CSPEnabled = false;
268-
269268
}

app/Config/Kint.php

Lines changed: 62 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,62 @@
1+
<?php namespace Config;
2+
3+
use Kint\Renderer\Renderer;
4+
use CodeIgniter\Config\BaseConfig;
5+
6+
class Kint extends BaseConfig
7+
{
8+
/*
9+
|--------------------------------------------------------------------------
10+
| Kint
11+
|--------------------------------------------------------------------------
12+
|
13+
| We use Kint's RichRenderer and CLIRenderer. This area contains options
14+
| that you can set to customize how Kint works for you.
15+
|
16+
| For details on these settings, see Kint's docs:
17+
| https://kint-php.github.io/kint/
18+
|
19+
*/
20+
21+
/*
22+
|--------------------------------------------------------------------------
23+
| Global Settings
24+
|--------------------------------------------------------------------------
25+
*/
26+
27+
public $plugins = null;
28+
29+
public $maxDepth = 6;
30+
31+
public $displayCalledFrom = true;
32+
33+
public $expanded = false;
34+
35+
/*
36+
|--------------------------------------------------------------------------
37+
| RichRenderer Settings
38+
|--------------------------------------------------------------------------
39+
*/
40+
public $richTheme = 'aante-light.css';
41+
42+
public $richFolder = false;
43+
44+
public $richSort = Renderer::SORT_FULL;
45+
46+
public $richObjectPlugins = null;
47+
48+
public $richTabPlugins = null;
49+
50+
/*
51+
|--------------------------------------------------------------------------
52+
| CLI Settings
53+
|--------------------------------------------------------------------------
54+
*/
55+
public $cliColors = true;
56+
57+
public $cliForceUTF8 = false;
58+
59+
public $cliDetectWidth = true;
60+
61+
public $cliMinWidth = 40;
62+
}

0 commit comments

Comments
 (0)