spiral / framework

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);
         }
     }

src/Core/src/Exception/Container/ArgumentException.php

Spacing +2 added lines, -2 removed lines

@@ -44,8 +44,8 @@
         $this->context = $context;
 
         $name = $context->getName();
-        if ($context instanceof ReflectionMethod) {
-            $name = $context->class . '::' . $name;
+        if ($context instanceof ReflectionMethod){
+            $name = $context->class.'::'.$name;
         }
 
         parent::__construct("Unable to resolve '{$parameter->name}' argument in '{$name}'");

Braces +2 added lines, -1 removed lines

@@ -44,7 +44,8 @@
         $this->context = $context;
 
         $name = $context->getName();
-        if ($context instanceof ReflectionMethod) {
+        if ($context instanceof ReflectionMethod)
+        {
             $name = $context->class . '::' . $name;
         }
 

src/Core/src/InjectableConfig.php

Spacing +1 added lines, -1 removed lines

@@ -71,7 +71,7 @@
      */
     public function offsetGet($offset)
     {
-        if (!$this->offsetExists($offset)) {
+        if (!$this->offsetExists($offset)){
             throw new ConfigException("Undefined configuration key '{$offset}'");
         }
 

Braces +2 added lines, -1 removed lines

@@ -71,7 +71,8 @@
      */
     public function offsetGet($offset)
     {
-        if (!$this->offsetExists($offset)) {
+        if (!$this->offsetExists($offset))
+        {
             throw new ConfigException("Undefined configuration key '{$offset}'");
         }
 

src/Core/src/Traits/Config/AliasTrait.php

Spacing +1 added lines, -1 removed lines

@@ -24,7 +24,7 @@
      */
     public function resolveAlias(string $alias): string
     {
-        while (is_string($alias) && isset($this->config) && isset($this->config['aliases'][$alias])) {
+        while (is_string($alias) && isset($this->config) && isset($this->config['aliases'][$alias])){
             $alias = $this->config['aliases'][$alias];
         }
 

Braces +2 added lines, -1 removed lines

@@ -24,7 +24,8 @@
      */
     public function resolveAlias(string $alias): string
     {
-        while (is_string($alias) && isset($this->config) && isset($this->config['aliases'][$alias])) {
+        while (is_string($alias) && isset($this->config) && isset($this->config['aliases'][$alias]))
+        {
             $alias = $this->config['aliases'][$alias];
         }
 

src/Core/src/Container/Autowire.php

Spacing +5 added lines, -5 removed lines

@@ -58,22 +58,22 @@ 
      */
     public static function wire($definition): Autowire
     {
-        if ($definition instanceof self) {
+        if ($definition instanceof self){
             return $definition;
         }
 
-        if (is_string($definition)) {
+        if (is_string($definition)){
             return new Autowire($definition);
         }
 
-        if (is_array($definition) && isset($definition['class'])) {
+        if (is_array($definition) && isset($definition['class'])){
             return new Autowire(
                 $definition['class'],
                 $definition['options'] ?? $definition['params'] ?? []
             );
         }
 
-        if (is_object($definition)) {
+        if (is_object($definition)){
             $autowire = new self(get_class($definition), []);
             $autowire->target = $definition;
             return $autowire;
@@ -92,7 +92,7 @@ 
      */
     public function resolve(FactoryInterface $factory, array $parameters = [])
     {
-        if ($this->target !== null) {
+        if ($this->target !== null){
             // pre-wired
             return $this->target;
         }

Braces +10 added lines, -5 removed lines

@@ -58,22 +58,26 @@ 
      */
     public static function wire($definition): Autowire
     {
-        if ($definition instanceof self) {
+        if ($definition instanceof self)
+        {
             return $definition;
         }
 
-        if (is_string($definition)) {
+        if (is_string($definition))
+        {
             return new Autowire($definition);
         }
 
-        if (is_array($definition) && isset($definition['class'])) {
+        if (is_array($definition) && isset($definition['class']))
+        {
             return new Autowire(
                 $definition['class'],
                 $definition['options'] ?? $definition['params'] ?? []
             );
         }
 
-        if (is_object($definition)) {
+        if (is_object($definition))
+        {
             $autowire = new self(get_class($definition), []);
             $autowire->target = $definition;
             return $autowire;
@@ -92,7 +96,8 @@ 
      */
     public function resolve(FactoryInterface $factory, array $parameters = [])
     {
-        if ($this->target !== null) {
+        if ($this->target !== null)
+        {
             // pre-wired
             return $this->target;
         }

src/Framework/Translator/Views/LocaleProcessor.php

Braces +2 added lines, -1 removed lines

@@ -54,7 +54,8 @@
         return $source->withCode(
             preg_replace_callback(
                 self::REGEXP,
-                function ($matches) use ($domain, $context) {
+                function ($matches) use ($domain, $context)
+                {
                     return $this->translator->trans(
                         $matches[1],
                         [],

src/Framework/Security/GuardScope.php

Spacing +6 added lines, -6 removed lines

@@ -41,7 +41,7 @@ 
         PermissionsInterface $permissions,
         ContainerInterface $actorScope,
         array $roles = []
-    ) {
+    ){
         $this->roles = $roles;
         $this->container = $actorScope;
         $this->permissions = $permissions;
@@ -55,8 +55,8 @@ 
     public function allows(string $permission, array $context = []): bool
     {
         $allows = false;
-        foreach ($this->getRoles() as $role) {
-            if (!$this->permissions->hasRole($role)) {
+        foreach ($this->getRoles() as $role){
+            if (!$this->permissions->hasRole($role)){
                 continue;
             }
 
@@ -103,13 +103,13 @@ 
      */
     public function getActor(): ActorInterface
     {
-        if (!is_null($this->actor)) {
+        if (!is_null($this->actor)){
             return $this->actor;
         }
 
-        try {
+        try{
             return $this->container->get(ActorInterface::class);
-        } catch (NotFoundExceptionInterface $e) {
+        }catch (NotFoundExceptionInterface $e){
             throw new ScopeException('Unable to resolve Actor from the scope', $e->getCode(), $e);
         }
     }

Braces +11 added lines, -5 removed lines

@@ -55,8 +55,10 @@ 
     public function allows(string $permission, array $context = []): bool
     {
         $allows = false;
-        foreach ($this->getRoles() as $role) {
-            if (!$this->permissions->hasRole($role)) {
+        foreach ($this->getRoles() as $role)
+        {
+            if (!$this->permissions->hasRole($role))
+            {
                 continue;
             }
 
@@ -103,13 +105,17 @@ 
      */
     public function getActor(): ActorInterface
     {
-        if (!is_null($this->actor)) {
+        if (!is_null($this->actor))
+        {
             return $this->actor;
         }
 
-        try {
+        try
+        {
             return $this->container->get(ActorInterface::class);
-        } catch (NotFoundExceptionInterface $e) {
+        }
+        catch (NotFoundExceptionInterface $e)
+        {
             throw new ScopeException('Unable to resolve Actor from the scope', $e->getCode(), $e);
         }
     }

src/Framework/Filter/InputScope.php

Spacing +1 added lines, -1 removed lines

@@ -41,7 +41,7 @@
      */
     public function getValue(string $source, string $name = null)
     {
-        if (!method_exists($this->input, $source)) {
+        if (!method_exists($this->input, $source)){
             throw new InputException("Undefined input source '{$source}'");
         }
 

Braces +2 added lines, -1 removed lines

@@ -41,7 +41,8 @@
      */
     public function getValue(string $source, string $name = null)
     {
-        if (!method_exists($this->input, $source)) {
+        if (!method_exists($this->input, $source))
+        {
             throw new InputException("Undefined input source '{$source}'");
         }
 

src/Framework/Cycle/RepositoryInjector.php

Spacing +2 added lines, -2 removed lines

@@ -42,13 +42,13 @@
     {
         $schema = $this->orm->getSchema();
 
-        foreach ($schema->getRoles() as $role) {
+        foreach ($schema->getRoles() as $role){
             $repository = $schema->define($role, Schema::REPOSITORY);
 
             if (
                 $repository !== Select\Repository::class
                 && $repository === $class->getName()
-            ) {
+            ){
                 return $this->orm->getRepository($role);
             }
         }

Braces +2 added lines, -1 removed lines

@@ -42,7 +42,8 @@
     {
         $schema = $this->orm->getSchema();
 
-        foreach ($schema->getRoles() as $role) {
+        foreach ($schema->getRoles() as $role)
+        {
             $repository = $schema->define($role, Schema::REPOSITORY);
 
             if (