Commit ef029a5

committed

如果指定了装饰器,单未实现DecoratorInterface接口则报错

1 parent a9d7d82 commit ef029a5Copy full SHA for ef029a5

File tree

+12

-5

lines changed

+12

-5

lines changed

Lines changed: 6 additions & 2 deletions

Original file line number	Diff line number	Diff line change
`@@ -78,7 +78,7 @@ public static function getProperties(string $className): array`
`78`	`78`	`continue;`
`79`	`79`	`}`
`80`	`80`
`81`		`- //如果注释没有命名空间, 则查看是否再当前命名空间下存在该类`
	`81`	`+ //如果注释没有命名空间, 则查看是否在当前命名空间下存在该类`
`82`	`82`	`if (strpos($matchType, "\\") !== 0) {`
`83`	`83`	`$matchType = $reflection->getNamespaceName() . "\\" . $matchType;`
`84`	`84`	`}`
`@@ -105,10 +105,14 @@ protected static function getDecoratorByDoc(string $doc): ?string`
`105`	`105`	`//解析类似@return DecoratorInterface 的文档对象`
`106`	`106`	`preg_match("/@return[ ]+([\w\\\]+)/", $doc, $matches);`
`107`	`107`	`$decorator = $matches[1] ?? '';`
`108`		`- if (!$decorator \|\| !class_exists($decorator)) {`
	`108`	`+ if (!$decorator) {`
`109`	`109`	`return null;`
`110`	`110`	`}`
`111`	`111`
	`112`	`+ if (!is_subclass_of($decorator, \Xbyter\PhpObjectMapping\Interfaces\DecoratorInterface::class)) {`
	`113`	`+ throw new \ErrorException('The decorator does not implement DecoratorInterface');`
	`114`	`+ }`
	`115`	`+`
`112`	`116`	`return $decorator;`
`113`	`117`	`}`
`114`	`118`	`}`

Lines changed: 6 additions & 3 deletions

Original file line number	Diff line number	Diff line change
`@@ -84,15 +84,18 @@ public function fill($data, \Closure $newInstanceCallback, array $parentProperti`
`84`	`84`	`* @param string $propertyName`
`85`	`85`	`* @param $value`
`86`	`86`	`* @param string\|null $decoratorName`
	`87`	`+ * @throws \ErrorException`
`87`	`88`	`*/`
`88`	`89`	`protected function setPropertyValue(string $propertyName, $value, ?string $decoratorName = null): void`
`89`	`90`	`{`
`90`	`91`	`if ($decoratorName) {`
	`92`	`+ if (!is_subclass_of($decoratorName, \Xbyter\PhpObjectMapping\Interfaces\DecoratorInterface::class)) {`
	`93`	`+ throw new \ErrorException('The decorator does not implement DecoratorInterface');`
	`94`	`+ }`
	`95`	`+`
`91`	`96`	`//如果有装饰器, 则转为最新的值再赋值`
`92`	`97`	`$decorator = new $decoratorName();`
`93`		`- if ($decorator instanceof \Xbyter\PhpObjectMapping\Interfaces\DecoratorInterface) {`
`94`		`- $value = $decorator->decorate($value);`
`95`		`- }`
	`98`	`+ $value = $decorator->decorate($value);`
`96`	`99`	`}`
`97`	`100`	`$this->class->{$propertyName} = $value;`
`98`	`101`	`}`

Comments

(0)