|
@@ -80,15 +80,13 @@ discard block |
|
|
block discarded – undo |
|
80
|
80
|
protected function startMethod(MethodOptions $methodOptions) : void |
|
81
|
81
|
{ |
|
82
|
82
|
// get params |
|
83
|
|
- $params = $this->getMethodParams($methodOptions->getParams()); |
|
|
83
|
+ $params = $this->getMethodParams($methodOptions->getParams()); |
|
84
|
84
|
$this->sourceCode .= PhpInterface::TAB_PSR4 . $methodOptions->getModifier() . PhpInterface::SPACE . |
|
85
|
|
- (($methodOptions->isStatic() !== false) ? PhpInterface::PHP_STATIC . PhpInterface::SPACE : |
|
86
|
|
- '') . |
|
|
85
|
+ (($methodOptions->isStatic() !== false) ? PhpInterface::PHP_STATIC . PhpInterface::SPACE : '') . |
|
87
|
86
|
PhpInterface::PHP_FUNCTION . PhpInterface::SPACE . |
|
88
|
87
|
$methodOptions->getName() |
|
89
|
88
|
. PhpInterface::OPEN_PARENTHESES . $params . PhpInterface::CLOSE_PARENTHESES . |
|
90
|
|
- ((empty($methodOptions->getReturnType())) ? '' : |
|
91
|
|
- PhpInterface::COLON . PhpInterface::SPACE . $methodOptions->getReturnType()) . |
|
|
89
|
+ ((empty($methodOptions->getReturnType())) ? '' : PhpInterface::COLON . PhpInterface::SPACE . $methodOptions->getReturnType()) . |
|
92
|
90
|
PhpInterface::SPACE . PHP_EOL . PhpInterface::TAB_PSR4 |
|
93
|
91
|
. PhpInterface::OPEN_BRACE . PHP_EOL; |
|
94
|
92
|
} |
|
@@ -102,8 +100,7 @@ discard block |
|
|
block discarded – undo |
|
102
|
100
|
protected function setMethodReturn(string $value, $isString = false) : void |
|
103
|
101
|
{ |
|
104
|
102
|
$this->setTabs(2); |
|
105
|
|
- $this->sourceCode .= PhpInterface::PHP_RETURN . PhpInterface::SPACE . (($isString === false) ? $value : |
|
106
|
|
- PhpInterface::DOUBLE_QUOTES . $value . PhpInterface::DOUBLE_QUOTES) . PhpInterface::SEMICOLON . PHP_EOL; |
|
|
103
|
+ $this->sourceCode .= PhpInterface::PHP_RETURN . PhpInterface::SPACE . (($isString === false) ? $value : PhpInterface::DOUBLE_QUOTES . $value . PhpInterface::DOUBLE_QUOTES) . PhpInterface::SEMICOLON . PHP_EOL; |
|
107
|
104
|
} |
|
108
|
105
|
|
|
109
|
106
|
/** |
|
@@ -146,7 +143,7 @@ discard block |
|
|
block discarded – undo |
|
146
|
143
|
*/ |
|
147
|
144
|
private function setArrayProperty($key, array $value) : void |
|
148
|
145
|
{ |
|
149
|
|
- $val = $this->setArrayToString($value); |
|
|
146
|
+ $val = $this->setArrayToString($value); |
|
150
|
147
|
$this->sourceCode .= $this->quoteParam($key) |
|
151
|
148
|
. PhpInterface::SPACE . PhpInterface::DOUBLE_ARROW |
|
152
|
149
|
. PhpInterface::SPACE . $val . PhpInterface::COMMA . PHP_EOL; |
|
@@ -177,7 +174,7 @@ discard block |
|
|
block discarded – undo |
|
177
|
174
|
*/ |
|
178
|
175
|
protected function createPropertyArray(string $prop, string $modifier, array $value) : void |
|
179
|
176
|
{ |
|
180
|
|
- $val = $this->setArrayToString($value); |
|
|
177
|
+ $val = $this->setArrayToString($value); |
|
181
|
178
|
$this->sourceCode .= PhpInterface::TAB_PSR4 . $modifier . PhpInterface::SPACE . PhpInterface::DOLLAR_SIGN . |
|
182
|
179
|
$prop . PhpInterface::SPACE . PhpInterface::EQUALS . PhpInterface::SPACE . $val . PhpInterface::SEMICOLON . PHP_EOL; |
|
183
|
180
|
} |
|
@@ -417,7 +414,7 @@ discard block |
|
|
block discarded – undo |
|
417
|
414
|
if ($till === null) { |
|
418
|
415
|
$this->sourceCode .= mb_substr($this->resourceCode, $start, null, PhpInterface::ENCODING_UTF8); |
|
419
|
416
|
} else { |
|
420
|
|
- $end = mb_strpos($this->resourceCode, $till, null, PhpInterface::ENCODING_UTF8) - 3; |
|
|
417
|
+ $end = mb_strpos($this->resourceCode, $till, null, PhpInterface::ENCODING_UTF8) - 3; |
|
421
|
418
|
$this->sourceCode .= mb_substr($this->resourceCode, $start, $end - $start, PhpInterface::ENCODING_UTF8); |
|
422
|
419
|
} |
|
423
|
420
|
} |
|
@@ -427,7 +424,7 @@ discard block |
|
|
block discarded – undo |
|
427
|
424
|
*/ |
|
428
|
425
|
private function setAfterMethods() : void |
|
429
|
426
|
{ |
|
430
|
|
- $start = mb_strpos($this->resourceCode, DefaultInterface::METHOD_END, null, PhpInterface::ENCODING_UTF8) - 3; |
|
|
427
|
+ $start = mb_strpos($this->resourceCode, DefaultInterface::METHOD_END, null, PhpInterface::ENCODING_UTF8) - 3; |
|
431
|
428
|
$this->sourceCode .= $this->setTabs() . mb_substr($this->resourceCode, $start, null, PhpInterface::ENCODING_UTF8); |
|
432
|
429
|
} |
|
433
|
430
|
|