Merge pull request #91 from jose-ba/main

fix: allow paths with hyphens

Author: smeghead

src/Php/PhpClass.php

@@ -76,7 +76,7 @@ public function getLogicalName(): string
      */
     public function getClassNameAlias(): string
     {
-        return str_replace(['.', '[', ']'], '_', $this->getLogicalName());
+        return str_replace(['-', '.', '[', ']'], ['', '_', '_', '_'], $this->getLogicalName());
     }
 
     public function getClassType(): PhpType

test/PackageTest.php

@@ -246,6 +246,37 @@ class "Name" as product_Name
 EOS;
         $this->assertSame($expected, implode(PHP_EOL, $rel->dump()), 'output PlantUML script.');
     }
+
+    public function testDump_paths_with_hyphens_To_avoid_PlantUML_errors(): void
+    {
+        $directory = sprintf('%s/paths-with-hyphens', $this->fixtureDir);
+        $options = new Options([
+            'disable-class-properties' => true,
+            'disable-class-methods' => true,
+        ]);
+        $files = [
+            'product-with-hyphens/Product.php',
+            'product-with-hyphens/Price.php',
+            'product-with-hyphens/Name.php',
+        ];
+
+        $rel = $this->getRelation($files, $directory, $options);
+
+        $expected = <<<EOS
+@startuml class-diagram
+  package product-with-hyphens as product-with-hyphens {
+    class "Product" as productwithhyphens_Product
+    class "Price" as productwithhyphens_Price
+    class "Name" as productwithhyphens_Name
+  }
+  productwithhyphens_Product ..> productwithhyphens_Name
+  productwithhyphens_Product ..> productwithhyphens_Price
+  productwithhyphens_Product ..> productwithhyphens_Product
+@enduml
+EOS;
+        $this->assertSame($expected, implode(PHP_EOL, $rel->dump()), 'output PlantUML script.');
+    }
+
     public function testDumpPackage1(): void
     {
         $directory = sprintf('%s/no-namespace', $this->fixtureDir);

test/fixtures/paths-with-hyphens/product-with-hyphens/Name.php

@@ -0,0 +1,4 @@
+<?php
+class Name {
+    private string $name;
+}

test/fixtures/paths-with-hyphens/product-with-hyphens/Price.php

@@ -0,0 +1,6 @@
+<?php
+use PhpParse\PhpParser;
+
+class Price {
+    private int $price;
+}

test/fixtures/paths-with-hyphens/product-with-hyphens/Product.php

@@ -0,0 +1,10 @@
+<?php
+
+class Product {
+    private Name $name;
+    private Price $price;
+
+    /** @return Product product */
+    public function method1(string $param1): Product {
+    }
+}