Merge pull request #6 from mineadmin/2.0-dev

zds-s · web-flow · commit 86f88016ef1c · 2024-01-25T10:20:20.000+08:00
fixed instanceof reused is_subclass_of
diff --git a/src/mine-service/src/Abstracts/Mapper.php b/src/mine-service/src/Abstracts/Mapper.php
@@ -44,7 +44,7 @@ public function getModel(): string
         if (! empty(CrudModelCollector::list()[static::class])) {
             $modelClass = CrudModelCollector::list()[static::class];
         }
-        if (! class_exists($modelClass) || ! ($modelClass instanceof Model)) {
+        if (! class_exists($modelClass) || ! is_subclass_of($modelClass, Model::class)) {
             throw new ServiceException('The class to which the ' . static::class . ' class belongs was not found');
         }
         /* @var class-string<Model> $modelClass */

Original file line number	Diff line number	Diff line change
`@@ -44,7 +44,7 @@ public function getModel(): string`
`44`	`44`	`if (! empty(CrudModelCollector::list()[static::class])) {`
`45`	`45`	`$modelClass = CrudModelCollector::list()[static::class];`
`46`	`46`	`}`
`47`		`- if (! class_exists($modelClass) \|\| ! ($modelClass instanceof Model)) {`
	`47`	`+ if (! class_exists($modelClass) \|\| ! is_subclass_of($modelClass, Model::class)) {`
`48`	`48`	`throw new ServiceException('The class to which the ' . static::class . ' class belongs was not found');`
`49`	`49`	`}`
`50`	`50`	`/* @var class-string<Model> $modelClass */`