From c43225d766eb074051b441e7f7aef0131e8da03e Mon Sep 17 00:00:00 2001 From: huangzhhui Date: Thu, 27 Dec 2018 20:45:13 +0800 Subject: [PATCH] Rename Hyperf to ApplicationContext --- src/di/src/Aop/ProxyTrait.php | 4 ++-- src/framework/src/{Hyperflex.php => ApplicationContext.php} | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) rename src/framework/src/{Hyperflex.php => ApplicationContext.php} (94%) diff --git a/src/di/src/Aop/ProxyTrait.php b/src/di/src/Aop/ProxyTrait.php index 694abf529..bf6547e32 100644 --- a/src/di/src/Aop/ProxyTrait.php +++ b/src/di/src/Aop/ProxyTrait.php @@ -8,7 +8,7 @@ use Closure; use Doctrine\Instantiator\Instantiator; use Hyperf\Di\Annotation\AspectCollector; use Hyperf\Di\ReflectionManager; -use Hyperf\Framework\Hyperf; +use Hyperf\Framework\ApplicationContext; trait ProxyTrait { @@ -52,7 +52,7 @@ trait ProxyTrait { $arround = AspectCollector::get('arround'); if ($aspects = self::isMatchClassName($arround['classes'] ?? [], $proceedingJoinPoint->className, $proceedingJoinPoint->method)) { - $pipeline = new Pipeline(Hyperf::getContainer()); + $pipeline = new Pipeline(ApplicationContext::getContainer()); return $pipeline->via('process')->through($aspects)->send($proceedingJoinPoint)->then(function (ProceedingJoinPoint $proceedingJoinPoint) { return $proceedingJoinPoint->processOriginalMethod(); }); diff --git a/src/framework/src/Hyperflex.php b/src/framework/src/ApplicationContext.php similarity index 94% rename from src/framework/src/Hyperflex.php rename to src/framework/src/ApplicationContext.php index cc643e2b1..8b2370466 100644 --- a/src/framework/src/Hyperflex.php +++ b/src/framework/src/ApplicationContext.php @@ -5,7 +5,7 @@ namespace Hyperf\Framework; use Psr\Container\ContainerInterface; -class Hyperf +class ApplicationContext { /**