Jingga/phpOMS
1
0
Fork 0
mirror of https://github.com/Karaka-Management/phpOMS.git synced 2026-02-12 23:08:41 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Fix indention

Browse Source
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
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
Utils/Parser/Php/ArrayParser.php
View File

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

2
Utils/Parser/Php/ClassParser.php
View File

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

19
Utils/Parser/Php/FunctionParser.php
View File

@ -30,8 +30,6 @@ namespace phpOMS\Utils\Parser\Php;
*/ */
class FunctionParser class FunctionParser
{ {
const INDENT = 4;
private $name = ''; private $name = '';
private $visibility = Visibility::_PUBLIC; private $visibility = Visibility::_PUBLIC;
@ -148,7 +146,7 @@ class FunctionParser
public function parse() : string public function parse() : string
{ {
$function = ''; $function = '';
$member .= str_repeat(' ', self::INDENT); $member .= str_repeat(' ', ClassParser::INDENT);
if($this->isFinal) { if($this->isFinal) {
$member .= 'final '; $member .= 'final ';
@ -168,18 +166,29 @@ class FunctionParser
$parameters = ''; $parameters = '';
foreach($this->parameters as $name => $para) { 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 .= rtrim($parameters, ', ') . ') ';
$member .= ($this->return ?? '') . PHP_EOL; $member .= ($this->return ?? '') . PHP_EOL;
if(isset($this->body)) { 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 { } else {
$member .= ';'; $member .= ';';
} }
return $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;
}
} }

4
Utils/Parser/Php/MemberParser.php
View File

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