Fix comment padding and some coding-style issues in the test classes

refs #4615
This commit is contained in:
Matthias Jentsch 2013-08-27 18:26:34 +02:00
parent aba98afd3f
commit 874b163009
2 changed files with 12 additions and 10 deletions

View File

@ -396,10 +396,12 @@ class IniEditor
private function updateLine($lineNr, $content) private function updateLine($lineNr, $content)
{ {
$comment = $this->getComment($this->text[$lineNr]); $comment = $this->getComment($this->text[$lineNr]);
$comment = trim($comment);
if (strlen($comment) > 0) { if (strlen($comment) > 0) {
$comment = ' ; ' . trim($comment); $comment = ' ; ' . $comment;
$content = str_pad($content, $this->commentIndentation) . $comment;
} }
$this->text[$lineNr] = str_pad($content, $this->commentIndentation) . $comment; $this->text[$lineNr] = $content;
} }
/** /**

View File

@ -121,8 +121,8 @@ prop2="5"
/** /**
* Write a string to a temporary file * Write a string to a temporary file
* *
* @param $name The name of the temporary file * @param string $name The name of the temporary file
* @param $content The content * @param string $content The content
*/ */
private function writeToTmp($name, $content) private function writeToTmp($name, $content)
{ {
@ -236,10 +236,10 @@ property = "something" ; comment
} }
/** /**
* Change the test config and write the changes to the temporary * Change the test config, write the changes to the temporary
* file $tmpFile * file $tmpFile and save the path to the file in the array tmpfiles
* *
* @param $tmpFile * @param string $tmpFile The name that should be given to the temporary file
*/ */
private function changeConfigAndWriteToFile($tmpFile) private function changeConfigAndWriteToFile($tmpFile)
{ {
@ -277,7 +277,7 @@ property = "something" ; comment
/** /**
* Test if all configuration properties are set correctly * Test if all configuration properties are set correctly
* *
* @param $config * @param mixed $config The configuration to check
*/ */
private function checkConfigProperties($config) private function checkConfigProperties($config)
{ {
@ -344,9 +344,9 @@ property = "something" ; comment
} }
/** /**
* Change the content of a Zend_Config * Change the content of a Zend_Config for testing purposes
* *
* @param Zend_Config $config * @param Zend_Config $config The configuration that should be changed
*/ */
private function alterConfig(\Zend_Config $config) private function alterConfig(\Zend_Config $config)
{ {