Commit0c71a93

authored and

committed

Fixed lazy-loading ghost objects generation with property hooks with default values.

1 parente408d54 commit0c71a93Copy full SHA for 0c71a93

File tree

+23

-7

lines changed

+23

-7

lines changed

Lines changed: 1 addition & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -80,7 +80,7 @@ public static function generateLazyGhost(\ReflectionClass $class): string`
`80`	`80`	`.($p->isProtected() ?'protected' :'public')`
`81`	`81`	`.($p->isProtectedSet() ?' protected(set)' :'')`
`82`	`82`	`."{$type}\${$name}"`
`83`		`- .($p->hasDefaultValue() ?' ='.$p->getDefaultValue() :'')`
	`83`	`+ .($p->hasDefaultValue() ?' ='.VarExporter::export($p->getDefaultValue()) :'')`
`84`	`84`	`." {\n";`
`85`	`85`
`86`	`86`	`foreach ($p->getHooks()as$hook =>$method) {`

Lines changed: 13 additions & 3 deletions

Original file line number	Diff line number	Diff line change
`@@ -4,8 +4,18 @@`
`4`	`4`
`5`	`5`	`class HookedWithDefaultValue`
`6`	`6`	`{`
`7`		`-publicint$backedWithDefault =321 {`
`8`		`- get =>$this->backedWithDefault;`
`9`		`- set =>$this->backedWithDefault =$value;`
	`7`	`+publicint$backedIntWithDefault =321 {`
	`8`	`+ get =>$this->backedIntWithDefault;`
	`9`	`+ set =>$this->backedIntWithDefault =$value;`
	`10`	`+ }`
	`11`	`+`
	`12`	`+publicstring$backedStringWithDefault ='321' {`
	`13`	`+ get =>$this->backedStringWithDefault;`
	`14`	`+ set =>$this->backedStringWithDefault =$value;`
	`15`	`+ }`
	`16`	`+`
	`17`	`+publicbool$backedBoolWithDefault =false {`
	`18`	`+ get =>$this->backedBoolWithDefault;`
	`19`	`+ set =>$this->backedBoolWithDefault =$value;`
`10`	`20`	`}`
`11`	`21`	`}`

Lines changed: 9 additions & 3 deletions

Original file line number	Diff line number	Diff line change
`@@ -516,16 +516,22 @@ public function testPropertyHooksWithDefaultValue()`
`516`	`516`	`$initialized =true;`
`517`	`517`	`});`
`518`	`518`
`519`		`-$this->assertSame(321,$object->backedWithDefault);`
	`519`	`+$this->assertSame(321,$object->backedIntWithDefault);`
	`520`	`+$this->assertSame('321',$object->backedStringWithDefault);`
	`521`	`+$this->assertSame(false,$object->backedBoolWithDefault);`
`520`	`522`	`$this->assertTrue($initialized);`
`521`	`523`
`522`	`524`	`$initialized =false;`
`523`	`525`	`$object =$this->createLazyGhost(HookedWithDefaultValue::class,function ($instance)use (&$initialized) {`
`524`	`526`	`$initialized =true;`
`525`	`527`	`});`
`526`		`-$object->backedWithDefault =654;`
	`528`	`+$object->backedIntWithDefault =654;`
	`529`	`+$object->backedStringWithDefault ='654';`
	`530`	`+$object->backedBoolWithDefault =true;`
`527`	`531`	`$this->assertTrue($initialized);`
`528`		`-$this->assertSame(654,$object->backedWithDefault);`
	`532`	`+$this->assertSame(654,$object->backedIntWithDefault);`
	`533`	`+$this->assertSame('654',$object->backedStringWithDefault);`
	`534`	`+$this->assertSame(true,$object->backedBoolWithDefault);`
`529`	`535`	`}`
`530`	`536`
`531`	`537`	`/**`

Comments

(0)