natalie/indefero
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Prepare the Stdio class for easier testing.

Browse Source 
- create an interface that describes the basic methods
- let the real stdio class implement this interface
- inject the stdio instance into IDF_Scm_Monotone and do not
  create it in the constructor
- ensure in IDF_Scm_Monotone_ZipRender that we get the proper
  constructor arguments
On a slighly unrelated note, make _getAuthOptions() in the stdio
implementation private.
This commit is contained in:
Thomas Keller
2011-03-23 00:47:17 +01:00
parent 5b5705fe90
commit 78a0402351
4 changed files with 79 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
src/IDF/Scm/Monotone.php
View File

@@ -36,12 +36,12 @@ class IDF_Scm_Monotone extends IDF_Scm
private static $instances = array();
/**
* @see IDF_Scm::__construct()
* Constructor
*/
public function __construct($project)
public function __construct(IDF_Project $project, IDF_Scm_Monotone_IStdio $stdio)
{
$this->project = $project;
$this->stdio = new IDF_Scm_Monotone_Stdio($project);
$this->stdio = $stdio;
}
/**
@@ -458,8 +458,9 @@ class IDF_Scm_Monotone extends IDF_Scm
public static function factory($project)
{
if (!array_key_exists($project->shortname, self::$instances)) {
$stdio = new IDF_Scm_Monotone_Stdio($project);
self::$instances[$project->shortname] =
new IDF_Scm_Monotone($project);
new IDF_Scm_Monotone($project, $stdio);
}
return self::$instances[$project->shortname];
}
@@ -676,8 +677,8 @@ class IDF_Scm_Monotone extends IDF_Scm
$parents = $this->stdio->exec(array('parents', $revs[0]));
$res['parents'] = preg_split("/\n/", $parents, -1, PREG_SPLIT_NO_EMPTY);
$certs = $this->_getCerts($revs[0]);
$certs = $this->_getCerts($revs[0]);
// FIXME: this assumes that author, date and changelog are always given
$res['author'] = implode(', ', $certs['author']);