Let DefaultVisitor take CodeGeneratorConfig as an argument to prevent having it swallow lots of arguments and make scalar and return type hints on by default when declare strict is on

Author: Robin Geuze

src/config/CodeFileGeneratorConfig.php

@@ -2,6 +2,8 @@
 namespace gossi\codegen\config;
 
 use gossi\docblock\Docblock;
+use Symfony\Component\OptionsResolver\Options;
+
 class CodeFileGeneratorConfig extends CodeGeneratorConfig {
 
 	protected function getOptionalOptions() {
@@ -11,12 +13,24 @@ protected function getOptionalOptions() {
 	}
 
 	protected function getDefaultOptions() {
-		return array_merge([
+		return array_merge(
+			parent::getDefaultOptions(),
+			[
 				'headerComment' => '',
 				'headerDocblock' => null,
 				'blankLineAtEnd' => true,
 				'declareStrictTypes'  => false,
-			], parent::getDefaultOptions());
+				'generateScalarTypeHints' => function(Options $options) {
+					if ($options['declareStrictTypes'])
+						return true;
+					return false;
+				},
+				'generateReturnTypeHints' => function(Options $options) {
+					if ($options['declareStrictTypes'])
+						return true;
+					return false;
+				},
+			]);
 	}
 
 	protected function getAllowedOptionTypes() {

src/generator/CodeGenerator.php

@@ -32,17 +32,7 @@ public function __construct($config = null) {
 	}
 
 	protected function init() {
-		if ($this->config->getGenerateEmptyDocblock()) {
-			$visitor = new EmptyDocblockVisitor(
-				$this->config->getGenerateScalarTypeHints(),
-				$this->config->getGenerateReturnTypeHints()
-			);
-		} else {
-			$visitor = new DefaultVisitor(
-				$this->config->getGenerateScalarTypeHints(),
-				$this->config->getGenerateReturnTypeHints()
-			);
-		}
+		$visitor = new DefaultVisitor($this->config);
 		$this->strategy = new DefaultGeneratorStrategy($visitor);
 	}
 

src/visitor/DefaultVisitor.php

@@ -16,6 +16,7 @@
  */
 namespace gossi\codegen\visitor;
 
+use gossi\codegen\config\CodeGeneratorConfig;
 use gossi\codegen\model\NamespaceInterface;
 use gossi\codegen\model\AbstractPhpStruct;
 use gossi\codegen\model\DocblockInterface;
@@ -42,6 +43,8 @@ class DefaultVisitor implements GeneratorVisitorInterface {
 	protected $scalarTypeHints;
 	protected $returnTypeHints;
 
+	protected $config;
+
 	protected static $noTypeHints = [
 		'string',
 		'int',
@@ -55,9 +58,9 @@ class DefaultVisitor implements GeneratorVisitorInterface {
 		'resource'
 	];
 
-	public function __construct($scalarTypeHints = false, $returnTypeHints = false) {
-		$this->scalarTypeHints = $scalarTypeHints;
-		$this->returnTypeHints = $returnTypeHints;
+	public function __construct(CodeGeneratorConfig $config = null) {
+		// Make sure we retain the old default behavior for this class
+		$this->config = $config?: new CodeGeneratorConfig(['generateEmptyDocblock' => false]);
 		$this->writer = new Writer();
 	}
 
@@ -114,7 +117,7 @@ protected function visitUseStatements(AbstractPhpStruct $struct) {
 	}
 
 	protected function visitDocblock(Docblock $docblock) {
-		if (!$docblock->isEmpty()) {
+		if (!$docblock->isEmpty() || $this->config->getGenerateEmptyDocblock()) {
 			$this->writeDocblock($docblock);
 		}
 	}
@@ -323,7 +326,9 @@ protected function writeParameters(array $parameters) {
 			}
 			$first = false;
 
-			if (false === strpos($parameter->getType(), '|') && ($type = $parameter->getType()) && (!in_array($type, self::$noTypeHints) || $this->scalarTypeHints)) {
+			if (false === strpos($parameter->getType(), '|') &&
+				($type = $parameter->getType()) &&
+				(!in_array($type, self::$noTypeHints) || $this->config->getGenerateScalarTypeHints())) {
 				$this->writer->write($type . ' ');
 			}
 
@@ -353,7 +358,7 @@ protected function writeParameters(array $parameters) {
 	}
 
 	protected function writeFunctionReturnType($type) {
-		if ($this->returnTypeHints && false === strpos($type, '|')) {
+		if ($this->config->getGenerateReturnTypeHints() && $type != NULL && false === strpos($type, '|')) {
 			$this->writer->write(': ')->write($type);
 		}
 	}

tests/generator/CodeGeneratorTest.php

@@ -147,8 +147,7 @@ public function testMethodReturnTypeHinting() {
 
 	public function testStrictTypesDeclaration() {
 		$expected = "<?php\ndeclare(strict_types=1);\n\nfunction fn(\$a) {\n}\n";
-		$fn = PhpFunction::create('fn')->addParameter(PhpParameter::create('a')->setType('int'));
-		$fn->setType('int');
+		$fn = PhpFunction::create('fn')->addParameter(PhpParameter::create('a'));
 
 		$codegen = new CodeFileGenerator(['generateDocblock' => false, 'generateEmptyDocblock' => false, 'declareStrictTypes' => true]);
 		$code = $codegen->generate($fn);