Fix indention

This commit is contained in:
Dennis Eichhorn 2016-03-28 14:24:04 +02:00
parent 0cb3c0b749
commit 9f30b1e662
4 changed files with 17 additions and 9 deletions

View File

@ -30,7 +30,6 @@ namespace phpOMS\Utils\Parser\Php;
*/
class ArrayParser
{
/**
* Saving array to file.
*

View File

@ -30,6 +30,8 @@ namespace phpOMS\Utils\Parser\Php;
*/
class ClassParser
{
const INDENT = 4;
private $isFinal = false;
private $isAbstract = false;

View File

@ -30,8 +30,6 @@ namespace phpOMS\Utils\Parser\Php;
*/
class FunctionParser
{
const INDENT = 4;
private $name = '';
private $visibility = Visibility::_PUBLIC;
@ -148,7 +146,7 @@ class FunctionParser
public function parse() : string
{
$function = '';
$member .= str_repeat(' ', self::INDENT);
$member .= str_repeat(' ', ClassParser::INDENT);
if($this->isFinal) {
$member .= 'final ';
@ -168,18 +166,29 @@ class FunctionParser
$parameters = '';
foreach($this->parameters as $name => $para) {
$parameters = (isset($para['typehint']) ? $para['typehint'] . ' ': '') . $para['name'] . (array_key_exists('default', $para) ? ' = ' . MemberParser::parseVariable($para['default']) : '') . ', ';
$parameters = (isset($para['typehint']) ? $para['typehint'] . ' ' : '') . $para['name'] . (array_key_exists('default', $para) ? ' = ' . MemberParser::parseVariable($para['default']) : '') . ', ';
}
$member .= rtrim($parameters, ', ') . ') ';
$member .= ($this->return ?? '') . PHP_EOL;
if(isset($this->body)) {
$member .= '{' . PHP_EOL . $this->body . PHP_EOL . '}';
$member .= str_repeat(' ', ClassParser::INDENT) . '{' . PHP_EOL . $this->addIndent($this->body) . PHP_EOL . str_repeat(' ', ClassParser::INDENT) . '}';
} else {
$member .= ';';
}
return $member;
}
private function addIndent($body) : string
{
$body = preg_split('/\r\n|\r|\n/', $this->body);
foreach($body as &$line) {
$line = str_repeat(' ', ClassParser::INDENT) . $line;
}
return $body;
}
}

View File

@ -30,8 +30,6 @@ namespace phpOMS\Utils\Parser\Php;
*/
class MemberParser
{
const INDENT = 4;
private $name = '';
private $visibility = Visibility::_PUBLIC;
@ -90,7 +88,7 @@ class MemberParser
public function parse() : string
{
$member = '';
$member .= str_repeat(' ', self::INDENT);
$member .= str_repeat(' ', ClassParser::INDENT);
$member .= $this->visibility . ' ';