Commit8dc648e

committed

Merge branch '6.4' into 7.3

* 6.4: Replace __sleep/wakeup() by __(un)serialize() for throwing and internal usages

2 parents19961cd +6fc4c44 commit8dc648eCopy full SHA for 8dc648e

File tree

-4

lines changed

-4

lines changed

Lines changed: 2 additions & 2 deletions

Original file line number	Diff line number	Diff line change
`@@ -36,12 +36,12 @@ public function __construct(`
`36`	`36`	`$this->route =newRoute('');`
`37`	`37`	`}`
`38`	`38`
`39`		`-publicfunction__sleep():array`
	`39`	`+publicfunction__serialize():array`
`40`	`40`	`{`
`41`	`41`	`thrownew \BadMethodCallException('Cannot serialize'.__CLASS__);`
`42`	`42`	`}`
`43`	`43`
`44`		`-publicfunction__wakeup():void`
	`44`	`+publicfunction__unserialize(array$data):void`
`45`	`45`	`{`
`46`	`46`	`thrownew \BadMethodCallException('Cannot unserialize'.__CLASS__);`
`47`	`47`	`}`

Lines changed: 2 additions & 2 deletions

Original file line number	Diff line number	Diff line change
`@@ -29,12 +29,12 @@ public function __construct(`
`29`	`29`	`$this->route =$route;`
`30`	`30`	`}`
`31`	`31`
`32`		`-publicfunction__sleep():array`
	`32`	`+publicfunction__serialize():array`
`33`	`33`	`{`
`34`	`34`	`thrownew \BadMethodCallException('Cannot serialize'.__CLASS__);`
`35`	`35`	`}`
`36`	`36`
`37`		`-publicfunction__wakeup():void`
	`37`	`+publicfunction__unserialize(array$data):void`
`38`	`38`	`{`
`39`	`39`	`thrownew \BadMethodCallException('Cannot unserialize'.__CLASS__);`
`40`	`40`	`}`

Comments

(0)