spiral / framework

src/Core/src/Container.php

Spacing +31 added lines, -31 removed lines

@@ -49,11 +49,11 @@ 
     public const DEFAULT_ROOT_SCOPE_NAME = 'root';
 
     private Internal\State $state;
-    private ResolverInterface|Internal\Resolver $resolver;
-    private FactoryInterface|Internal\Factory $factory;
-    private ContainerInterface|Internal\Container $container;
-    private BinderInterface|Internal\Binder $binder;
-    private InvokerInterface|Internal\Invoker $invoker;
+    private ResolverInterface | Internal\Resolver $resolver;
+    private FactoryInterface | Internal\Factory $factory;
+    private ContainerInterface | Internal\Container $container;
+    private BinderInterface | Internal\Binder $binder;
+    private InvokerInterface | Internal\Invoker $invoker;
     private Internal\Scope $scope;
 
     /**
@@ -62,7 +62,7 @@ 
     public function __construct(
         private Config $config = new Config(),
         ?string $scopeName = self::DEFAULT_ROOT_SCOPE_NAME,
-    ) {
+    ){
         $this->initServices($this, $scopeName);
 
         /** @psalm-suppress RedundantPropertyInitializationCheck */
@@ -138,7 +138,7 @@ 
      * @throws ContainerException
      * @throws \Throwable
      */
-    public function get(string|Autowire $id, string $context = null): mixed
+    public function get(string | Autowire $id, string $context = null): mixed
     {
         /** @psalm-suppress TooManyArguments */
         return $this->container->get($id, $context);
@@ -166,16 +166,16 @@ 
         $binds = &$this->state->bindings;
         $singletons = &$this->state->singletons;
         $cleanup = $previous = $prevSin = [];
-        foreach ($bindings as $alias => $resolver) {
+        foreach ($bindings as $alias => $resolver){
             // Store previous bindings
-            if (isset($binds[$alias])) {
+            if (isset($binds[$alias])){
                 $previous[$alias] = $binds[$alias];
-            } else {
+            }else{
                 // Store bindings to be removed
                 $cleanup[] = $alias;
             }
             // Store previous singletons
-            if (isset($singletons[$alias])) {
+            if (isset($singletons[$alias])){
                 $prevSin[$alias] = $singletons[$alias];
                 unset($singletons[$alias]);
             }
@@ -183,21 +183,21 @@ 
             $this->binder->bind($alias, $resolver);
         }
 
-        try {
+        try{
             return ContainerScope::getContainer() !== $this
                 ? ContainerScope::runScope($this, $scope)
                 : $scope($this);
-        } finally {
+        }finally{
             // Remove new bindings
-            foreach ($cleanup as $alias) {
+            foreach ($cleanup as $alias){
                 unset($binds[$alias], $singletons[$alias]);
             }
             // Restore previous bindings
-            foreach ($previous as $alias => $resolver) {
+            foreach ($previous as $alias => $resolver){
                 $binds[$alias] = $resolver;
             }
             // Restore singletons
-            foreach ($prevSin as $alias => $instance) {
+            foreach ($prevSin as $alias => $instance){
                 $singletons[$alias] = $instance;
             }
         }
@@ -211,32 +211,32 @@ 
         // Open scope
         $container = new self($this->config, $name);
 
-        try {
+        try{
             // Configure scope
             $container->scope->setParent($this, $this->scope);
 
             // Add specific bindings
-            foreach ($bindings as $alias => $resolver) {
+            foreach ($bindings as $alias => $resolver){
                 $container->binder->bind($alias, $resolver);
             }
 
             return ContainerScope::runScope(
                 $container,
                 static function (self $container) use ($autowire, $closure): mixed {
-                    try {
+                    try{
                         return $autowire
                             ? $container->invoke($closure)
                             : $closure($container);
-                    } finally {
+                    }finally{
                         $container->closeScope();
                     }
                 }
             );
-        } finally {
+        }finally{
             // Check the container has not been leaked
             $link = \WeakReference::create($container);
             unset($container);
-            if ($link->get() !== null) {
+            if ($link->get() !== null){
                 throw new ScopeContainerLeakedException($name, $this->scope->getParentScopeNames());
             }
         }
@@ -270,9 +270,9 @@ 
      * @param bool $force If the value is false, an exception will be thrown when attempting
      *  to bind an already constructed singleton.
      */
-    public function bindSingleton(string $alias, string|array|callable|object $resolver, bool $force = true): void
+    public function bindSingleton(string $alias, string | array | callable | object $resolver, bool $force = true): void
     {
-        if ($force) {
+        if ($force){
             $this->binder->removeBinding($alias);
         }
 
@@ -341,8 +341,8 @@ 
         ]);
 
         // Create container services
-        foreach ($container->config as $property => $class) {
-            if (\property_exists($container, $property)) {
+        foreach ($container->config as $property => $class){
+            if (\property_exists($container, $property)){
                 $container->$property = $constructor->get($property, $class);
             }
         }
@@ -356,7 +356,7 @@ 
     private function closeScope(): void
     {
         /** @psalm-suppress RedundantPropertyInitializationCheck */
-        if (!isset($this->scope)) {
+        if (!isset($this->scope)){
             $this->destruct();
             return;
         }
@@ -365,10 +365,10 @@ 
 
         // Run finalizers
         $errors = [];
-        foreach ($this->state->finalizers as $finalizer) {
-            try {
+        foreach ($this->state->finalizers as $finalizer){
+            try{
                 $this->invoker->invoke($finalizer);
-            } catch (\Throwable $e) {
+            }catch (\Throwable $e){
                 $errors[] = $e;
             }
         }
@@ -377,7 +377,7 @@ 
         $this->destruct();
 
         // Throw collected errors
-        if ($errors !== []) {
+        if ($errors !== []){
             throw new FinalizersException($scopeName, $errors);
         }
     }

Braces +51 added lines, -23 removed lines

@@ -166,16 +166,21 @@ 
         $binds = &$this->state->bindings;
         $singletons = &$this->state->singletons;
         $cleanup = $previous = $prevSin = [];
-        foreach ($bindings as $alias => $resolver) {
+        foreach ($bindings as $alias => $resolver)
+        {
             // Store previous bindings
-            if (isset($binds[$alias])) {
+            if (isset($binds[$alias]))
+            {
                 $previous[$alias] = $binds[$alias];
-            } else {
+            }
+            else
+            {
                 // Store bindings to be removed
                 $cleanup[] = $alias;
             }
             // Store previous singletons
-            if (isset($singletons[$alias])) {
+            if (isset($singletons[$alias]))
+            {
                 $prevSin[$alias] = $singletons[$alias];
                 unset($singletons[$alias]);
             }
@@ -183,21 +188,27 @@ 
             $this->binder->bind($alias, $resolver);
         }
 
-        try {
+        try
+        {
             return ContainerScope::getContainer() !== $this
                 ? ContainerScope::runScope($this, $scope)
                 : $scope($this);
-        } finally {
+        }
+        finally
+        {
             // Remove new bindings
-            foreach ($cleanup as $alias) {
+            foreach ($cleanup as $alias)
+            {
                 unset($binds[$alias], $singletons[$alias]);
             }
             // Restore previous bindings
-            foreach ($previous as $alias => $resolver) {
+            foreach ($previous as $alias => $resolver)
+            {
                 $binds[$alias] = $resolver;
             }
             // Restore singletons
-            foreach ($prevSin as $alias => $instance) {
+            foreach ($prevSin as $alias => $instance)
+            {
                 $singletons[$alias] = $instance;
             }
         }
@@ -211,32 +222,40 @@ 
         // Open scope
         $container = new self($this->config, $name);
 
-        try {
+        try
+        {
             // Configure scope
             $container->scope->setParent($this, $this->scope);
 
             // Add specific bindings
-            foreach ($bindings as $alias => $resolver) {
+            foreach ($bindings as $alias => $resolver)
+            {
                 $container->binder->bind($alias, $resolver);
             }
 
             return ContainerScope::runScope(
                 $container,
                 static function (self $container) use ($autowire, $closure): mixed {
-                    try {
+                    try
+                    {
                         return $autowire
                             ? $container->invoke($closure)
                             : $closure($container);
-                    } finally {
+                    }
+                    finally
+                    {
                         $container->closeScope();
                     }
                 }
             );
-        } finally {
+        }
+        finally
+        {
             // Check the container has not been leaked
             $link = \WeakReference::create($container);
             unset($container);
-            if ($link->get() !== null) {
+            if ($link->get() !== null)
+            {
                 throw new ScopeContainerLeakedException($name, $this->scope->getParentScopeNames());
             }
         }
@@ -272,7 +291,8 @@ 
      */
     public function bindSingleton(string $alias, string|array|callable|object $resolver, bool $force = true): void
     {
-        if ($force) {
+        if ($force)
+        {
             $this->binder->removeBinding($alias);
         }
 
@@ -341,8 +361,10 @@ 
         ]);
 
         // Create container services
-        foreach ($container->config as $property => $class) {
-            if (\property_exists($container, $property)) {
+        foreach ($container->config as $property => $class)
+        {
+            if (\property_exists($container, $property))
+            {
                 $container->$property = $constructor->get($property, $class);
             }
         }
@@ -356,7 +378,8 @@ 
     private function closeScope(): void
     {
         /** @psalm-suppress RedundantPropertyInitializationCheck */
-        if (!isset($this->scope)) {
+        if (!isset($this->scope))
+        {
             $this->destruct();
             return;
         }
@@ -365,10 +388,14 @@ 
 
         // Run finalizers
         $errors = [];
-        foreach ($this->state->finalizers as $finalizer) {
-            try {
+        foreach ($this->state->finalizers as $finalizer)
+        {
+            try
+            {
                 $this->invoker->invoke($finalizer);
-            } catch (\Throwable $e) {
+            }
+            catch (\Throwable $e)
+            {
                 $errors[] = $e;
             }
         }
@@ -377,7 +404,8 @@ 
         $this->destruct();
 
         // Throw collected errors
-        if ($errors !== []) {
+        if ($errors !== [])
+        {
             throw new FinalizersException($scopeName, $errors);
         }
     }