Use Hyperf\Context\ApplicationContext instead of Hyperf\Utils\ApplicationContext. (#5621)

Author: limingxinleo

src/Aop/ProxyTrait.php

@@ -12,10 +12,10 @@
 namespace Hyperf\Di\Aop;
 
 use Closure;
+use Hyperf\Context\ApplicationContext;
 use Hyperf\Di\Annotation\AnnotationCollector;
 use Hyperf\Di\Annotation\AspectCollector;
 use Hyperf\Di\ReflectionManager;
-use Hyperf\Utils\ApplicationContext;
 use SplPriorityQueue;
 
 trait ProxyTrait

src/Aop/RegisterInjectPropertyHandler.php

@@ -11,11 +11,11 @@
  */
 namespace Hyperf\Di\Aop;
 
+use Hyperf\Context\ApplicationContext;
 use Hyperf\Di\Annotation\Inject;
 use Hyperf\Di\Definition\PropertyHandlerManager;
 use Hyperf\Di\Exception\NotFoundException;
 use Hyperf\Di\ReflectionManager;
-use Hyperf\Utils\ApplicationContext;
 use Throwable;
 
 class RegisterInjectPropertyHandler

src/LazyLoader/LazyProxyTrait.php

@@ -11,7 +11,7 @@
  */
 namespace Hyperf\Di\LazyLoader;
 
-use Hyperf\Utils\ApplicationContext;
+use Hyperf\Context\ApplicationContext;
 
 trait LazyProxyTrait
 {

tests/Annotation/ScannerTest.php

@@ -11,13 +11,13 @@
  */
 namespace HyperfTest\Di\Annotation;
 
+use Hyperf\Context\ApplicationContext;
 use Hyperf\Contract\ContainerInterface;
 use Hyperf\Di\Annotation\AnnotationReader;
 use Hyperf\Di\Annotation\ScanConfig;
 use Hyperf\Di\Annotation\Scanner;
 use Hyperf\Di\ReflectionManager;
 use Hyperf\Di\ScanHandler\NullScanHandler;
-use Hyperf\Utils\ApplicationContext;
 use Hyperf\Utils\Composer;
 use Hyperf\Utils\Filesystem\Filesystem;
 use HyperfTest\Di\Stub\AnnotationCollector;

tests/InjectTest.php

@@ -12,6 +12,7 @@
 namespace HyperfTest\Di;
 
 use Exception;
+use Hyperf\Context\ApplicationContext;
 use Hyperf\Contract\ContainerInterface;
 use Hyperf\Di\Annotation\AnnotationReader;
 use Hyperf\Di\Annotation\Inject;
@@ -21,7 +22,6 @@
 use Hyperf\Di\Exception\AnnotationException;
 use Hyperf\Di\ReflectionManager;
 use Hyperf\Di\ScanHandler\NullScanHandler;
-use Hyperf\Utils\ApplicationContext;
 use HyperfTest\Di\ExceptionStub\DemoInjectException;
 use HyperfTest\Di\Stub\AnnotationCollector;
 use HyperfTest\Di\Stub\AspectCollector;

tests/LazyProxyTraitTest.php

@@ -11,9 +11,9 @@
  */
 namespace HyperfTest\Di;
 
+use Hyperf\Context\ApplicationContext;
 use Hyperf\Di\Container;
 use Hyperf\Di\LazyLoader\LazyProxyTrait;
-use Hyperf\Utils\ApplicationContext;
 use HyperfTest\Di\Stub\LazyLoad\BarLazyLoad;
 use HyperfTest\Di\Stub\LazyLoad\FooLazyLoad;
 use HyperfTest\Di\Stub\LazyProxy;

tests/MakeTest.php

@@ -11,9 +11,9 @@
  */
 namespace HyperfTest\Di;
 
+use Hyperf\Context\ApplicationContext;
 use Hyperf\Di\Container;
 use Hyperf\Di\Definition\DefinitionSource;
-use Hyperf\Utils\ApplicationContext;
 use HyperfTest\Di\Stub\Bar;
 use HyperfTest\Di\Stub\Demo;
 use HyperfTest\Di\Stub\Foo;

tests/ProxyTraitTest.php

@@ -11,9 +11,9 @@
  */
 namespace HyperfTest\Di;
 
+use Hyperf\Context\ApplicationContext;
 use Hyperf\Di\Annotation\AnnotationCollector;
 use Hyperf\Di\Annotation\AspectCollector;
-use Hyperf\Utils\ApplicationContext;
 use HyperfTest\Di\Stub\Aspect\GetNameAspect;
 use HyperfTest\Di\Stub\Aspect\IncrAspect;
 use HyperfTest\Di\Stub\Aspect\IncrAspectAnnotation;