allow null in union types, make classes final (#44)

* allow null in union types, make classes final

* remove unused use statement

* unify if

Author: nick-zh

src/Converter/PhpClassConverter.php

@@ -4,29 +4,38 @@
 
 namespace PhpKafka\PhpAvroSchemaGenerator\Converter;
 
-use PHP_CodeSniffer\Tokenizers\PHP;
 use PhpKafka\PhpAvroSchemaGenerator\Avro\Avro;
 use PhpKafka\PhpAvroSchemaGenerator\Parser\ClassParserInterface;
 use PhpKafka\PhpAvroSchemaGenerator\PhpClass\PhpClass;
 use PhpKafka\PhpAvroSchemaGenerator\PhpClass\PhpClassInterface;
 use PhpKafka\PhpAvroSchemaGenerator\PhpClass\PhpClassProperty;
 use PhpKafka\PhpAvroSchemaGenerator\PhpClass\PhpClassPropertyInterface;
 
-class PhpClassConverter implements PhpClassConverterInterface
+final class PhpClassConverter implements PhpClassConverterInterface
 {
     private ClassParserInterface $parser;
 
     /**
      * @var array<string,int>
      */
-    private array $typesToSkip = [
+    private array $singleTypesToSkip = [
         'null' => 1,
         'object' => 1,
         'callable' => 1,
         'resource' => 1,
         'mixed' => 1
     ];
 
+    /**
+     * @var array<string,int>
+     */
+    private array $unionTypesToSkip = [
+        'object' => 1,
+        'callable' => 1,
+        'resource' => 1,
+        'mixed' => 1
+    ];
+
     /**
      * @param ClassParserInterface $parser
      */
@@ -99,13 +108,17 @@ private function getConvertedType(string $type)
         return $this->getConvertedUnionType($types);
     }
 
-    private function getFullTypeName(string $type): ?string
+    private function getFullTypeName(string $type, bool $isUnionType = false): ?string
     {
+
         if (true === isset(Avro::MAPPED_TYPES[$type])) {
             $type = Avro::MAPPED_TYPES[$type];
         }
 
-        if (true === isset($this->typesToSkip[$type])) {
+        if (
+            (false === $isUnionType && true === isset($this->singleTypesToSkip[$type]))
+            || (true === $isUnionType && true === isset($this->unionTypesToSkip[$type]))
+        ) {
             return null;
         }
 
@@ -135,12 +148,8 @@ private function getConvertedUnionType(array $types): array
         $convertedUnionType = [];
 
         foreach ($types as $type) {
-            if (true === isset($this->typesToSkip[$type])) {
-                continue;
-            }
-
-            if (false === $this->isArrayType($type)) {
-                $convertedUnionType[] = $this->getFullTypeName($type);
+            if (false === $this->isArrayType($type) && null !== $formattedType = $this->getFullTypeName($type, true)) {
+                $convertedUnionType[] = $formattedType;
             }
         }
 

src/Parser/ClassParser.php

@@ -17,7 +17,7 @@
 use ReflectionClass;
 use ReflectionException;
 
-class ClassParser implements ClassParserInterface
+final class ClassParser implements ClassParserInterface
 {
     private ClassPropertyParserInterface $propertyParser;
     private Parser $parser;

src/Parser/ClassPropertyParser.php

@@ -14,7 +14,7 @@
 use PhpParser\Node\UnionType;
 use RuntimeException;
 
-class ClassPropertyParser implements ClassPropertyParserInterface
+final class ClassPropertyParser implements ClassPropertyParserInterface
 {
     private DocCommentParserInterface $docParser;
 

src/Parser/DocCommentParser.php

@@ -4,7 +4,7 @@
 
 namespace PhpKafka\PhpAvroSchemaGenerator\Parser;
 
-class DocCommentParser implements DocCommentParserInterface
+final class DocCommentParser implements DocCommentParserInterface
 {
     /**
      * @param string $docComment

src/PhpClass/PhpClass.php

@@ -4,7 +4,7 @@
 
 namespace PhpKafka\PhpAvroSchemaGenerator\PhpClass;
 
-class PhpClass implements PhpClassInterface
+final class PhpClass implements PhpClassInterface
 {
     private string $classBody;
     private string $className;

src/PhpClass/PhpClassProperty.php

@@ -6,7 +6,7 @@
 
 use PhpKafka\PhpAvroSchemaGenerator\Parser\PropertyAttributesInterface;
 
-class PhpClassProperty implements PhpClassPropertyInterface
+final class PhpClassProperty implements PhpClassPropertyInterface
 {
     /** @var mixed */
     private $propertyDefault;

src/Registry/ClassRegistry.php

@@ -8,7 +8,6 @@
 use PhpKafka\PhpAvroSchemaGenerator\Converter\PhpClassConverterInterface;
 use PhpKafka\PhpAvroSchemaGenerator\Exception\ClassRegistryException;
 use PhpKafka\PhpAvroSchemaGenerator\Parser\TokenParser;
-use PhpKafka\PhpAvroSchemaGenerator\PhpClass\PhpClass;
 use PhpKafka\PhpAvroSchemaGenerator\PhpClass\PhpClassInterface;
 use RecursiveDirectoryIterator;
 use RecursiveIteratorIterator;