Merge pull request #57 from open-code-modeling/0.10.x-merge-up-into-0.11.x_6001ae7cb9f6e2.93351564

Merge release 0.10.1 into 0.11.x

Author: sandrokeil

CHANGELOG.md

@@ -24,6 +24,25 @@ All notable changes to this project will be documented in this file, in reverse
 
 - Nothing.
 
+## 0.10.1 - 2021-01-15
+
+
+-----
+
+### Release Notes for [0.10.1](https://github.com/open-code-modeling/php-code-ast/milestone/20)
+
+0.10.x bugfix release (patch)
+
+### 0.10.1
+
+- Total issues resolved: **1**
+- Total pull requests resolved: **0**
+- Total contributors: **1**
+
+#### bug
+
+ - [56: Fix double slashes in path for Psr4Info](https://github.com/open-code-modeling/php-code-ast/issues/56) thanks to @sandrokeil
+
 ## 0.9.1 - TBD
 
 ### Added

src/Package/Psr4Info.php

@@ -110,10 +110,9 @@ public function getPath(string $fqcn): string
     public function getFilenameFromPathAndName(string $path, string $name): string
     {
         $filePath = $this->getSourceFolder() . DIRECTORY_SEPARATOR;
+        $filePath .= $this->normalizePath($path) . DIRECTORY_SEPARATOR;
 
-        if ($path = \trim($path, '/')) {
-            $filePath .= $this->normalizePath($path) . DIRECTORY_SEPARATOR;
-        }
+        $filePath = \str_replace('//', '/', $filePath);
 
         return $filePath . $name . '.php';
     }

tests/Package/Psr4InfoTest.php

@@ -42,6 +42,15 @@ public function it_can_be_created_from_composer(): void
 
         $this->assertSame('OpenCodeModelingTest\\CodeAst', $psr4InfoList[3]->getPackagePrefix());
         $this->assertSame('/service/tests', $psr4InfoList[3]->getSourceFolder());
+
+        $this->assertSame(
+            '/service/src/Domain/Model/Building/Building.php',
+            $psr4InfoList[0]->getFilenameFromPathAndName('/service/src/Domain/Model/Building', 'Building')
+        );
+        $this->assertSame(
+            '/service/src/Domain/Model/Building/Building.php',
+            $psr4InfoList[0]->getFilenameFromPathAndName('Domain/Model/Building', 'Building')
+        );
     }
 
     /**