PropertySource: toString() returns non-static property name without $…

… prefix to match PHP behaviour
orisai · Jul 10, 2023 · 677d1c2 · 677d1c2
1 parent fe6b5bf
commit 677d1c2
Show file tree

Hide file tree

Showing 6 changed files with 11 additions and 7 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -7,6 +7,10 @@ and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.
 
 ## [Unreleased](https://github.com/orisai/source-map/compare/1.0.0...HEAD)
 
+### Changed
+
+- `PropertySource->toString()` returns non-static property name without `$` prefix to match PHP behaviour
+
 ## [1.0.0](https://github.com/orisai/source-map/releases/tag/1.0.0) - 2023-01-10
 
 ### Added

diff --git a/src/PropertySource.php b/src/PropertySource.php
@@ -42,10 +42,10 @@ public function toString(): string
 		$this->throwIfInvalid();
 
 		$symbol = $this->reflector->isStatic()
-			? '::'
+			? '::$'
 			: '->';
 
-		return "{$this->getClass()->toString()}$symbol\${$this->reflector->getName()}";
+		return "{$this->getClass()->toString()}$symbol{$this->reflector->getName()}";
 	}
 
 	public function isValid(): bool

diff --git a/tests/Unit/AnnotationSourceTest.php b/tests/Unit/AnnotationSourceTest.php
@@ -68,7 +68,7 @@ public function provideTarget(): Generator
 
 		yield [
 			new PropertySource(new ReflectionProperty($class, 'test')),
-			"{$class}->\$test",
+			"{$class}->test",
 		];
 
 		require_once __DIR__ . '/../Doubles/testFunction.php';

diff --git a/tests/Unit/AttributeSourceTest.php b/tests/Unit/AttributeSourceTest.php
@@ -75,7 +75,7 @@ public function provideTarget(): Generator
 
 		yield [
 			new PropertySource(new ReflectionProperty($class, 'test')),
-			"{$class}->\$test",
+			"{$class}->test",
 		];
 
 		require_once __DIR__ . '/../Doubles/testFunction.php';

diff --git a/tests/Unit/EmptyAboveReflectorSourceTest.php b/tests/Unit/EmptyAboveReflectorSourceTest.php
@@ -63,7 +63,7 @@ public function provideTarget(): Generator
 
 		yield [
 			new PropertySource(new ReflectionProperty($class, 'test')),
-			"{$class}->\$test",
+			"{$class}->test",
 		];
 
 		require_once __DIR__ . '/../Doubles/testFunction.php';

diff --git a/tests/Unit/PropertySourceTest.php b/tests/Unit/PropertySourceTest.php
@@ -32,7 +32,7 @@ public function test(): void
 		self::assertEquals($classSource, $source->getClass());
 		self::assertSame($reflector, $source->getReflector());
 
-		self::assertSame("$class->\$test", $source->toString());
+		self::assertSame("{$class}->test", $source->toString());
 		self::assertSame($source->toString(), (string) $source);
 
 		self::assertEquals($source->getClass()->getLastChange(), $source->getLastChange());
@@ -66,7 +66,7 @@ public function testSerializationBC(): void
 		self::assertTrue($source->isValid());
 		self::assertEquals($classSource, $source->getClass());
 		self::assertEquals($reflector, $source->getReflector());
-		self::assertSame("$class->\$test", $source->toString());
+		self::assertSame("{$class}->test", $source->toString());
 		self::assertEquals($source, unserialize(serialize($source)));
 	}