Commit cbf2b32

authored

Merge branch refs/heads/1.12.x into 2.1.x

2 parents 3a62b4c + 812d7da commit cbf2b32Copy full SHA for cbf2b32

File tree

-5

lines changed

-5

lines changed

Lines changed: 2 additions & 5 deletions

Original file line number	Diff line number	Diff line change
`@@ -516,12 +516,9 @@ public function testBug6255(): void`
`516`	`516`	`public function testBug6300(): void`
`517`	`517`	`{`
`518`	`518`	`$errors = $this->runAnalyse(__DIR__ . '/data/bug-6300.php');`
`519`		`- $this->assertCount(2, $errors);`
	`519`	`+ $this->assertCount(1, $errors);`
`520`	`520`	`$this->assertSame('Call to an undefined method Bug6300\Bar::get().', $errors[0]->getMessage());`
`521`		`- $this->assertSame(23, $errors[0]->getLine());`
`522`		`-`
`523`		`- $this->assertSame('Access to an undefined property Bug6300\Bar::$fooProp.', $errors[1]->getMessage());`
`524`		`- $this->assertSame(24, $errors[1]->getLine());`
	`521`	`+ $this->assertSame(27, $errors[0]->getLine());`
`525`	`522`	`}`
`526`	`523`
`527`	`524`	`public function testBug6466(): void`

Lines changed: 4 additions & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -2,9 +2,12 @@`
`2`	`2`
`3`	`3`	`namespace Bug6300;`
`4`	`4`
	`5`	`+use AllowDynamicProperties;`
	`6`	`+`
`5`	`7`	`/**`
`6`	`8`	`* @mixin Bar`
`7`	`9`	`*/`
	`10`	`+#[AllowDynamicProperties]`
`8`	`11`	`class Foo`
`9`	`12`	`{`
`10`	`13`
`@@ -13,6 +16,7 @@ class Foo`
`13`	`16`	`/**`
`14`	`17`	`* @mixin Foo`
`15`	`18`	`*/`
	`19`	`+#[AllowDynamicProperties]`
`16`	`20`	`class Bar`
`17`	`21`	`{`
`18`	`22`

Comments

(0)