mirror_php/winter
1
0
Fork 0
mirror of https://github.com/wintercms/winter.git synced 2024-06-28 05:33:29 +02:00
Code Issues Projects Releases Wiki Activity

Backport changes from 1.2 and ignore public directory in default .gitignore

Browse Source
This commit is contained in:
Luke Towers 2021-12-14 02:29:17 -06:00
parent 2e4eacb58c
commit 7473cbe27b
4 changed files with 14 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
.gitignore vendored
View File

@ -30,3 +30,6 @@ _ide_helper.php
.DS_Store
package-lock.json
/node_modules
# Ignore generated public directory from `winter:mirror public`
public

16
config/app.php
View File

@ -110,13 +110,13 @@ return [
| from your proxy when rewriting the request. This is an integer map value
| so you may specify more than one value.
|
| Possible values (prepended with `Illuminate\Http\Request::`)
| - HEADER_X_FORWARDED_ALL - trust all forwarded headers
| - HEADER_X_FORWARDED_FOR - trust only the proxy IP
| - HEADER_X_FORWARDED_HOST - trust only the proxy hostname
| - HEADER_X_FORWARDED_PORT - trust only the proxy port
| - HEADER_X_FORWARDED_PROTO - trust only the proxy protocol
| - HEADER_X_FORWARDED_AWS_ELB - trust Amazon Elastic Load Balancing header
| Possible values:
| - 'HEADER_X_FORWARDED_ALL' - trust all forwarded headers
| - Illuminate\Http\Request::HEADER_X_FORWARDED_FOR - trust only the proxy IP
| - Illuminate\Http\Request::HEADER_X_FORWARDED_HOST - trust only the proxy hostname
| - Illuminate\Http\Request::HEADER_X_FORWARDED_PORT - trust only the proxy port
| - Illuminate\Http\Request::HEADER_X_FORWARDED_PROTO - trust only the proxy protocol
| - Illuminate\Http\Request::HEADER_X_FORWARDED_AWS_ELB - trust Amazon Elastic Load Balancing headers
|
| Examples:
| - To trust only the hostname, use the following:
@ -132,7 +132,7 @@ return [
| - Amazon ELB users should always use the "HEADER_X_FORWARDED_AWS_ELB" option.
*/
'trustedProxyHeaders' => Illuminate\Http\Request::HEADER_X_FORWARDED_ALL,
'trustedProxyHeaders' => 'HEADER_X_FORWARDED_ALL',
/*
|--------------------------------------------------------------------------

17
config/database.php
View File

@ -143,21 +143,4 @@ return [
],
/*
|--------------------------------------------------------------------------
| Use DB configuration for testing
|--------------------------------------------------------------------------
|
| When running plugin tests Winter CMS by default uses SQLite in memory.
| You can override this behavior by setting `useConfigForTesting` to true.
|
| After that Winter CMS will take DB parameters from the config.
| If file `/config/testing/database.php` exists, config will be read from it,
| but remember that when not specified it will use parameters specified in
| `/config/database.php`.
|
*/
'useConfigForTesting' => false,
];

3
modules/system/console/WinterTest.php
View File

@ -141,6 +141,9 @@ class WinterTest extends Command
null
);
// Set an unlimited timeout
$process->setTimeout(0);
// Attempt to set tty mode, catch and warn with the exception message if unsupported
try {
$process->setTty(true);