fix: fix to PhpTypeExpression#parseType argument type error. add IntersectionType.

smeghead · smeghead · commit 32c42c9325f6 · 2023-09-09T22:44:44.000+09:00
add `final` to classes.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,5 +1,10 @@
 # CHANGELOG
 
+### Bug fix
+
+ * fix to PhpTypeExpression#parseType argument type error. add IntersectionType.
+ * add `final` to classes.
+
 ## v1.2.1 (2023-09-07)
 
 ### Bug fix
diff --git a/src/Config/Options.php b/src/Config/Options.php
@@ -4,7 +4,7 @@
 
 namespace Smeghead\PhpClassDiagram\Config;
 
-class Options
+final class Options
 {
     /** @var array<string, mixed> */
     private array $opt;
diff --git a/src/DiagramElement/ArrowDependency.php b/src/DiagramElement/ArrowDependency.php
@@ -6,7 +6,7 @@
 
 use Smeghead\PhpClassDiagram\Php\PhpClass;
 
-class ArrowDependency extends Arrow
+final class ArrowDependency extends Arrow
 {
     protected string $figure = '..>';
 
diff --git a/src/DiagramElement/ArrowInheritance.php b/src/DiagramElement/ArrowInheritance.php
@@ -6,7 +6,7 @@
 
 use Smeghead\PhpClassDiagram\Php\PhpClass;
 
-class ArrowInheritance extends Arrow
+final class ArrowInheritance extends Arrow
 {
     protected string $figure = '<|--';
 
diff --git a/src/DiagramElement/Division/DivisionColor.php b/src/DiagramElement/Division/DivisionColor.php
@@ -4,7 +4,7 @@
 
 namespace Smeghead\PhpClassDiagram\DiagramElement\Division;
 
-class DivisionColor
+final class DivisionColor
 {
     private static \Generator $gen;
     public static function nextColor(): string
diff --git a/src/DiagramElement/Entry.php b/src/DiagramElement/Entry.php
@@ -4,7 +4,6 @@
 
 namespace Smeghead\PhpClassDiagram\DiagramElement;
 
-use Generator;
 use Smeghead\PhpClassDiagram\Config\Options;
 use Smeghead\PhpClassDiagram\DiagramElement\Division\DivisionColor;
 use Smeghead\PhpClassDiagram\Php\{
@@ -14,7 +13,7 @@
     PhpMethodParameter,
 };
 
-class Entry
+final class Entry
 {
     private Options $options;
     private string $directory;
diff --git a/src/DiagramElement/ExternalPackage/PackageHierarchy.php b/src/DiagramElement/ExternalPackage/PackageHierarchy.php
@@ -4,7 +4,7 @@
 
 namespace Smeghead\PhpClassDiagram\DiagramElement\ExternalPackage;
 
-class PackageHierarchy
+final class PackageHierarchy
 {
     private PackageNode $root;
 
diff --git a/src/DiagramElement/Package.php b/src/DiagramElement/Package.php
@@ -6,7 +6,7 @@
 
 use Smeghead\PhpClassDiagram\Config\Options;
 
-class Package
+final class Package
 {
     private Options $options;
 
diff --git a/src/DiagramElement/PackageArrow.php b/src/DiagramElement/PackageArrow.php
@@ -4,7 +4,7 @@
 
 namespace Smeghead\PhpClassDiagram\DiagramElement;
 
-class PackageArrow
+final class PackageArrow
 {
     private string $from;
     private string $to;
diff --git a/src/DiagramElement/PackageRelations.php b/src/DiagramElement/PackageRelations.php
@@ -7,7 +7,7 @@
 use Smeghead\PhpClassDiagram\DiagramElement\ExternalPackage\PackageHierarchy;
 use Smeghead\PhpClassDiagram\Php\PhpType;
 
-class PackageRelations
+final class PackageRelations
 {
     /** @var array<string, array<int, PhpType>> */
     private array $uses;
diff --git a/src/DiagramElement/Relation.php b/src/DiagramElement/Relation.php
@@ -6,7 +6,7 @@
 
 use Smeghead\PhpClassDiagram\Config\Options;
 
-class Relation
+final class Relation
 {
     private Options $options;
     private Package $package;
diff --git a/src/Main.php b/src/Main.php
@@ -12,7 +12,7 @@
 };
 use Smeghead\PhpClassDiagram\Php\PhpReader;
 
-class Main
+final class Main
 {
     const VERSION = 'v1.2.1';
 
diff --git a/src/Php/Doc/PhpDocComment.php b/src/Php/Doc/PhpDocComment.php
@@ -13,7 +13,7 @@
 use PHPStan\PhpDocParser\Parser\TokenIterator;
 use PHPStan\PhpDocParser\Parser\TypeParser;
 
-class PhpDocComment
+final class PhpDocComment
 {
     private string $text = '';
 
diff --git a/src/Php/PhpAccessModifier.php b/src/Php/PhpAccessModifier.php
@@ -12,7 +12,7 @@
     Property,
 };
 
-class PhpAccessModifier
+final class PhpAccessModifier
 {
     private bool $public = false;
     private bool $protected = false;
diff --git a/src/Php/PhpClass.php b/src/Php/PhpClass.php
@@ -5,7 +5,6 @@
 namespace Smeghead\PhpClassDiagram\Php;
 
 use PhpParser\Node\Name\FullyQualified;
-use PhpParser\Node\Stmt;
 use PhpParser\Node\Stmt\{
     Namespace_,
     ClassLike,
@@ -20,7 +19,7 @@
 use Smeghead\PhpClassDiagram\Php\Finders\FindConstructerProperties;
 use Smeghead\PhpClassDiagram\Php\Finders\FindUsePhpTypes;
 
-class PhpClass
+final class PhpClass
 {
     /** @var string[] directory parts */
     private array $dirs;
diff --git a/src/Php/PhpEnumCase.php b/src/Php/PhpEnumCase.php
@@ -4,13 +4,12 @@
 
 namespace Smeghead\PhpClassDiagram\Php;
 
-use PhpParser\Comment\Doc;
 use PhpParser\Node\Stmt\{
     EnumCase,
 };
 use Smeghead\PhpClassDiagram\Php\Doc\PhpDocComment;
 
-class PhpEnumCase
+final class PhpEnumCase
 {
     private string $name;
     private PhpDocComment $doc;
diff --git a/src/Php/PhpMethod.php b/src/Php/PhpMethod.php
@@ -5,15 +5,13 @@
 namespace Smeghead\PhpClassDiagram\Php;
 
 use PhpParser\Node\{
-    NullableType,
-    Name,
     Param,
 };
 use PhpParser\Node\Stmt\{
     ClassMethod,
 };
 
-class PhpMethod
+final class PhpMethod
 {
     private string $name;
     private PhpTypeExpression $type;
diff --git a/src/Php/PhpMethodParameter.php b/src/Php/PhpMethodParameter.php
@@ -4,7 +4,7 @@
 
 namespace Smeghead\PhpClassDiagram\Php;
 
-class PhpMethodParameter
+final class PhpMethodParameter
 {
     private string $name;
     private PhpTypeExpression $type;
diff --git a/src/Php/PhpProperty.php b/src/Php/PhpProperty.php
@@ -10,7 +10,7 @@
     Property,
 };
 
-class PhpProperty
+final class PhpProperty
 {
     private string $name;
     private PhpTypeExpression $type;
diff --git a/src/Php/PhpReader.php b/src/Php/PhpReader.php
@@ -14,7 +14,7 @@
 use PhpParser\NodeVisitor\NameResolver;
 use Smeghead\PhpClassDiagram\Config\Options;
 
-class PhpReader
+final class PhpReader
 {
     private PhpClass $class;
 
diff --git a/src/Php/PhpType.php b/src/Php/PhpType.php
@@ -4,7 +4,7 @@
 
 namespace Smeghead\PhpClassDiagram\Php;
 
-class PhpType
+final class PhpType
 {
     private string $name;
     private string $meta;
diff --git a/src/Php/PhpTypeExpression.php b/src/Php/PhpTypeExpression.php
@@ -6,17 +6,17 @@
 
 use PhpParser\Node;
 use PhpParser\Node\Identifier;
+use PhpParser\Node\IntersectionType;
 use PhpParser\Node\Name;
 use PhpParser\Node\Name\FullyQualified;
 use PhpParser\Node\NullableType;
 use PhpParser\Node\Param;
 use PhpParser\Node\Stmt\ClassMethod;
 use PhpParser\Node\Stmt\Property;
 use PhpParser\Node\UnionType;
-use PhpParser\NodeAbstract;
 use Smeghead\PhpClassDiagram\Php\Doc\PhpDocComment;
 
-class PhpTypeExpression
+final class PhpTypeExpression
 {
     public const VAR = 'var';
     public const PARAM = 'param';
@@ -126,11 +126,11 @@ public static function buildByPhpType(PhpType $type): self
     }
 
     /**
-     * @param Property|Identifier|NullableType|Name|UnionType|null $type 型を表すAST (UnionTypeが指定されて呼び出される時は、typeStringで判断する時なので型判定には使われない)
+     * @param Property|Identifier|NullableType|Name|UnionType|IntersectionType|null $type 型を表すAST (UnionTypeが指定されて呼び出される時は、typeStringで判断する時なので型判定には使われない)
      * @param string[] $currentNamespace 名前空間配列
      * @param ?string $typeString コメントの型表記
      */
-    private function parseType(Property|Identifier|NullableType|Name|UnionType|null $type, array $currentNamespace, ?string $typeString = ''): PhpType
+    private function parseType(Property|Identifier|NullableType|Name|UnionType|IntersectionType|null $type, array $currentNamespace, ?string $typeString = ''): PhpType
     {
         $parts = [];
         if (!empty($typeString)) {

Original file line number	Diff line number	Diff line change
`@@ -4,7 +4,7 @@`
`4`	`4`
`5`	`5`	`namespace Smeghead\PhpClassDiagram\Config;`
`6`	`6`
`7`		`-class Options`
	`7`	`+final class Options`
`8`	`8`	`{`
`9`	`9`	`/** @var array<string, mixed> */`
`10`	`10`	`private array $opt;`
Original file line number	Diff line number	Diff line change
`@@ -6,7 +6,7 @@`
`6`	`6`
`7`	`7`	`use Smeghead\PhpClassDiagram\Php\PhpClass;`
`8`	`8`
`9`		`-class ArrowDependency extends Arrow`
	`9`	`+final class ArrowDependency extends Arrow`
`10`	`10`	`{`
`11`	`11`	`protected string $figure = '..>';`
`12`	`12`
Original file line number	Diff line number	Diff line change
`@@ -6,7 +6,7 @@`
`6`	`6`
`7`	`7`	`use Smeghead\PhpClassDiagram\Php\PhpClass;`
`8`	`8`
`9`		`-class ArrowInheritance extends Arrow`
	`9`	`+final class ArrowInheritance extends Arrow`
`10`	`10`	`{`
`11`	`11`	`protected string $figure = '<\|--';`
`12`	`12`
Original file line number	Diff line number	Diff line change
`@@ -4,7 +4,7 @@`
`4`	`4`
`5`	`5`	`namespace Smeghead\PhpClassDiagram\DiagramElement\Division;`
`6`	`6`
`7`		`-class DivisionColor`
	`7`	`+final class DivisionColor`
`8`	`8`	`{`
`9`	`9`	`private static \Generator $gen;`
`10`	`10`	`public static function nextColor(): string`
Original file line number	Diff line number	Diff line change
`@@ -4,7 +4,7 @@`
`4`	`4`
`5`	`5`	`namespace Smeghead\PhpClassDiagram\DiagramElement\ExternalPackage;`
`6`	`6`
`7`		`-class PackageHierarchy`
	`7`	`+final class PackageHierarchy`
`8`	`8`	`{`
`9`	`9`	`private PackageNode $root;`
`10`	`10`
Original file line number	Diff line number	Diff line change
`@@ -6,7 +6,7 @@`
`6`	`6`
`7`	`7`	`use Smeghead\PhpClassDiagram\Config\Options;`
`8`	`8`
`9`		`-class Package`
	`9`	`+final class Package`
`10`	`10`	`{`
`11`	`11`	`private Options $options;`
`12`	`12`
Original file line number	Diff line number	Diff line change
`@@ -4,7 +4,7 @@`
`4`	`4`
`5`	`5`	`namespace Smeghead\PhpClassDiagram\DiagramElement;`
`6`	`6`
`7`		`-class PackageArrow`
	`7`	`+final class PackageArrow`
`8`	`8`	`{`
`9`	`9`	`private string $from;`
`10`	`10`	`private string $to;`
Original file line number	Diff line number	Diff line change
`@@ -7,7 +7,7 @@`
`7`	`7`	`use Smeghead\PhpClassDiagram\DiagramElement\ExternalPackage\PackageHierarchy;`
`8`	`8`	`use Smeghead\PhpClassDiagram\Php\PhpType;`
`9`	`9`
`10`		`-class PackageRelations`
	`10`	`+final class PackageRelations`
`11`	`11`	`{`
`12`	`12`	`/** @var array<string, array<int, PhpType>> */`
`13`	`13`	`private array $uses;`