@@ -3,7 +3,6 @@ |
||
| 3 | 3 | |
| 4 | 4 | use gossi\codegen\model\GenerateableInterface; |
| 5 | 5 | use gossi\codegen\config\CodeGeneratorConfig; |
| 6 | -use gossi\codegen\visitor\EmptyDocblockVisitor; |
|
| 7 | 6 | use gossi\codegen\visitor\DefaultVisitor; |
| 8 | 7 | |
| 9 | 8 | class CodeGenerator { |
@@ -19,7 +19,6 @@ |
||
| 19 | 19 | use gossi\codegen\config\CodeGeneratorConfig; |
| 20 | 20 | use gossi\codegen\model\NamespaceInterface; |
| 21 | 21 | use gossi\codegen\model\AbstractPhpStruct; |
| 22 | -use gossi\codegen\model\DocblockInterface; |
|
| 23 | 22 | use gossi\codegen\model\TraitsInterface; |
| 24 | 23 | use gossi\codegen\model\PhpClass; |
| 25 | 24 | use gossi\codegen\model\PhpInterface; |
@@ -343,14 +343,14 @@ |
||
| 343 | 343 | $defaultValue = $parameter->getDefaultValue(); |
| 344 | 344 | |
| 345 | 345 | switch (true) { |
| 346 | - case is_array($defaultValue) && empty($defaultValue): |
|
| 347 | - $this->writer->write('array()'); |
|
| 348 | - break; |
|
| 349 | - case ($defaultValue instanceof PhpConstant): |
|
| 350 | - $this->writer->write($defaultValue->getName()); |
|
| 351 | - break; |
|
| 352 | - default: |
|
| 353 | - $this->writer->write($this->getPhpExport($defaultValue)); |
|
| 346 | + case is_array($defaultValue) && empty($defaultValue): |
|
| 347 | + $this->writer->write('array()'); |
|
| 348 | + break; |
|
| 349 | + case ($defaultValue instanceof PhpConstant): |
|
| 350 | + $this->writer->write($defaultValue->getName()); |
|
| 351 | + break; |
|
| 352 | + default: |
|
| 353 | + $this->writer->write($this->getPhpExport($defaultValue)); |
|
| 354 | 354 | |
| 355 | 355 | } |
| 356 | 356 | } |
@@ -60,7 +60,7 @@ |
||
| 60 | 60 | |
| 61 | 61 | public function __construct(CodeGeneratorConfig $config = null) { |
| 62 | 62 | // Make sure we retain the old default behavior for this class |
| 63 | - $this->config = $config?: new CodeGeneratorConfig(['generateEmptyDocblock' => false]); |
|
| 63 | + $this->config = $config ?: new CodeGeneratorConfig(['generateEmptyDocblock' => false]); |
|
| 64 | 64 | $this->writer = new Writer(); |
| 65 | 65 | } |
| 66 | 66 | |
@@ -358,7 +358,7 @@ |
||
| 358 | 358 | } |
| 359 | 359 | |
| 360 | 360 | protected function writeFunctionReturnType($type) { |
| 361 | - if ($this->config->getGenerateReturnTypeHints() && $type != NULL && false === strpos($type, '|')) { |
|
| 361 | + if ($this->config->getGenerateReturnTypeHints() && $type != null && false === strpos($type, '|')) { |
|
| 362 | 362 | $this->writer->write(': ')->write($type); |
| 363 | 363 | } |
| 364 | 364 | } |
@@ -29,7 +29,7 @@ |
||
| 29 | 29 | |
| 30 | 30 | public static function callMethod(\ReflectionMethod $method, array $params = null) { |
| 31 | 31 | if (null === $params) { |
| 32 | - $params = array_map(function ($p) { |
|
| 32 | + $params = array_map(function($p) { |
|
| 33 | 33 | return '$' . $p->name; |
| 34 | 34 | }, $method->getParameters()); |
| 35 | 35 | } |
@@ -32,7 +32,7 @@ discard block |
||
| 32 | 32 | $filter |= \ReflectionMethod::IS_PROTECTED; |
| 33 | 33 | } |
| 34 | 34 | |
| 35 | - return array_filter($class->getMethods($filter), function ($method) { |
|
| 35 | + return array_filter($class->getMethods($filter), function($method) { |
|
| 36 | 36 | return !$method->isFinal() && !$method->isStatic(); |
| 37 | 37 | }); |
| 38 | 38 | } |
@@ -81,7 +81,7 @@ discard block |
||
| 81 | 81 | } |
| 82 | 82 | $tokenizer = new PhpTokenizer(); |
| 83 | 83 | $tokens = $tokenizer->tokenize($content); |
| 84 | - $tokens = $tokens->filter(function ($token) { |
|
| 84 | + $tokens = $tokens->filter(function($token) { |
|
| 85 | 85 | return $token->type !== T_WHITESPACE && $token->type !== T_COMMENT && $token->type !== T_DOC_COMMENT; |
| 86 | 86 | }); |
| 87 | 87 | $statements = []; |
@@ -131,11 +131,11 @@ |
||
| 131 | 131 | * |
| 132 | 132 | * If the class has already been declared you get only the set alias. |
| 133 | 133 | * |
| 134 | - * @param string $fullClassName |
|
| 135 | - * @param null|string $alias |
|
| 136 | - * |
|
| 137 | - * @return string |
|
| 138 | - */ |
|
| 134 | + * @param string $fullClassName |
|
| 135 | + * @param null|string $alias |
|
| 136 | + * |
|
| 137 | + * @return string |
|
| 138 | + */ |
|
| 139 | 139 | public function declareUse($fullClassName, $alias = null) |
| 140 | 140 | { |
| 141 | 141 | $fullClassName = trim($fullClassName, '\\'); |
@@ -117,8 +117,7 @@ discard block |
||
| 117 | 117 | /** |
| 118 | 118 | * Declares multiple use statements at once. |
| 119 | 119 | */ |
| 120 | - public function declareUses() |
|
| 121 | - { |
|
| 120 | + public function declareUses() { |
|
| 122 | 121 | foreach (func_get_args() as $name) { |
| 123 | 122 | $this->declareUse($name); |
| 124 | 123 | } |
@@ -136,8 +135,7 @@ discard block |
||
| 136 | 135 | * |
| 137 | 136 | * @return string |
| 138 | 137 | */ |
| 139 | - public function declareUse($fullClassName, $alias = null) |
|
| 140 | - { |
|
| 138 | + public function declareUse($fullClassName, $alias = null) { |
|
| 141 | 139 | $fullClassName = trim($fullClassName, '\\'); |
| 142 | 140 | if (!$this->hasUseStatement($fullClassName)) { |
| 143 | 141 | $this->addUseStatement($fullClassName, $alias); |
@@ -85,7 +85,7 @@ |
||
| 85 | 85 | * @return ParamTag |
| 86 | 86 | */ |
| 87 | 87 | public function getDocblockTag() { |
| 88 | - return ParamTag::create()->setType($this->getType() ? : 'mixed')->setVariable($this->getName())->setDescription($this->getTypeDescription()); |
|
| 88 | + return ParamTag::create()->setType($this->getType() ?: 'mixed')->setVariable($this->getName())->setDescription($this->getTypeDescription()); |
|
| 89 | 89 | } |
| 90 | 90 | |
| 91 | 91 | /** |
@@ -92,7 +92,7 @@ |
||
| 92 | 92 | return $this->constants; |
| 93 | 93 | } |
| 94 | 94 | |
| 95 | - return array_map(function (PhpConstant $constant) { |
|
| 95 | + return array_map(function(PhpConstant $constant) { |
|
| 96 | 96 | return $constant->getValue(); |
| 97 | 97 | }, $this->constants); |
| 98 | 98 | } |
@@ -143,7 +143,7 @@ discard block |
||
| 143 | 143 | } |
| 144 | 144 | |
| 145 | 145 | private function getConstantSortFunc() { |
| 146 | - return $this->constantSortFunc ? : 'strcasecmp'; |
|
| 146 | + return $this->constantSortFunc ?: 'strcasecmp'; |
|
| 147 | 147 | } |
| 148 | 148 | |
| 149 | 149 | private function getMethodSortFunc() { |
@@ -152,7 +152,7 @@ discard block |
||
| 152 | 152 | } |
| 153 | 153 | |
| 154 | 154 | if (empty(self::$defaultMethodSortFunc)) { |
| 155 | - self::$defaultMethodSortFunc = function ($a, $b) { |
|
| 155 | + self::$defaultMethodSortFunc = function($a, $b) { |
|
| 156 | 156 | if ($a->isStatic() !== $isStatic = $b->isStatic()) { |
| 157 | 157 | return $isStatic ? 1 : -1; |
| 158 | 158 | } |
@@ -177,7 +177,7 @@ discard block |
||
| 177 | 177 | } |
| 178 | 178 | |
| 179 | 179 | if (empty(self::$defaultPropertySortFunc)) { |
| 180 | - self::$defaultPropertySortFunc = function ($a, $b) { |
|
| 180 | + self::$defaultPropertySortFunc = function($a, $b) { |
|
| 181 | 181 | if (($aV = $a->getVisibility()) !== $bV = $b->getVisibility()) { |
| 182 | 182 | $aV = 'public' === $aV ? 3 : ('protected' === $aV ? 2 : 1); |
| 183 | 183 | $bV = 'public' === $bV ? 3 : ('protected' === $bV ? 2 : 1); |