Merge pull request #35 from abmmhasan/feature/improvement-j

Updated make

docs/di/usage.rst

@@ -8,7 +8,7 @@ Simply, initialize using either of these lines,
 
 .. code-block:: php
 
-    $container = AbmmHasan\InterMix\container();
+    $container = AbmmHasan\InterMix\container(); // recommended
     $container = AbmmHasan\InterMix\DI\Container::instance();
     $container = new AbmmHasan\InterMix\DI\Container();
 
@@ -83,10 +83,13 @@ cached. In case of ``call()`` returns from method/closure are never cached (but
 make(string $class, string|bool $method = false)
 ------------------------------------------------
 
-This library only builds single instance per class (Singleton). But sometime we may need class instance independently.
-``container()`` have 2nd parameter for completely different container instance for that. But what if we need only one
-new instance for a class but other dependencies from cached? well, that is what ``make()`` is for! Also, as the definition
-it supports class only.
+This library only builds single instance per class (Singleton). But sometime we may need class instance/values independently.
+
+Though ``container()`` have 2nd parameter for completely different container instance but what if we need only one
+new instance for a single class but other dependencies from existing?
+Well, that is what ``make()`` is for! Also, it supports classes only.
+
+Providing 2nd parameter will get return from method execution. If not provided, will get the class instance only.
 
 registerClass(string $class, array $parameters = [])
 ----------------------------------------------------

rector.php

@@ -3,6 +3,7 @@
 declare(strict_types=1);
 
 use Rector\Config\RectorConfig;
+use Rector\Php81\Rector\Property\ReadOnlyPropertyRector;
 
 return static function (RectorConfig $rectorConfig): void {
     $rectorConfig->paths([
@@ -11,4 +12,7 @@
     $rectorConfig->sets([
         constant("Rector\Set\ValueObject\LevelSetList::UP_TO_PHP_82")
     ]);
+    $rectorConfig->skip([
+        ReadOnlyPropertyRector::class
+    ]);
 };

src/DI/Container.php

@@ -21,7 +21,7 @@
 class Container implements ContainerInterface
 {
     protected static array $instances;
-    protected readonly Repository $repository;
+    protected Repository $repository;
     protected string $resolver = InjectedCall::class;
 
     /**
@@ -253,7 +253,8 @@ public function call(
      */
     public function make(string $class, string|bool $method = false): mixed
     {
-        return (new $this->resolver($this->repository))->classSettler($class, $method, true);
+        $resolved = (new $this->resolver($this->repository))->classSettler($class, $method, true);
+        return $method ? $resolved['returned'] : $resolved['instance'];
     }
 
     /**

src/DI/Resolver/ClassResolver.php

@@ -24,7 +24,7 @@ class ClassResolver
      * @param DefinitionResolver $definitionResolver The definition resolver object.
      */
     public function __construct(
-        private readonly Repository $repository,
+        private Repository $repository,
         private readonly ParameterResolver $parameterResolver,
         private readonly PropertyResolver $propertyResolver,
         private readonly DefinitionResolver $definitionResolver

src/DI/Resolver/DefinitionResolver.php

@@ -22,7 +22,7 @@ class DefinitionResolver
      * @param Repository $repository The repository object.
      */
     public function __construct(
-        private readonly Repository $repository
+        private Repository $repository
     ) {
     }
 

src/DI/Resolver/ParameterResolver.php

@@ -28,7 +28,7 @@ class ParameterResolver
      * @param DefinitionResolver $definitionResolver The definition resolver object.
      */
     public function __construct(
-        private readonly Repository $repository,
+        private Repository $repository,
         private readonly DefinitionResolver $definitionResolver
     ) {
         $this->stdClass = new StdClass();
@@ -180,7 +180,7 @@ private function resolveAssociativeParameters(
                 continue;
             }
 
-            $class = $this->getResolvableClassReflection($reflector, $classParameter, $type, $processed);
+            $class = $this->getResolvableReflection($reflector, $classParameter, $type, $processed);
             if ($class) {
                 $name = $class->isInterface() ? $class->getName() : $parameterName;
                 $processed[$parameterName] = $this->resolveClassDependency(
@@ -233,7 +233,7 @@ private function resolveAssociativeParameters(
      * @return ReflectionClass|null The reflection class of the resolvable parameter, or null if not resolvable.
      * @throws ContainerException|ReflectionException circular dependency or multiple instances for the same class
      */
-    private function getResolvableClassReflection(
+    private function getResolvableReflection(
         ReflectionFunctionAbstract $reflector,
         ReflectionParameter $parameter,
         string $type,

src/DI/Resolver/PropertyResolver.php

@@ -24,7 +24,7 @@ class PropertyResolver
      * @param ParameterResolver $parameterResolver The parameter resolver object.
      */
     public function __construct(
-        private readonly Repository $repository,
+        private Repository $repository,
         private readonly ParameterResolver $parameterResolver
     ) {
     }
@@ -96,9 +96,6 @@ private function resolveProperties(ReflectionClass $class, array $properties, ob
                 continue;
             }
 
-            // required for PHP 8.0 only
-            $property->setAccessible(true);
-
             $values = $this->resolveValue($property, $classPropertyValues, $classInstance);
             !$values ?: $property->setValue(...$values);
         }

src/DI/Resolver/Reflector.php

@@ -5,6 +5,7 @@
 use AbmmHasan\InterMix\DI\Reflection\ReflectionResource;
 use Closure;
 use ReflectionClass;
+use ReflectionEnum;
 use ReflectionException;
 use ReflectionFunction;
 
@@ -22,6 +23,18 @@ private function reflectedClass(string|object $class): ReflectionClass
         return $this->repository->resolvedResource[$class]['reflection'] ??= ReflectionResource::getForClass($class);
     }
 
+    /**
+     * Returns a ReflectionEnum object based on the given name.
+     *
+     * @param string $name The name of the enum to reflect
+     * @return ReflectionEnum The reflection object for the given enum name
+     * @throws ReflectionException If the ReflectionClass cannot be obtained.
+     */
+    private function reflectedEnum(string $name): ReflectionEnum
+    {
+        return $this->repository->resolvedEnum[$name]['reflection'] ??= new ReflectionEnum($name);
+    }
+
     /**
      * Returns a ReflectionFunction object based on the provided closure and name.
      *

src/DI/Resolver/Repository.php

@@ -13,6 +13,7 @@ class Repository
     public array $closureResource = [];
     public array $resolved = [];
     public array $resolvedResource = [];
+    public array $resolvedEnum = [];
     public array $resolvedFunction = [];
     public array $resolvedDefinition = [];
     public bool $enablePropertyAttribute = false;

tests/Feature/InjectionTest.php

@@ -24,10 +24,10 @@
 $randomInitConstructor1 = $instance1['instance']->getValues()['random'];
 $instance2 = $classInit->call(ClassInit::class);
 $randomInitConstructor2 = $instance2['instance']->getValues()['random'];
-$instance3 = $classInit->make(ClassInit::class);
-$randomInitConstructor3 = $instance3['instance']->getValues()['random'];
-$instance4 = $classInit->make(ClassInit::class);
-$randomInitConstructor4 = $instance4['instance']->getValues()['random'];
+$instance3 = $classInit->make(ClassInit::class, 'getValues');
+$randomInitConstructor3 = $instance3['random'];
+$instance4 = $classInit->make(ClassInit::class, 'getValues');
+$randomInitConstructor4 = $instance4['random'];
 $instance5 = $classInit->call(ClassInit::class);
 $randomInitConstructor5 = $instance5['instance']->getValues()['random'];
 
@@ -46,4 +46,4 @@ function () use ($randomInitConstructor1, $randomInitConstructor3, $randomInitCo
             ->and($randomInitConstructor3)->not->toEqual($randomInitConstructor4)
             ->and($randomInitConstructor4)->not->toEqual($randomInitConstructor1);
     }
-);
+);