spiral / framework

tests/Framework/Jobs/DispatcherTest.php

Spacing +5 added lines, -5 removed lines

@@ -43,7 +43,7 @@ 
         $this->assertNull($this->app->getEnvironment()->get('FIRED'));
 
         $w->shouldReceive('receive')->once()->with(
-            \Mockery::on(function (&$context) {
+            \Mockery::on(function (&$context){
                 $context = $this->arrayToContextString(TestJob::class);
 
                 return true;
@@ -68,7 +68,7 @@ 
         $this->app->getContainer()->bind(Worker::class, $w);
 
         $w->shouldReceive('receive')->once()->with(
-            \Mockery::on(function (&$context) {
+            \Mockery::on(function (&$context){
                 $context = $this->arrayToContextString(ErrorJob::class);
 
                 return true;
@@ -81,7 +81,7 @@ 
         $w->shouldReceive('receive')->once()->andReturn(null);
 
         $files = $this->app->get(FilesInterface::class)->getFiles(
-            $this->app->get(DirectoriesInterface::class)->get('runtime') . '/snapshots/'
+            $this->app->get(DirectoriesInterface::class)->get('runtime').'/snapshots/'
         );
 
         $this->assertCount(0, $files);
@@ -89,7 +89,7 @@ 
         $this->app->get(JobDispatcher::class)->serve();
 
         $files = $this->app->get(FilesInterface::class)->getFiles(
-            $this->app->get(DirectoriesInterface::class)->get('runtime') . '/snapshots/'
+            $this->app->get(DirectoriesInterface::class)->get('runtime').'/snapshots/'
         );
 
         $this->assertCount(1, $files);
@@ -107,7 +107,7 @@ 
 
         return \json_encode([
             'id'  => (string)$id,
-            'job' => \strtolower(\implode('.', $signature)) . '.' . $class
+            'job' => \strtolower(\implode('.', $signature)).'.'.$class
         ]);
     }
 }

Braces +4 added lines, -2 removed lines

@@ -43,7 +43,8 @@ 
         $this->assertNull($this->app->getEnvironment()->get('FIRED'));
 
         $w->shouldReceive('receive')->once()->with(
-            \Mockery::on(function (&$context) {
+            \Mockery::on(function (&$context)
+            {
                 $context = $this->arrayToContextString(TestJob::class);
 
                 return true;
@@ -68,7 +69,8 @@ 
         $this->app->getContainer()->bind(Worker::class, $w);
 
         $w->shouldReceive('receive')->once()->with(
-            \Mockery::on(function (&$context) {
+            \Mockery::on(function (&$context)
+            {
                 $context = $this->arrayToContextString(ErrorJob::class);
 
                 return true;

src/Core/tests/Fixtures/TypedClass.php

Spacing +1 added lines, -1 removed lines

@@ -20,6 +20,6 @@
         bool $bool,
         array $array = [],
         string $pong = null
-    ) {
+    ){
     }
 }

src/Core/tests/FactoryTest.php

Spacing +1 added lines, -1 removed lines

@@ -41,7 +41,7 @@
         $container = new Container();
         $this->assertInstanceOf(FactoryInterface::class, $container);
 
-        $container->bind(Bucket::class, function ($data) {
+        $container->bind(Bucket::class, function ($data){
             return new Bucket('via-closure', $data);
         });
 

Braces +4 added lines, -2 removed lines

@@ -41,7 +41,8 @@ 
         $container = new Container();
         $this->assertInstanceOf(FactoryInterface::class, $container);
 
-        $container->bind(Bucket::class, function ($data) {
+        $container->bind(Bucket::class, function ($data)
+        {
             return new Bucket('via-closure', $data);
         });
 
@@ -78,7 +79,8 @@ 
         $sample = new SampleClass();
 
         $container->bind(Bucket::class, [self::class, 'makeBucketWithSample']);
-        $container->bind(SampleClass::class, function () use ($sample) {
+        $container->bind(SampleClass::class, function () use ($sample)
+        {
             return $sample;
         });
 

src/Core/tests/ScopesTest.php

Spacing +4 added lines, -4 removed lines

@@ -40,11 +40,11 @@ 
 
         $this->assertNull(ContainerScope::getContainer());
 
-        try {
+        try{
             $this->assertTrue(ContainerScope::runScope($container, function () use ($container): void {
                 throw new RuntimeException('exception');
             }));
-        } catch (\Throwable $e) {
+        }catch (\Throwable $e){
         }
 
         $this->assertInstanceOf(RuntimeException::class, $e);
@@ -91,14 +91,14 @@ 
             return $c->get('bucket')->getName() == 'b' && $c->has('other');
         }));
 
-        try {
+        try{
             $this->assertTrue($c->runScope([
                 'bucket' => new Bucket('b'),
                 'other'  => new SampleClass()
             ], function () use ($c): void {
                 throw new RuntimeException('exception');
             }));
-        } catch (\Throwable $e) {
+        }catch (\Throwable $e){
         }
 
         $this->assertSame('a', $c->get('bucket')->getName());

Braces +16 added lines, -7 removed lines

@@ -27,7 +27,8 @@ 
 
         $this->assertNull(ContainerScope::getContainer());
 
-        $this->assertTrue(ContainerScope::runScope($container, function () use ($container) {
+        $this->assertTrue(ContainerScope::runScope($container, function () use ($container)
+        {
             return $container === ContainerScope::getContainer();
         }));
 
@@ -40,11 +41,14 @@ 
 
         $this->assertNull(ContainerScope::getContainer());
 
-        try {
+        try
+        {
             $this->assertTrue(ContainerScope::runScope($container, function () use ($container): void {
                 throw new RuntimeException('exception');
             }));
-        } catch (\Throwable $e) {
+        }
+        catch (\Throwable $e)
+        {
         }
 
         $this->assertInstanceOf(RuntimeException::class, $e);
@@ -62,7 +66,8 @@ 
         $this->assertTrue($c->runScope([
             'bucket' => new Bucket('b'),
             'other'  => new SampleClass()
-        ], function () use ($c) {
+        ], function () use ($c)
+        {
             $this->assertSame('b', $c->get('bucket')->getName());
             $this->assertTrue($c->has('other'));
 
@@ -84,21 +89,25 @@ 
         $this->assertTrue($c->runScope([
             'bucket' => new Bucket('b'),
             'other'  => new SampleClass()
-        ], function () use ($c) {
+        ], function () use ($c)
+        {
             $this->assertSame('b', $c->get('bucket')->getName());
             $this->assertTrue($c->has('other'));
 
             return $c->get('bucket')->getName() == 'b' && $c->has('other');
         }));
 
-        try {
+        try
+        {
             $this->assertTrue($c->runScope([
                 'bucket' => new Bucket('b'),
                 'other'  => new SampleClass()
             ], function () use ($c): void {
                 throw new RuntimeException('exception');
             }));
-        } catch (\Throwable $e) {
+        }
+        catch (\Throwable $e)
+        {
         }
 
         $this->assertSame('a', $c->get('bucket')->getName());

src/Core/tests/SingletonsTest.php

Spacing +2 added lines, -2 removed lines

@@ -71,7 +71,7 @@ 
     {
         $container = new Container();
 
-        $container->bindSingleton('sampleClass', function () {
+        $container->bindSingleton('sampleClass', function (){
             return new SampleClass();
         });
 
@@ -98,7 +98,7 @@ 
         $container = new Container();
         $container->bindSingleton('singleton', 'sampleClass');
 
-        $container->bind('sampleClass', function () {
+        $container->bind('sampleClass', function (){
             return new SampleClass();
         });
 

Braces +6 added lines, -3 removed lines

@@ -60,7 +60,8 @@ 
 
         $instance = new SampleClass();
 
-        $container->bindSingleton('sampleClass', function () use ($instance) {
+        $container->bindSingleton('sampleClass', function () use ($instance)
+        {
             return $instance;
         });
 
@@ -71,7 +72,8 @@ 
     {
         $container = new Container();
 
-        $container->bindSingleton('sampleClass', function () {
+        $container->bindSingleton('sampleClass', function ()
+        {
             return new SampleClass();
         });
 
@@ -98,7 +100,8 @@ 
         $container = new Container();
         $container->bindSingleton('singleton', 'sampleClass');
 
-        $container->bind('sampleClass', function () {
+        $container->bind('sampleClass', function ()
+        {
             return new SampleClass();
         });
 

src/Core/tests/InjectableTest.php

Spacing +5 added lines, -5 removed lines

@@ -36,7 +36,7 @@ 
 
     public function testInvalidInjector(): void
     {
-        $excepted = "Class 'Spiral\Tests\Core\Fixtures\InvalidInjector' must be an " .
+        $excepted = "Class 'Spiral\Tests\Core\Fixtures\InvalidInjector' must be an ".
                     "instance of InjectorInterface for 'Spiral\Tests\Core\Fixtures\TestConfig'";
         $this->expectException(InjectionException::class);
         $this->expectExceptionMessage($excepted);
@@ -60,7 +60,7 @@ 
 
     public function testInvalidRuntimeInjector(): void
     {
-        $excepted = "Class 'Spiral\Tests\Core\Fixtures\InvalidInjector' must be an " .
+        $excepted = "Class 'Spiral\Tests\Core\Fixtures\InvalidInjector' must be an ".
             "instance of InjectorInterface for 'Spiral\Tests\Core\Fixtures\TestConfig'";
         $this->expectException(InjectionException::class);
         $this->expectExceptionMessage($excepted);
@@ -125,7 +125,7 @@ 
         $container->bind(ConfigsInterface::class, $configurator);
 
         $configurator->shouldReceive('createInjection')
-            ->with(m::on(static function (ReflectionClass $r) {
+            ->with(m::on(static function (ReflectionClass $r){
                 return $r->getName() === TestConfig::class;
             }), null)
             ->andReturn($expected)
@@ -143,7 +143,7 @@ 
         $container->bind(ConfigsInterface::class, $configurator);
 
         $configurator->shouldReceive('createInjection')
-            ->with(m::on(static function (ReflectionClass $r) {
+            ->with(m::on(static function (ReflectionClass $r){
                 return $r->getName() === TestConfig::class;
             }), 'context')
             ->andReturn($expected)
@@ -161,7 +161,7 @@ 
         $container->bind(ConfigsInterface::class, $configurator);
 
         $configurator->shouldReceive('createInjection')
-            ->with(m::on(static function (ReflectionClass $r) {
+            ->with(m::on(static function (ReflectionClass $r){
                 return $r->getName() === TestConfig::class;
             }), 'contextArgument')
             ->andReturn($expected)

Braces +6 added lines, -3 removed lines

@@ -125,7 +125,8 @@ 
         $container->bind(ConfigsInterface::class, $configurator);
 
         $configurator->shouldReceive('createInjection')
-            ->with(m::on(static function (ReflectionClass $r) {
+            ->with(m::on(static function (ReflectionClass $r)
+            {
                 return $r->getName() === TestConfig::class;
             }), null)
             ->andReturn($expected)
@@ -143,7 +144,8 @@ 
         $container->bind(ConfigsInterface::class, $configurator);
 
         $configurator->shouldReceive('createInjection')
-            ->with(m::on(static function (ReflectionClass $r) {
+            ->with(m::on(static function (ReflectionClass $r)
+            {
                 return $r->getName() === TestConfig::class;
             }), 'context')
             ->andReturn($expected)
@@ -161,7 +163,8 @@ 
         $container->bind(ConfigsInterface::class, $configurator);
 
         $configurator->shouldReceive('createInjection')
-            ->with(m::on(static function (ReflectionClass $r) {
+            ->with(m::on(static function (ReflectionClass $r)
+            {
                 return $r->getName() === TestConfig::class;
             }), 'contextArgument')
             ->andReturn($expected)

src/Core/tests/BindingsTest.php

Spacing +2 added lines, -2 removed lines

@@ -25,7 +25,7 @@ 
 
         $this->assertFalse($container->has('abc'));
 
-        $container->bind('abc', function () {
+        $container->bind('abc', function (){
             return 'hello';
         });
 
@@ -38,7 +38,7 @@ 
         $container = new Container();
 
         $this->assertFalse($container->has('abc'));
-        $container->bind('abc', function () {
+        $container->bind('abc', function (){
             return 'hello';
         });
 

Braces +4 added lines, -2 removed lines

@@ -25,7 +25,8 @@ 
 
         $this->assertFalse($container->has('abc'));
 
-        $container->bind('abc', function () {
+        $container->bind('abc', function ()
+        {
             return 'hello';
         });
 
@@ -38,7 +39,8 @@ 
         $container = new Container();
 
         $this->assertFalse($container->has('abc'));
-        $container->bind('abc', function () {
+        $container->bind('abc', function ()
+        {
             return 'hello';
         });
 

src/Core/src/ContainerScope.php

Spacing +3 added lines, -3 removed lines

@@ -46,11 +46,11 @@
     {
         [$previous, self::$container] = [self::$container, $container];
 
-        try {
+        try{
             return $scope();
-        } catch (Throwable $e) {
+        }catch (Throwable $e){
             throw $e;
-        } finally {
+        }finally{
             self::$container = $previous;
         }
     }

Braces +8 added lines, -3 removed lines

@@ -46,11 +46,16 @@
     {
         [$previous, self::$container] = [self::$container, $container];
 
-        try {
+        try
+        {
             return $scope();
-        } catch (Throwable $e) {
+        }
+        catch (Throwable $e)
+        {
             throw $e;
-        } finally {
+        }
+        finally
+        {
             self::$container = $previous;
         }
     }

src/Core/src/Container.php

Spacing +69 added lines, -69 removed lines

@@ -126,7 +126,7 @@ 
      */
     public function get($alias, string $context = null)
     {
-        if ($alias instanceof Autowire) {
+        if ($alias instanceof Autowire){
             return $alias->resolve($this);
         }
 
@@ -142,34 +142,34 @@ 
      */
     public function make(string $alias, array $parameters = [], string $context = null)
     {
-        if (!isset($this->bindings[$alias])) {
+        if (!isset($this->bindings[$alias])){
             //No direct instructions how to construct class, make is automatically
             return $this->autowire($alias, $parameters, $context);
         }
 
         $binding = $this->bindings[$alias];
-        if (is_object($binding)) {
+        if (is_object($binding)){
             //When binding is instance, assuming singleton
             return $binding;
         }
 
-        if (is_string($binding)) {
+        if (is_string($binding)){
             //Binding is pointing to something else
             return $this->make($binding, $parameters, $context);
         }
 
         unset($this->bindings[$alias]);
-        try {
-            if ($binding[0] === $alias) {
+        try{
+            if ($binding[0] === $alias){
                 $instance = $this->autowire($alias, $parameters, $context);
-            } else {
+            }else{
                 $instance = $this->evaluateBinding($alias, $binding[0], $parameters, $context);
             }
-        } finally {
+        }finally{
             $this->bindings[$alias] = $binding;
         }
 
-        if ($binding[1]) {
+        if ($binding[1]){
             //Indicates singleton
             $this->bindings[$alias] = $instance;
         }
@@ -190,30 +190,30 @@ 
         string $context = null
     ): array {
         $arguments = [];
-        foreach ($reflection->getParameters() as $parameter) {
-            try {
+        foreach ($reflection->getParameters() as $parameter){
+            try{
                 //Information we need to know about argument in order to resolve it's value
                 $name = $parameter->getName();
                 $class = $parameter->getClass();
-            } catch (Throwable $e) {
+            }catch (Throwable $e){
                 //Possibly invalid class definition or syntax error
                 $location = $reflection->getName();
-                if ($reflection instanceof ReflectionMethod) {
+                if ($reflection instanceof ReflectionMethod){
                     $location = "{$reflection->getDeclaringClass()->getName()}->{$location}";
                 }
                 //Possibly invalid class definition or syntax error
                 throw new ContainerException(
-                    "Unable to resolve `{$parameter->getName()}` in {$location}: " . $e->getMessage(),
+                    "Unable to resolve `{$parameter->getName()}` in {$location}: ".$e->getMessage(),
                     $e->getCode(),
                     $e
                 );
             }
 
-            if (isset($parameters[$name]) && is_object($parameters[$name])) {
-                if ($parameters[$name] instanceof Autowire) {
+            if (isset($parameters[$name]) && is_object($parameters[$name])){
+                if ($parameters[$name] instanceof Autowire){
                     //Supplied by user as late dependency
                     $arguments[] = $parameters[$name]->resolve($this);
-                } else {
+                }else{
                     //Supplied by user as object
                     $arguments[] = $parameters[$name];
                 }
@@ -221,16 +221,16 @@ 
             }
 
             // no declared type or scalar type or array
-            if (!isset($class)) {
+            if (!isset($class)){
                 //Provided from outside
-                if (array_key_exists($name, $parameters)) {
+                if (array_key_exists($name, $parameters)){
                     //Make sure it's properly typed
                     $this->assertType($parameter, $reflection, $parameters[$name]);
                     $arguments[] = $parameters[$name];
                     continue;
                 }
 
-                if ($parameter->isDefaultValueAvailable()) {
+                if ($parameter->isDefaultValueAvailable()){
                     //Default value
                     $arguments[] = $parameter->getDefaultValue();
                     continue;
@@ -240,12 +240,12 @@ 
                 throw new ArgumentException($parameter, $reflection);
             }
 
-            try {
+            try{
                 //Requesting for contextual dependency
                 $arguments[] = $this->get($class->getName(), $name);
                 continue;
-            } catch (AutowireException $e) {
-                if ($parameter->isOptional()) {
+            }catch (AutowireException $e){
+                if ($parameter->isOptional()){
                     //This is optional dependency, skip
                     $arguments[] = null;
                     continue;
@@ -264,28 +264,28 @@ 
     public function runScope(array $bindings, callable $scope)
     {
         $cleanup = $previous = [];
-        foreach ($bindings as $alias => $resolver) {
-            if (isset($this->bindings[$alias])) {
+        foreach ($bindings as $alias => $resolver){
+            if (isset($this->bindings[$alias])){
                 $previous[$alias] = $this->bindings[$alias];
-            } else {
+            }else{
                 $cleanup[] = $alias;
             }
 
             $this->bind($alias, $resolver);
         }
 
-        try {
-            if (ContainerScope::getContainer() !== $this) {
+        try{
+            if (ContainerScope::getContainer() !== $this){
                 return ContainerScope::runScope($this, $scope);
             }
 
             return $scope();
-        } finally {
-            foreach (array_reverse($previous) as $alias => $resolver) {
+        }finally{
+            foreach (array_reverse($previous) as $alias => $resolver){
                 $this->bindings[$alias] = $resolver;
             }
 
-            foreach ($cleanup as $alias) {
+            foreach ($cleanup as $alias){
                 unset($this->bindings[$alias]);
             }
         }
@@ -301,7 +301,7 @@ 
      */
     public function bind(string $alias, $resolver): void
     {
-        if (is_array($resolver) || $resolver instanceof Closure || $resolver instanceof Autowire) {
+        if (is_array($resolver) || $resolver instanceof Closure || $resolver instanceof Autowire){
             // array means = execute me, false = not singleton
             $this->bindings[$alias] = [$resolver, false];
             return;
@@ -319,7 +319,7 @@ 
      */
     public function bindSingleton(string $alias, $resolver): void
     {
-        if (is_object($resolver) && !$resolver instanceof Closure && !$resolver instanceof Autowire) {
+        if (is_object($resolver) && !$resolver instanceof Closure && !$resolver instanceof Autowire){
             // direct binding to an instance
             $this->bindings[$alias] = $resolver;
             return;
@@ -336,11 +336,11 @@ 
      */
     public function hasInstance(string $alias): bool
     {
-        if (!$this->has($alias)) {
+        if (!$this->has($alias)){
             return false;
         }
 
-        while (isset($this->bindings[$alias]) && is_string($this->bindings[$alias])) {
+        while (isset($this->bindings[$alias]) && is_string($this->bindings[$alias])){
             //Checking alias tree
             $alias = $this->bindings[$alias];
         }
@@ -414,7 +414,7 @@ 
      */
     protected function autowire(string $class, array $parameters, string $context = null)
     {
-        if (!class_exists($class)) {
+        if (!class_exists($class)){
             throw new NotFoundException(sprintf("Undefined class or binding '%s'", $class));
         }
 
@@ -436,9 +436,9 @@ 
     private function registerInstance($instance, array $parameters)
     {
         //Declarative singletons (only when class received via direct get)
-        if ($parameters === [] && $instance instanceof SingletonInterface) {
+        if ($parameters === [] && $instance instanceof SingletonInterface){
             $alias = get_class($instance);
-            if (!isset($this->bindings[$alias])) {
+            if (!isset($this->bindings[$alias])){
                 $this->bindings[$alias] = $instance;
             }
         }
@@ -462,20 +462,20 @@ 
         $target,
         array $parameters,
         string $context = null
-    ) {
-        if (is_string($target)) {
+    ){
+        if (is_string($target)){
             //Reference
             return $this->make($target, $parameters, $context);
         }
 
-        if ($target instanceof Autowire) {
+        if ($target instanceof Autowire){
             return $target->resolve($this, $parameters);
         }
 
-        if ($target instanceof Closure) {
-            try {
+        if ($target instanceof Closure){
+            try{
                 $reflection = new ReflectionFunction($target);
-            } catch (ReflectionException $e) {
+            }catch (ReflectionException $e){
                 throw new ContainerException($e->getMessage(), $e->getCode(), $e);
             }
 
@@ -485,16 +485,16 @@ 
             );
         }
 
-        if (is_array($target) && isset($target[1])) {
+        if (is_array($target) && isset($target[1])){
             //In a form of resolver and method
             [$resolver, $method] = $target;
 
             //Resolver instance (i.e. [ClassName::class, 'method'])
             $resolver = $this->get($resolver);
 
-            try {
+            try{
                 $method = new ReflectionMethod($resolver, $method);
-            } catch (ReflectionException $e) {
+            }catch (ReflectionException $e){
                 throw new ContainerException($e->getMessage(), $e->getCode(), $e);
             }
 
@@ -523,22 +523,22 @@ 
      */
     private function createInstance(string $class, array $parameters, string $context = null)
     {
-        try {
+        try{
             $reflection = new ReflectionClass($class);
-        } catch (ReflectionException $e) {
+        }catch (ReflectionException $e){
             throw new ContainerException($e->getMessage(), $e->getCode(), $e);
         }
 
         //We have to construct class using external injector when we know exact context
-        if ($parameters === [] && $this->checkInjector($reflection)) {
+        if ($parameters === [] && $this->checkInjector($reflection)){
             $injector = $this->injectors[$reflection->getName()];
 
             $instance = null;
-            try {
+            try{
                 /** @var InjectorInterface $injectorInstance */
                 $injectorInstance = $this->get($injector);
 
-                if (!$injectorInstance instanceof InjectorInterface) {
+                if (!$injectorInstance instanceof InjectorInterface){
                     throw new InjectionException(
                         sprintf(
                             "Class '%s' must be an instance of InjectorInterface for '%s'",
@@ -549,7 +549,7 @@ 
                 }
 
                 $instance = $injectorInstance->createInjection($reflection, $context);
-                if (!$reflection->isInstance($instance)) {
+                if (!$reflection->isInstance($instance)){
                     throw new InjectionException(
                         sprintf(
                             "Invalid injection response for '%s'",
@@ -557,23 +557,23 @@ 
                         )
                     );
                 }
-            } finally {
+            }finally{
                 $this->injectors[$reflection->getName()] = $injector;
             }
 
             return $instance;
         }
 
-        if (!$reflection->isInstantiable()) {
+        if (!$reflection->isInstantiable()){
             throw new ContainerException(sprintf("Class '%s' can not be constructed", $class));
         }
 
         $constructor = $reflection->getConstructor();
 
-        if ($constructor !== null) {
+        if ($constructor !== null){
             // Using constructor with resolved arguments
             $instance = $reflection->newInstanceArgs($this->resolveArguments($constructor, $parameters));
-        } else {
+        }else{
             // No constructor specified
             $instance = $reflection->newInstance();
         }
@@ -590,27 +590,27 @@ 
     private function checkInjector(ReflectionClass $reflection): bool
     {
         $class = $reflection->getName();
-        if (array_key_exists($class, $this->injectors)) {
+        if (array_key_exists($class, $this->injectors)){
             return $this->injectors[$class] !== null;
         }
 
         if (
             $reflection->implementsInterface(InjectableInterface::class)
             && $reflection->hasConstant('INJECTOR')
-        ) {
+        ){
             $this->injectors[$class] = $reflection->getConstant('INJECTOR');
             return true;
         }
 
-        if (!isset($this->injectorsCache[$class])) {
+        if (!isset($this->injectorsCache[$class])){
             $this->injectorsCache[$class] = null;
 
             // check interfaces
-            foreach ($this->injectors as $target => $injector) {
+            foreach ($this->injectors as $target => $injector){
                 if (
                     class_exists($target, true)
                     && $reflection->isSubclassOf($target)
-                ) {
+                ){
                     $this->injectors[$class] = $injector;
                     return true;
                 }
@@ -618,7 +618,7 @@ 
                 if (
                     interface_exists($target, true)
                     && $reflection->implementsInterface($target)
-                ) {
+                ){
                     $this->injectors[$class] = $injector;
                     return true;
                 }
@@ -640,11 +640,11 @@ 
      */
     private function assertType(ReflectionParameter $parameter, ContextFunction $context, $value): void
     {
-        if ($value === null) {
+        if ($value === null){
             if (
                 !$parameter->isOptional() &&
                 !($parameter->isDefaultValueAvailable() && $parameter->getDefaultValue() === null)
-            ) {
+            ){
                 throw new ArgumentException($parameter, $context);
             }
 
@@ -652,20 +652,20 @@ 
         }
 
         $type = $parameter->getType();
-        if ($type === null) {
+        if ($type === null){
             return;
         }
 
         $typeName = $type->getName();
-        if ($typeName === 'array' && !is_array($value)) {
+        if ($typeName === 'array' && !is_array($value)){
             throw new ArgumentException($parameter, $context);
         }
 
-        if (($typeName === 'int' || $typeName === 'float') && !is_numeric($value)) {
+        if (($typeName === 'int' || $typeName === 'float') && !is_numeric($value)){
             throw new ArgumentException($parameter, $context);
         }
 
-        if ($typeName === 'bool' && !is_bool($value) && !is_numeric($value)) {
+        if ($typeName === 'bool' && !is_bool($value) && !is_numeric($value)){
             throw new ArgumentException($parameter, $context);
         }
     }

Braces +138 added lines, -63 removed lines

@@ -126,7 +126,8 @@ 
      */
     public function get($alias, string $context = null)
     {
-        if ($alias instanceof Autowire) {
+        if ($alias instanceof Autowire)
+        {
             return $alias->resolve($this);
         }
 
@@ -142,34 +143,44 @@ 
      */
     public function make(string $alias, array $parameters = [], string $context = null)
     {
-        if (!isset($this->bindings[$alias])) {
+        if (!isset($this->bindings[$alias]))
+        {
             //No direct instructions how to construct class, make is automatically
             return $this->autowire($alias, $parameters, $context);
         }
 
         $binding = $this->bindings[$alias];
-        if (is_object($binding)) {
+        if (is_object($binding))
+        {
             //When binding is instance, assuming singleton
             return $binding;
         }
 
-        if (is_string($binding)) {
+        if (is_string($binding))
+        {
             //Binding is pointing to something else
             return $this->make($binding, $parameters, $context);
         }
 
         unset($this->bindings[$alias]);
-        try {
-            if ($binding[0] === $alias) {
+        try
+        {
+            if ($binding[0] === $alias)
+            {
                 $instance = $this->autowire($alias, $parameters, $context);
-            } else {
+            }
+            else
+            {
                 $instance = $this->evaluateBinding($alias, $binding[0], $parameters, $context);
             }
-        } finally {
+        }
+        finally
+        {
             $this->bindings[$alias] = $binding;
         }
 
-        if ($binding[1]) {
+        if ($binding[1])
+        {
             //Indicates singleton
             $this->bindings[$alias] = $instance;
         }
@@ -190,15 +201,20 @@ 
         string $context = null
     ): array {
         $arguments = [];
-        foreach ($reflection->getParameters() as $parameter) {
-            try {
+        foreach ($reflection->getParameters() as $parameter)
+        {
+            try
+            {
                 //Information we need to know about argument in order to resolve it's value
                 $name = $parameter->getName();
                 $class = $parameter->getClass();
-            } catch (Throwable $e) {
+            }
+            catch (Throwable $e)
+            {
                 //Possibly invalid class definition or syntax error
                 $location = $reflection->getName();
-                if ($reflection instanceof ReflectionMethod) {
+                if ($reflection instanceof ReflectionMethod)
+                {
                     $location = "{$reflection->getDeclaringClass()->getName()}->{$location}";
                 }
                 //Possibly invalid class definition or syntax error
@@ -209,11 +225,15 @@ 
                 );
             }
 
-            if (isset($parameters[$name]) && is_object($parameters[$name])) {
-                if ($parameters[$name] instanceof Autowire) {
+            if (isset($parameters[$name]) && is_object($parameters[$name]))
+            {
+                if ($parameters[$name] instanceof Autowire)
+                {
                     //Supplied by user as late dependency
                     $arguments[] = $parameters[$name]->resolve($this);
-                } else {
+                }
+                else
+                {
                     //Supplied by user as object
                     $arguments[] = $parameters[$name];
                 }
@@ -221,16 +241,19 @@ 
             }
 
             // no declared type or scalar type or array
-            if (!isset($class)) {
+            if (!isset($class))
+            {
                 //Provided from outside
-                if (array_key_exists($name, $parameters)) {
+                if (array_key_exists($name, $parameters))
+                {
                     //Make sure it's properly typed
                     $this->assertType($parameter, $reflection, $parameters[$name]);
                     $arguments[] = $parameters[$name];
                     continue;
                 }
 
-                if ($parameter->isDefaultValueAvailable()) {
+                if ($parameter->isDefaultValueAvailable())
+                {
                     //Default value
                     $arguments[] = $parameter->getDefaultValue();
                     continue;
@@ -240,12 +263,16 @@ 
                 throw new ArgumentException($parameter, $reflection);
             }
 
-            try {
+            try
+            {
                 //Requesting for contextual dependency
                 $arguments[] = $this->get($class->getName(), $name);
                 continue;
-            } catch (AutowireException $e) {
-                if ($parameter->isOptional()) {
+            }
+            catch (AutowireException $e)
+            {
+                if ($parameter->isOptional())
+                {
                     //This is optional dependency, skip
                     $arguments[] = null;
                     continue;
@@ -264,28 +291,38 @@ 
     public function runScope(array $bindings, callable $scope)
     {
         $cleanup = $previous = [];
-        foreach ($bindings as $alias => $resolver) {
-            if (isset($this->bindings[$alias])) {
+        foreach ($bindings as $alias => $resolver)
+        {
+            if (isset($this->bindings[$alias]))
+            {
                 $previous[$alias] = $this->bindings[$alias];
-            } else {
+            }
+            else
+            {
                 $cleanup[] = $alias;
             }
 
             $this->bind($alias, $resolver);
         }
 
-        try {
-            if (ContainerScope::getContainer() !== $this) {
+        try
+        {
+            if (ContainerScope::getContainer() !== $this)
+            {
                 return ContainerScope::runScope($this, $scope);
             }
 
             return $scope();
-        } finally {
-            foreach (array_reverse($previous) as $alias => $resolver) {
+        }
+        finally
+        {
+            foreach (array_reverse($previous) as $alias => $resolver)
+            {
                 $this->bindings[$alias] = $resolver;
             }
 
-            foreach ($cleanup as $alias) {
+            foreach ($cleanup as $alias)
+            {
                 unset($this->bindings[$alias]);
             }
         }
@@ -301,7 +338,8 @@ 
      */
     public function bind(string $alias, $resolver): void
     {
-        if (is_array($resolver) || $resolver instanceof Closure || $resolver instanceof Autowire) {
+        if (is_array($resolver) || $resolver instanceof Closure || $resolver instanceof Autowire)
+        {
             // array means = execute me, false = not singleton
             $this->bindings[$alias] = [$resolver, false];
             return;
@@ -319,7 +357,8 @@ 
      */
     public function bindSingleton(string $alias, $resolver): void
     {
-        if (is_object($resolver) && !$resolver instanceof Closure && !$resolver instanceof Autowire) {
+        if (is_object($resolver) && !$resolver instanceof Closure && !$resolver instanceof Autowire)
+        {
             // direct binding to an instance
             $this->bindings[$alias] = $resolver;
             return;
@@ -336,11 +375,13 @@ 
      */
     public function hasInstance(string $alias): bool
     {
-        if (!$this->has($alias)) {
+        if (!$this->has($alias))
+        {
             return false;
         }
 
-        while (isset($this->bindings[$alias]) && is_string($this->bindings[$alias])) {
+        while (isset($this->bindings[$alias]) && is_string($this->bindings[$alias]))
+        {
             //Checking alias tree
             $alias = $this->bindings[$alias];
         }
@@ -414,7 +455,8 @@ 
      */
     protected function autowire(string $class, array $parameters, string $context = null)
     {
-        if (!class_exists($class)) {
+        if (!class_exists($class))
+        {
             throw new NotFoundException(sprintf("Undefined class or binding '%s'", $class));
         }
 
@@ -436,9 +478,11 @@ 
     private function registerInstance($instance, array $parameters)
     {
         //Declarative singletons (only when class received via direct get)
-        if ($parameters === [] && $instance instanceof SingletonInterface) {
+        if ($parameters === [] && $instance instanceof SingletonInterface)
+        {
             $alias = get_class($instance);
-            if (!isset($this->bindings[$alias])) {
+            if (!isset($this->bindings[$alias]))
+            {
                 $this->bindings[$alias] = $instance;
             }
         }
@@ -463,19 +507,25 @@ 
         array $parameters,
         string $context = null
     ) {
-        if (is_string($target)) {
+        if (is_string($target))
+        {
             //Reference
             return $this->make($target, $parameters, $context);
         }
 
-        if ($target instanceof Autowire) {
+        if ($target instanceof Autowire)
+        {
             return $target->resolve($this, $parameters);
         }
 
-        if ($target instanceof Closure) {
-            try {
+        if ($target instanceof Closure)
+        {
+            try
+            {
                 $reflection = new ReflectionFunction($target);
-            } catch (ReflectionException $e) {
+            }
+            catch (ReflectionException $e)
+            {
                 throw new ContainerException($e->getMessage(), $e->getCode(), $e);
             }
 
@@ -485,16 +535,20 @@ 
             );
         }
 
-        if (is_array($target) && isset($target[1])) {
+        if (is_array($target) && isset($target[1]))
+        {
             //In a form of resolver and method
             [$resolver, $method] = $target;
 
             //Resolver instance (i.e. [ClassName::class, 'method'])
             $resolver = $this->get($resolver);
 
-            try {
+            try
+            {
                 $method = new ReflectionMethod($resolver, $method);
-            } catch (ReflectionException $e) {
+            }
+            catch (ReflectionException $e)
+            {
                 throw new ContainerException($e->getMessage(), $e->getCode(), $e);
             }
 
@@ -523,22 +577,28 @@ 
      */
     private function createInstance(string $class, array $parameters, string $context = null)
     {
-        try {
+        try
+        {
             $reflection = new ReflectionClass($class);
-        } catch (ReflectionException $e) {
+        }
+        catch (ReflectionException $e)
+        {
             throw new ContainerException($e->getMessage(), $e->getCode(), $e);
         }
 
         //We have to construct class using external injector when we know exact context
-        if ($parameters === [] && $this->checkInjector($reflection)) {
+        if ($parameters === [] && $this->checkInjector($reflection))
+        {
             $injector = $this->injectors[$reflection->getName()];
 
             $instance = null;
-            try {
+            try
+            {
                 /** @var InjectorInterface $injectorInstance */
                 $injectorInstance = $this->get($injector);
 
-                if (!$injectorInstance instanceof InjectorInterface) {
+                if (!$injectorInstance instanceof InjectorInterface)
+                {
                     throw new InjectionException(
                         sprintf(
                             "Class '%s' must be an instance of InjectorInterface for '%s'",
@@ -549,7 +609,8 @@ 
                 }
 
                 $instance = $injectorInstance->createInjection($reflection, $context);
-                if (!$reflection->isInstance($instance)) {
+                if (!$reflection->isInstance($instance))
+                {
                     throw new InjectionException(
                         sprintf(
                             "Invalid injection response for '%s'",
@@ -557,23 +618,29 @@ 
                         )
                     );
                 }
-            } finally {
+            }
+            finally
+            {
                 $this->injectors[$reflection->getName()] = $injector;
             }
 
             return $instance;
         }
 
-        if (!$reflection->isInstantiable()) {
+        if (!$reflection->isInstantiable())
+        {
             throw new ContainerException(sprintf("Class '%s' can not be constructed", $class));
         }
 
         $constructor = $reflection->getConstructor();
 
-        if ($constructor !== null) {
+        if ($constructor !== null)
+        {
             // Using constructor with resolved arguments
             $instance = $reflection->newInstanceArgs($this->resolveArguments($constructor, $parameters));
-        } else {
+        }
+        else
+        {
             // No constructor specified
             $instance = $reflection->newInstance();
         }
@@ -590,7 +657,8 @@ 
     private function checkInjector(ReflectionClass $reflection): bool
     {
         $class = $reflection->getName();
-        if (array_key_exists($class, $this->injectors)) {
+        if (array_key_exists($class, $this->injectors))
+        {
             return $this->injectors[$class] !== null;
         }
 
@@ -602,11 +670,13 @@ 
             return true;
         }
 
-        if (!isset($this->injectorsCache[$class])) {
+        if (!isset($this->injectorsCache[$class]))
+        {
             $this->injectorsCache[$class] = null;
 
             // check interfaces
-            foreach ($this->injectors as $target => $injector) {
+            foreach ($this->injectors as $target => $injector)
+            {
                 if (
                     class_exists($target, true)
                     && $reflection->isSubclassOf($target)
@@ -640,7 +710,8 @@ 
      */
     private function assertType(ReflectionParameter $parameter, ContextFunction $context, $value): void
     {
-        if ($value === null) {
+        if ($value === null)
+        {
             if (
                 !$parameter->isOptional() &&
                 !($parameter->isDefaultValueAvailable() && $parameter->getDefaultValue() === null)
@@ -652,20 +723,24 @@ 
         }
 
         $type = $parameter->getType();
-        if ($type === null) {
+        if ($type === null)
+        {
             return;
         }
 
         $typeName = $type->getName();
-        if ($typeName === 'array' && !is_array($value)) {
+        if ($typeName === 'array' && !is_array($value))
+        {
             throw new ArgumentException($parameter, $context);
         }
 
-        if (($typeName === 'int' || $typeName === 'float') && !is_numeric($value)) {
+        if (($typeName === 'int' || $typeName === 'float') && !is_numeric($value))
+        {
             throw new ArgumentException($parameter, $context);
         }
 
-        if ($typeName === 'bool' && !is_bool($value) && !is_numeric($value)) {
+        if ($typeName === 'bool' && !is_bool($value) && !is_numeric($value))
+        {
             throw new ArgumentException($parameter, $context);
         }
     }