mirror of
https://github.com/silverstripe/silverstripe-frameworktest
synced 2024-10-22 11:06:02 +02:00
MINOR: allows custom config file path
BUGFIX: replaced reading whole text file logic from using filesize() to feof(). there are time filesize() returns a wrong value BUGFIX: set a new config var didn't work properly
This commit is contained in:
parent
a0fb3d463f
commit
d53ce512bd
@ -16,6 +16,8 @@
|
|||||||
*/
|
*/
|
||||||
class CMSWorkflowSiteConfigDecorator extends DataObjectDecorator {
|
class CMSWorkflowSiteConfigDecorator extends DataObjectDecorator {
|
||||||
|
|
||||||
|
static $config_file_path = '';
|
||||||
|
|
||||||
static $step_config = "twostep" ;
|
static $step_config = "twostep" ;
|
||||||
|
|
||||||
static $default_config = "STEP = twostep";
|
static $default_config = "STEP = twostep";
|
||||||
@ -86,7 +88,11 @@ class CMSWorkflowSiteConfigDecorator extends DataObjectDecorator {
|
|||||||
* Config file path for frameworktest - two step and three step testing
|
* Config file path for frameworktest - two step and three step testing
|
||||||
*/
|
*/
|
||||||
static function get_config_file_path() {
|
static function get_config_file_path() {
|
||||||
return dirname(__FILE__) . "/CMSWorkflow_Config.cfg";
|
if (self::$config_file_path) {
|
||||||
|
return self::$config_file_path;
|
||||||
|
} else {
|
||||||
|
return dirname(__FILE__) . "/CMSWorkflow_Config.cfg";
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
@ -127,10 +133,14 @@ class CMSWorkflowSiteConfigDecorator extends DataObjectDecorator {
|
|||||||
*/
|
*/
|
||||||
static function get_config_content() {
|
static function get_config_content() {
|
||||||
$file = self::get_config_file();
|
$file = self::get_config_file();
|
||||||
$size = filesize(self::get_config_file_path());
|
|
||||||
if($size < 1) $size = 1;
|
$content = null;
|
||||||
$content = fread($file, $size);
|
while(!feof($file)) {
|
||||||
|
$content .= fread($file, 10);
|
||||||
|
}
|
||||||
|
|
||||||
fclose($file);
|
fclose($file);
|
||||||
|
|
||||||
return $content;
|
return $content;
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -164,7 +174,8 @@ class CMSWorkflowSiteConfigDecorator extends DataObjectDecorator {
|
|||||||
$replaced = self::$default_config;
|
$replaced = self::$default_config;
|
||||||
}
|
}
|
||||||
else {
|
else {
|
||||||
$replaced = trim($replaced) . "\n" . self::$default_config;
|
$newConfig = "$var = $value";
|
||||||
|
$replaced = trim($replaced) . "\n" . $newConfig;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
return $replaced;
|
return $replaced;
|
||||||
|
Loading…
Reference in New Issue
Block a user