format some codes for bean component

Author: inhere

src/bean/src/Container.php

@@ -890,13 +890,14 @@ private function newBean(string $beanName, string $id = '')
 
         // Get object definition
         $objectDefinition = $this->getNewObjectDefinition($beanName);
+        $propertyInjects  = $objectDefinition->getPropertyInjections();
 
-        $scope     = $objectDefinition->getScope();
-        $alias     = $objectDefinition->getAlias();
-        $className = $objectDefinition->getClassName();
+        $scope = $objectDefinition->getScope();
+        $alias = $objectDefinition->getAlias();
 
         // Cache reflection class info
-        Reflections::cache($className);
+        $className    = $objectDefinition->getClassName();
+        $reflectClass = Reflections::cache($className);
 
         // Before initialize bean
         $this->beforeInit($beanName, $className, $objectDefinition);
@@ -907,18 +908,21 @@ private function newBean(string $beanName, string $id = '')
             $constructArgs = $this->getConstructParams($constructInject, $id);
         }
 
-        $propertyInjects = $objectDefinition->getPropertyInjections();
-
-        // Proxy class
+        // It's proxy class. eg: AOP, RPC client class
         if ($this->handler) {
+            $oldCName  = $className;
             $className = $this->handler->classProxy($className);
+
+            // New class name from handler->classProxy()
+            if ($oldCName !== $className) {
+                $reflectClass = new ReflectionClass($className);
+            }
         }
 
-        $reflectionClass = new ReflectionClass($className);
-        $reflectObject   = $this->newInstance($reflectionClass, $constructArgs);
+        $reflectObject = $this->newInstance($reflectClass, $constructArgs);
 
         // Inject properties values
-        $this->newProperty($reflectObject, $reflectionClass, $propertyInjects, $id);
+        $this->newProperty($reflectObject, $reflectClass, $propertyInjects, $id);
 
         // Alias name
         // Fix: $aliasId !== $id for deny loop get
@@ -927,7 +931,7 @@ private function newBean(string $beanName, string $id = '')
         }
 
         // Call init method if exist
-        if ($reflectionClass->hasMethod(self::INIT_METHOD)) {
+        if ($reflectClass->hasMethod(self::INIT_METHOD)) {
             $reflectObject->{self::INIT_METHOD}();
         }
 
@@ -1147,7 +1151,7 @@ private function getRefValue($value, string $id = '')
         $value = substr($value, 1);
 
         // Other: read config reference
-        if ($this->handler !== null) {
+        if ($this->handler) {
             $value = $this->handler->getReferenceValue($value);
         }
 

src/bean/src/Contract/HandlerInterface.php

@@ -1,6 +1,5 @@
 <?php declare(strict_types=1);
 
-
 namespace Swoft\Bean\Contract;
 
 use Swoft\Bean\Definition\ObjectDefinition;
@@ -39,4 +38,4 @@ public function classProxy(string $className): string;
      * @return mixed
      */
     public function getReferenceValue($value);
-}
+}

src/bean/src/Definition/ObjectDefinition.php

@@ -30,12 +30,12 @@ class ObjectDefinition
      *
      * @var string
      */
-    private $scope = Bean::SINGLETON;
+    private $scope;
 
     /**
      * @var string
      */
-    private $alias = '';
+    private $alias;
 
     /**
      * Constructor parameter injection.
@@ -194,4 +194,4 @@ public function setAlias(string $alias): void
     {
         $this->alias = $alias;
     }
-}
+}

src/bean/src/Handler.php

@@ -1,6 +1,5 @@
 <?php declare(strict_types=1);
 
-
 namespace Swoft\Bean;
 
 use Swoft\Bean\Contract\HandlerInterface;
@@ -49,4 +48,4 @@ public function getReferenceValue($value)
     {
         return $value;
     }
-}
+}

src/process/src/ProcessPool.php

@@ -1,11 +1,9 @@
 <?php declare(strict_types=1);
 
-
 namespace Swoft\Process;
 
 use Swoft\Bean\Annotation\Mapping\Bean;
 use Swoft\Co;
-use Swoft\Exception\SwoftException;
 use Swoft\Log\Helper\CLog;
 use Swoft\Process\Exception\ProcessException;
 use Swoft\Server\Helper\ServerHelper;
@@ -159,8 +157,6 @@ public function stop(): bool
 
     /**
      * Quick restart
-     *
-     * @throws SwoftException
      */
     public function restart(): void
     {

src/process/src/UserProcess.php

@@ -29,7 +29,7 @@ abstract class UserProcess implements UserProcessInterface
     /**
      * @var \Swoole\Process
      */
-    private $swooleProcess;
+    protected $swooleProcess;
 
     /**
      * @return bool

src/stdlib/src/Reflections.php

@@ -66,17 +66,17 @@ public static function get(string $className): array
     /**
      * @param string $className
      *
+     * @return ReflectionClass
      * @throws ReflectionException
      */
-    public static function cache(string $className): void
+    public static function cache(string $className): ReflectionClass
     {
-        if (isset(self::$pool[$className])) {
-            return;
-        }
-
         $reflectionClass = new ReflectionClass($className);
 
+        // Cache some metadata for the class
         self::cacheReflectionClass($reflectionClass);
+
+        return $reflectionClass;
     }
 
     /**