修正app对象

top-think · Nov 27, 2020 · fe70b5f · fe70b5f
1 parent 589c562
commit fe70b5f
Showing 1 changed file with 5 additions and 5 deletions.
diff --git a/src/InteractsWithInject.php b/src/InteractsWithInject.php
@@ -10,7 +10,7 @@
 /**
  * Trait InteractsWithInject
  * @package think\annotation\traits
- * @property App  $app
+ * @property App $app
  * @property Reader $reader
  */
 trait InteractsWithInject
@@ -29,7 +29,7 @@ protected function getDocReader()
  protected function autoInject()
  {
  if ($this->app->config->get('annotation.inject.enable', true)) {
- $this->app->resolving(function ($object) {
+ $this->app->resolving(function ($object, $app) {
 
  if ($this->isInjectClass(get_class($object))) {
 
@@ -42,12 +42,12 @@ protected function autoInject()
  $annotation = $this->reader->getPropertyAnnotation($refProperty, Inject::class);
  if ($annotation) {
  if ($annotation->value) {
- $value = $this->app->make($annotation->value);
+ $value = $app->make($annotation->value);
  } else {
  //获取@var类名
  $propertyClass = $reader->getPropertyClass($refProperty);
  if ($propertyClass) {
- $value = $this->app->make($propertyClass);
+ $value = $app->make($propertyClass);
  }
  }
 
@@ -62,7 +62,7 @@ protected function autoInject()
  }
 
  if ($refObject->hasMethod('__injected')) {
- $this->app->invokeMethod([$object, '__injected']);
+ $app->invokeMethod([$object, '__injected']);
  }
  }
  });