Merge remote-tracking branch 'origin/0.10.x-merge-up-into-0.11.x_6013efa0677ab2.34585191' into 0.11.x

# Conflicts:
#	CHANGELOG.md

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.3 - 2021-01-29
+
+
+-----
+
+### Release Notes for [0.10.3](https://github.com/open-code-modeling/php-code-ast/milestone/23)
+
+0.10.x bugfix release (patch)
+
+### 0.10.3
+
+- Total issues resolved: **1**
+- Total pull requests resolved: **0**
+- Total contributors: **1**
+
+#### bug
+
+ - [63: Fix invalid class namespace](https://github.com/open-code-modeling/php-code-ast/issues/63) thanks to @sandrokeil
+
 ## 0.10.2 - 2021-01-20
 
 

src/Package/Psr4Info.php

@@ -86,9 +86,8 @@ public function getFullyQualifiedClassNameFromFilename(string $filename): string
     public function getClassNamespace(string $fcqn): string
     {
         $namespace = $this->normalizeNamespace($fcqn);
-        $namespace = \substr($namespace, 0, \strrpos($namespace, '/'));
 
-        return $this->normalizeNamespace($this->getPackagePrefix() . '\\' . $namespace);
+        return \substr($namespace, 0, \strrpos($namespace, '\\'));
     }
 
     public function getClassName(string $fqcn): string

tests/Package/Psr4InfoTest.php

@@ -329,7 +329,7 @@ public function providerForGetPathAndNameFromFilename(): array
      * @dataProvider providerForGetFullyQualifiedClassNameFromFilename
      * @covers       \OpenCodeModeling\CodeAst\Package\Psr4Info::getFullyQualifiedClassNameFromFilename
      */
-    public function it_returns_fqcn_from_filename($expected, $sourceFolder, $packagePrefix, $filename): void
+    public function it_returns_fqcn_from_filename($expectedFqcn, $expectedClassNamespace, $expectedClassName, $sourceFolder, $packagePrefix, $filename): void
     {
         $psr4Info = new Psr4Info(
             $sourceFolder,
@@ -338,7 +338,11 @@ public function it_returns_fqcn_from_filename($expected, $sourceFolder, $package
             $this->filterNamespaceToDirectory()
         );
 
-        self::assertSame($expected, $psr4Info->getFullyQualifiedClassNameFromFilename($filename));
+        $fqcn = $psr4Info->getFullyQualifiedClassNameFromFilename($filename);
+
+        self::assertSame($expectedFqcn, $fqcn);
+        self::assertSame($expectedClassNamespace, $psr4Info->getClassNamespace($fqcn));
+        self::assertSame($expectedClassName, $psr4Info->getClassName($fqcn));
     }
 
     /**
@@ -351,12 +355,16 @@ public function providerForGetFullyQualifiedClassNameFromFilename(): array
         return [
             [
                 'MyVendor\MyPackage\ModelPath\UserPath\User',
+                'MyVendor\MyPackage\ModelPath\UserPath',
+                'User',
                 'src',
                 '\MyVendor\MyPackage\\',
                 'src/ModelPath/UserPath/User.php',
             ],
             [
                 'MyVendor\MyPackage\ModelPath\UserPath\User',
+                'MyVendor\MyPackage\ModelPath\UserPath',
+                'User',
                 'src',
                 '\MyVendor\MyPackage\\',
                 'src/ModelPath/UserPath/User',