Fixed __NAMESPACE__ magic constant value

ondrejmirtes · ondrejmirtes · commit 0d4619b8cc64 · 2019-03-14T10:32:26.000+01:00
diff --git a/src/Analyser/Scope.php b/src/Analyser/Scope.php
@@ -1079,17 +1079,7 @@ private function resolveType(Expr $node): Type
 		} elseif ($node instanceof Node\Scalar\MagicConst\File) {
 			return new ConstantStringType($this->getFile());
 		} elseif ($node instanceof Node\Scalar\MagicConst\Namespace_) {
-			if (!$this->isInClass()) {
-				return new ConstantStringType('');
-			}
-
-			$className = $this->getClassReflection()->getName();
-			$parts = explode('\\', $className);
-			if (count($parts) <= 1) {
-				return new ConstantStringType('');
-			}
-
-			return new ConstantStringType($parts[0]);
+			return new ConstantStringType($this->namespace ?? '');
 		} elseif ($node instanceof Node\Scalar\MagicConst\Method) {
 			if ($this->isInAnonymousFunction()) {
 				return new ConstantStringType('{closure}');
diff --git a/tests/PHPStan/Analyser/NodeScopeResolverTest.php b/tests/PHPStan/Analyser/NodeScopeResolverTest.php
@@ -2339,15 +2339,15 @@ public function dataBinaryOperations(): array
 				'$file',
 			],
 			[
-				'\'BinaryOperations\'',
+				'\'BinaryOperations\\\\NestedNamespace\'',
 				'$namespace',
 			],
 			[
-				'\'BinaryOperations\\\\Foo\'',
+				'\'BinaryOperations\\\\NestedNamespace\\\\Foo\'',
 				'$class',
 			],
 			[
-				'\'BinaryOperations\\\\Foo::doFoo\'',
+				'\'BinaryOperations\\\\NestedNamespace\\\\Foo::doFoo\'',
 				'$method',
 			],
 			[
@@ -2508,7 +2508,7 @@ public function dataBinaryOperations(): array
 			],
 			[
 				'true',
-				'$foo instanceof \BinaryOperations\Foo',
+				'$foo instanceof \BinaryOperations\NestedNamespace\Foo',
 			],
 			[
 				'bool',
diff --git a/tests/PHPStan/Analyser/data/binary.php b/tests/PHPStan/Analyser/data/binary.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace BinaryOperations;
+namespace BinaryOperations\NestedNamespace;
 
 class Foo
 {

Original file line number	Diff line number	Diff line change
`@@ -2339,15 +2339,15 @@ public function dataBinaryOperations(): array`
`2339`	`2339`	`'$file',`
`2340`	`2340`	`],`
`2341`	`2341`	`[`
`2342`		`- '\'BinaryOperations\'',`
	`2342`	`+ '\'BinaryOperations\\\\NestedNamespace\'',`
`2343`	`2343`	`'$namespace',`
`2344`	`2344`	`],`
`2345`	`2345`	`[`
`2346`		`- '\'BinaryOperations\\\\Foo\'',`
	`2346`	`+ '\'BinaryOperations\\\\NestedNamespace\\\\Foo\'',`
`2347`	`2347`	`'$class',`
`2348`	`2348`	`],`
`2349`	`2349`	`[`
`2350`		`- '\'BinaryOperations\\\\Foo::doFoo\'',`
	`2350`	`+ '\'BinaryOperations\\\\NestedNamespace\\\\Foo::doFoo\'',`
`2351`	`2351`	`'$method',`
`2352`	`2352`	`],`
`2353`	`2353`	`[`
`@@ -2508,7 +2508,7 @@ public function dataBinaryOperations(): array`
`2508`	`2508`	`],`
`2509`	`2509`	`[`
`2510`	`2510`	`'true',`
`2511`		`- '$foo instanceof \BinaryOperations\Foo',`
	`2511`	`+ '$foo instanceof \BinaryOperations\NestedNamespace\Foo',`
`2512`	`2512`	`],`
`2513`	`2513`	`[`
`2514`	`2514`	`'bool',`
Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,6 @@`
`1`	`1`	`<?php`
`2`	`2`
`3`		`-namespace BinaryOperations;`
	`3`	`+namespace BinaryOperations\NestedNamespace;`
`4`	`4`
`5`	`5`	`class Foo`
`6`	`6`	`{`