tonyair/silverstripe-framework
1
0
Fork 0
mirror of https://github.com/silverstripe/silverstripe-framework synced 2024-10-22 14:05:37 +02:00
Code Issues Projects Releases Wiki Activity

Merge branch '4.0' into 4.1

Browse Source
This commit is contained in:
Robbie Averill 2018-08-27 16:12:04 +12:00
commit 66c09afc9c
1 changed files with 17 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
src/Control/CLIRequestBuilder.php
View File

@ -2,6 +2,8 @@
namespace SilverStripe\Control;
use SilverStripe\Core\Environment;
/**
* CLI specific request building logic
*/
@ -66,4 +68,19 @@ class CLIRequestBuilder extends HTTPRequestBuilder
// Parse rest of variables as standard
return parent::cleanEnvironment($variables);
}
/**
* @param array $variables
* @param string $input
* @return HTTPRequest
*/
public static function createFromVariables(array $variables, $input)
{
$request = parent::createFromVariables($variables, $input);
// unset scheme so that SS_BASE_URL can provide `is_https` information if required
$scheme = parse_url(Environment::getEnv('SS_BASE_URL'), PHP_URL_SCHEME);
$request->setScheme($scheme);
return $request;
}
}