spiral / framework

src/DataGridBridge/tests/GeneratorTest.php

Spacing +4 added lines, -4 removed lines

@@ -130,7 +130,7 @@ 
                 $this->db->table('users')->select('*'),
                 $schema
             )
-            ->withView(static function ($u) {
+            ->withView(static function ($u){
                 return $u['name'];
             });
 
@@ -160,7 +160,7 @@ 
                 $this->db->table('users')->select('*'),
                 $schema
             )
-            ->withView(static function ($u) {
+            ->withView(static function ($u){
                 return $u['name'];
             });
 
@@ -189,7 +189,7 @@ 
                 $this->db->table('users')->select('*'),
                 $schema
             )
-            ->withView(static function ($u) {
+            ->withView(static function ($u){
                 return $u['name'];
             });
 
@@ -218,7 +218,7 @@ 
                 $this->db->table('users')->select('*'),
                 $schema
             )
-            ->withView(static function ($u) {
+            ->withView(static function ($u){
                 return $u['name'];
             });
 

Braces +8 added lines, -4 removed lines

@@ -130,7 +130,8 @@ 
                 $this->db->table('users')->select('*'),
                 $schema
             )
-            ->withView(static function ($u) {
+            ->withView(static function ($u)
+            {
                 return $u['name'];
             });
 
@@ -160,7 +161,8 @@ 
                 $this->db->table('users')->select('*'),
                 $schema
             )
-            ->withView(static function ($u) {
+            ->withView(static function ($u)
+            {
                 return $u['name'];
             });
 
@@ -189,7 +191,8 @@ 
                 $this->db->table('users')->select('*'),
                 $schema
             )
-            ->withView(static function ($u) {
+            ->withView(static function ($u)
+            {
                 return $u['name'];
             });
 
@@ -218,7 +221,8 @@ 
                 $this->db->table('users')->select('*'),
                 $schema
             )
-            ->withView(static function ($u) {
+            ->withView(static function ($u)
+            {
                 return $u['name'];
             });
 

src/Core/src/Container.php

Spacing +69 added lines, -69 removed lines

@@ -98,7 +98,7 @@ 
     {
         $arguments = [];
 
-        foreach ($reflection->getParameters() as $parameter) {
+        foreach ($reflection->getParameters() as $parameter){
             $type = $parameter->getType();
             $name = $parameter->getName();
             $class = null;
@@ -109,17 +109,17 @@ 
              *
              * @psalm-suppress UndefinedClass
              */
-            if ($type instanceof \ReflectionUnionType) {
+            if ($type instanceof \ReflectionUnionType){
                 $error = 'Parameter $%s in %s contains a union type hint that cannot be inferred unambiguously';
                 $error = \sprintf($error, $reflection->getName(), $this->getLocationString($reflection));
 
                 throw new ContainerException($error);
             }
 
-            if ($type instanceof \ReflectionNamedType && !$type->isBuiltin()) {
-                try {
+            if ($type instanceof \ReflectionNamedType && !$type->isBuiltin()){
+                try{
                     $class = new \ReflectionClass($type->getName());
-                } catch (\ReflectionException $e) {
+                }catch (\ReflectionException $e){
                     $location = $this->getLocationString($reflection);
 
                     $error = 'Unable to resolve `\$%s` parameter in %s: %s';
@@ -129,11 +129,11 @@ 
                 }
             }
 
-            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];
                 }
@@ -141,16 +141,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;
@@ -160,12 +160,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;
@@ -195,7 +195,7 @@ 
      */
     public function get($alias, string $context = null)
     {
-        if ($alias instanceof Autowire) {
+        if ($alias instanceof Autowire){
             return $alias->resolve($this);
         }
 
@@ -211,34 +211,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;
         }
@@ -252,28 +252,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]);
             }
         }
@@ -289,7 +289,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];
 
@@ -308,7 +308,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;
 
@@ -326,11 +326,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];
         }
@@ -412,7 +412,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));
         }
 
@@ -431,7 +431,7 @@ 
     {
         $location = $reflection->getName();
 
-        if ($reflection instanceof \ReflectionMethod) {
+        if ($reflection instanceof \ReflectionMethod){
             return "{$reflection->getDeclaringClass()->getName()}::{$location}()";
         }
 
@@ -450,11 +450,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);
             }
 
@@ -462,20 +462,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);
         }
     }
@@ -493,22 +493,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'",
@@ -519,7 +519,7 @@ 
                 }
 
                 $instance = $injectorInstance->createInjection($reflection, $context);
-                if (!$reflection->isInstance($instance)) {
+                if (!$reflection->isInstance($instance)){
                     throw new InjectionException(
                         \sprintf(
                             "Invalid injection response for '%s'",
@@ -527,23 +527,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();
         }
@@ -560,28 +560,28 @@ 
     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;
@@ -590,7 +590,7 @@ 
                 if (
                     \interface_exists($target, true)
                     && $reflection->implementsInterface($target)
-                ) {
+                ){
                     $this->injectors[$class] = $injector;
 
                     return true;
@@ -612,9 +612,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;
             }
         }
@@ -635,19 +635,19 @@ 
      */
     private function evaluateBinding(string $alias, $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);
             }
 
@@ -657,16 +657,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);
             }
 

Braces +142 added lines, -65 removed lines

@@ -98,7 +98,8 @@ 
     {
         $arguments = [];
 
-        foreach ($reflection->getParameters() as $parameter) {
+        foreach ($reflection->getParameters() as $parameter)
+        {
             $type = $parameter->getType();
             $name = $parameter->getName();
             $class = null;
@@ -109,17 +110,22 @@ 
              *
              * @psalm-suppress UndefinedClass
              */
-            if ($type instanceof \ReflectionUnionType) {
+            if ($type instanceof \ReflectionUnionType)
+            {
                 $error = 'Parameter $%s in %s contains a union type hint that cannot be inferred unambiguously';
                 $error = \sprintf($error, $reflection->getName(), $this->getLocationString($reflection));
 
                 throw new ContainerException($error);
             }
 
-            if ($type instanceof \ReflectionNamedType && !$type->isBuiltin()) {
-                try {
+            if ($type instanceof \ReflectionNamedType && !$type->isBuiltin())
+            {
+                try
+                {
                     $class = new \ReflectionClass($type->getName());
-                } catch (\ReflectionException $e) {
+                }
+                catch (\ReflectionException $e)
+                {
                     $location = $this->getLocationString($reflection);
 
                     $error = 'Unable to resolve `\$%s` parameter in %s: %s';
@@ -129,11 +135,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];
                 }
@@ -141,16 +151,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;
@@ -160,12 +173,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;
@@ -195,7 +212,8 @@ 
      */
     public function get($alias, string $context = null)
     {
-        if ($alias instanceof Autowire) {
+        if ($alias instanceof Autowire)
+        {
             return $alias->resolve($this);
         }
 
@@ -211,34 +229,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;
         }
@@ -252,28 +280,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]);
             }
         }
@@ -289,7 +327,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];
 
@@ -308,7 +347,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;
 
@@ -326,11 +366,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];
         }
@@ -412,7 +454,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));
         }
 
@@ -431,7 +474,8 @@ 
     {
         $location = $reflection->getName();
 
-        if ($reflection instanceof \ReflectionMethod) {
+        if ($reflection instanceof \ReflectionMethod)
+        {
             return "{$reflection->getDeclaringClass()->getName()}::{$location}()";
         }
 
@@ -450,7 +494,8 @@ 
      */
     private function assertType(\ReflectionParameter $parameter, ContextFunction $context, $value): void
     {
-        if ($value === null) {
+        if ($value === null)
+        {
             if (
                 !$parameter->isOptional() &&
                 !($parameter->isDefaultValueAvailable() && $parameter->getDefaultValue() === null)
@@ -462,20 +507,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);
         }
     }
@@ -493,22 +542,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'",
@@ -519,7 +574,8 @@ 
                 }
 
                 $instance = $injectorInstance->createInjection($reflection, $context);
-                if (!$reflection->isInstance($instance)) {
+                if (!$reflection->isInstance($instance))
+                {
                     throw new InjectionException(
                         \sprintf(
                             "Invalid injection response for '%s'",
@@ -527,23 +583,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();
         }
@@ -560,7 +622,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;
         }
 
@@ -573,11 +636,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)
@@ -612,9 +677,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;
             }
         }
@@ -635,19 +702,25 @@ 
      */
     private function evaluateBinding(string $alias, $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);
             }
 
@@ -657,16 +730,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);
             }
 

src/Framework/Domain/CycleInterceptor.php

Spacing +15 added lines, -15 removed lines

@@ -46,17 +46,17 @@ 
         $entities = $this->getDeclaredEntities($controller, $action);
 
         $contextCandidates = [];
-        foreach ($entities as $parameter => $role) {
+        foreach ($entities as $parameter => $role){
             $value = $this->getParameter($parameter, $parameters, count($entities) === 1);
-            if ($value === null) {
+            if ($value === null){
                 throw new ControllerException(
                     "Entity `{$parameter}` can not be found",
                     ControllerException::NOT_FOUND
                 );
             }
 
-            if (is_object($value)) {
-                if ($this->orm->getHeap()->has($value)) {
+            if (is_object($value)){
+                if ($this->orm->getHeap()->has($value)){
                     $contextCandidates[] = $value;
                 }
 
@@ -65,7 +65,7 @@ 
             }
 
             $entity = $this->resolveEntity($role, $value);
-            if ($entity === null) {
+            if ($entity === null){
                 throw new ControllerException(
                     "Entity `{$parameter}` can not be found",
                     ControllerException::NOT_FOUND
@@ -76,7 +76,7 @@ 
             $contextCandidates[] = $entity;
         }
 
-        if (!isset($parameters['@context']) && count($contextCandidates) === 1) {
+        if (!isset($parameters['@context']) && count($contextCandidates) === 1){
             $parameters['@context'] = current($contextCandidates);
         }
 
@@ -91,7 +91,7 @@ 
      */
     protected function getParameter(string $role, array $parameters, bool $useDefault = false)
     {
-        if (!$useDefault) {
+        if (!$useDefault){
             return $parameters[$role] ?? null;
         }
 
@@ -116,25 +116,25 @@ 
     private function getDeclaredEntities(string $controller, string $action): array
     {
         $key = sprintf('%s:%s', $controller, $action);
-        if (array_key_exists($key, $this->cache)) {
+        if (array_key_exists($key, $this->cache)){
             return $this->cache[$key];
         }
 
         $this->cache[$key] = [];
-        try {
+        try{
             $method = new \ReflectionMethod($controller, $action);
-        } catch (\ReflectionException $e) {
+        }catch (\ReflectionException $e){
             return [];
         }
 
-        foreach ($method->getParameters() as $parameter) {
+        foreach ($method->getParameters() as $parameter){
             $class = $this->getParameterClass($parameter);
 
-            if ($class === null) {
+            if ($class === null){
                 continue;
             }
 
-            if ($this->orm->getSchema()->defines($class->getName())) {
+            if ($this->orm->getSchema()->defines($class->getName())){
                 $this->cache[$key][$parameter->getName()] = $this->orm->resolveRole($class->getName());
             }
         }
@@ -150,11 +150,11 @@ 
     {
         $type = $parameter->getType();
 
-        if (!$type instanceof \ReflectionNamedType) {
+        if (!$type instanceof \ReflectionNamedType){
             return null;
         }
 
-        if ($type->isBuiltin()) {
+        if ($type->isBuiltin()){
             return null;
         }
 

Braces +31 added lines, -15 removed lines

@@ -46,17 +46,21 @@ 
         $entities = $this->getDeclaredEntities($controller, $action);
 
         $contextCandidates = [];
-        foreach ($entities as $parameter => $role) {
+        foreach ($entities as $parameter => $role)
+        {
             $value = $this->getParameter($parameter, $parameters, count($entities) === 1);
-            if ($value === null) {
+            if ($value === null)
+            {
                 throw new ControllerException(
                     "Entity `{$parameter}` can not be found",
                     ControllerException::NOT_FOUND
                 );
             }
 
-            if (is_object($value)) {
-                if ($this->orm->getHeap()->has($value)) {
+            if (is_object($value))
+            {
+                if ($this->orm->getHeap()->has($value))
+                {
                     $contextCandidates[] = $value;
                 }
 
@@ -65,7 +69,8 @@ 
             }
 
             $entity = $this->resolveEntity($role, $value);
-            if ($entity === null) {
+            if ($entity === null)
+            {
                 throw new ControllerException(
                     "Entity `{$parameter}` can not be found",
                     ControllerException::NOT_FOUND
@@ -76,7 +81,8 @@ 
             $contextCandidates[] = $entity;
         }
 
-        if (!isset($parameters['@context']) && count($contextCandidates) === 1) {
+        if (!isset($parameters['@context']) && count($contextCandidates) === 1)
+        {
             $parameters['@context'] = current($contextCandidates);
         }
 
@@ -91,7 +97,8 @@ 
      */
     protected function getParameter(string $role, array $parameters, bool $useDefault = false)
     {
-        if (!$useDefault) {
+        if (!$useDefault)
+        {
             return $parameters[$role] ?? null;
         }
 
@@ -116,25 +123,32 @@ 
     private function getDeclaredEntities(string $controller, string $action): array
     {
         $key = sprintf('%s:%s', $controller, $action);
-        if (array_key_exists($key, $this->cache)) {
+        if (array_key_exists($key, $this->cache))
+        {
             return $this->cache[$key];
         }
 
         $this->cache[$key] = [];
-        try {
+        try
+        {
             $method = new \ReflectionMethod($controller, $action);
-        } catch (\ReflectionException $e) {
+        }
+        catch (\ReflectionException $e)
+        {
             return [];
         }
 
-        foreach ($method->getParameters() as $parameter) {
+        foreach ($method->getParameters() as $parameter)
+        {
             $class = $this->getParameterClass($parameter);
 
-            if ($class === null) {
+            if ($class === null)
+            {
                 continue;
             }
 
-            if ($this->orm->getSchema()->defines($class->getName())) {
+            if ($this->orm->getSchema()->defines($class->getName()))
+            {
                 $this->cache[$key][$parameter->getName()] = $this->orm->resolveRole($class->getName());
             }
         }
@@ -150,11 +164,13 @@ 
     {
         $type = $parameter->getType();
 
-        if (!$type instanceof \ReflectionNamedType) {
+        if (!$type instanceof \ReflectionNamedType)
+        {
             return null;
         }
 
-        if ($type->isBuiltin()) {
+        if ($type->isBuiltin())
+        {
             return null;
         }
 

src/Framework/Domain/FilterInterceptor.php

Spacing +13 added lines, -13 removed lines

@@ -49,20 +49,20 @@ 
      */
     public function process(string $controller, string $action, array $parameters, CoreInterface $core)
     {
-        foreach ($this->getDeclaredFilters($controller, $action) as $parameter => $filterClass) {
-            if (isset($parameters[$parameter])) {
+        foreach ($this->getDeclaredFilters($controller, $action) as $parameter => $filterClass){
+            if (isset($parameters[$parameter])){
                 continue;
             }
 
             /** @var FilterInterface $filter */
             $filter = $this->container->get($filterClass);
 
-            if (isset($parameters['@context'])) {
+            if (isset($parameters['@context'])){
                 // other interceptors can define the validation contex
                 $filter->setContext($parameters['@context']);
             }
 
-            if (!$filter->isValid()) {
+            if (!$filter->isValid()){
                 return $this->renderInvalid($filter);
             }
 
@@ -80,7 +80,7 @@ 
      */
     protected function renderInvalid(FilterInterface $filter)
     {
-        switch ($this->strategy) {
+        switch ($this->strategy){
             case self::STRATEGY_JSON_RESPONSE:
                 return [
                     'status' => 400,
@@ -99,25 +99,25 @@ 
     private function getDeclaredFilters(string $controller, string $action): array
     {
         $key = sprintf('%s:%s', $controller, $action);
-        if (array_key_exists($key, $this->cache)) {
+        if (array_key_exists($key, $this->cache)){
             return $this->cache[$key];
         }
 
         $this->cache[$key] = [];
-        try {
+        try{
             $method = new \ReflectionMethod($controller, $action);
-        } catch (\ReflectionException $e) {
+        }catch (\ReflectionException $e){
             return [];
         }
 
-        foreach ($method->getParameters() as $parameter) {
+        foreach ($method->getParameters() as $parameter){
             $class = $this->getParameterClass($parameter);
 
-            if ($class === null) {
+            if ($class === null){
                 continue;
             }
 
-            if ($class->implementsInterface(FilterInterface::class)) {
+            if ($class->implementsInterface(FilterInterface::class)){
                 $this->cache[$key][$parameter->getName()] = $class->getName();
             }
         }
@@ -134,11 +134,11 @@ 
     {
         $type = $parameter->getType();
 
-        if (!$type instanceof \ReflectionNamedType) {
+        if (!$type instanceof \ReflectionNamedType){
             return null;
         }
 
-        if ($type->isBuiltin()) {
+        if ($type->isBuiltin()){
             return null;
         }
 

Braces +27 added lines, -13 removed lines

@@ -49,20 +49,24 @@ 
      */
     public function process(string $controller, string $action, array $parameters, CoreInterface $core)
     {
-        foreach ($this->getDeclaredFilters($controller, $action) as $parameter => $filterClass) {
-            if (isset($parameters[$parameter])) {
+        foreach ($this->getDeclaredFilters($controller, $action) as $parameter => $filterClass)
+        {
+            if (isset($parameters[$parameter]))
+            {
                 continue;
             }
 
             /** @var FilterInterface $filter */
             $filter = $this->container->get($filterClass);
 
-            if (isset($parameters['@context'])) {
+            if (isset($parameters['@context']))
+            {
                 // other interceptors can define the validation contex
                 $filter->setContext($parameters['@context']);
             }
 
-            if (!$filter->isValid()) {
+            if (!$filter->isValid())
+            {
                 return $this->renderInvalid($filter);
             }
 
@@ -80,7 +84,8 @@ 
      */
     protected function renderInvalid(FilterInterface $filter)
     {
-        switch ($this->strategy) {
+        switch ($this->strategy)
+        {
             case self::STRATEGY_JSON_RESPONSE:
                 return [
                     'status' => 400,
@@ -99,25 +104,32 @@ 
     private function getDeclaredFilters(string $controller, string $action): array
     {
         $key = sprintf('%s:%s', $controller, $action);
-        if (array_key_exists($key, $this->cache)) {
+        if (array_key_exists($key, $this->cache))
+        {
             return $this->cache[$key];
         }
 
         $this->cache[$key] = [];
-        try {
+        try
+        {
             $method = new \ReflectionMethod($controller, $action);
-        } catch (\ReflectionException $e) {
+        }
+        catch (\ReflectionException $e)
+        {
             return [];
         }
 
-        foreach ($method->getParameters() as $parameter) {
+        foreach ($method->getParameters() as $parameter)
+        {
             $class = $this->getParameterClass($parameter);
 
-            if ($class === null) {
+            if ($class === null)
+            {
                 continue;
             }
 
-            if ($class->implementsInterface(FilterInterface::class)) {
+            if ($class->implementsInterface(FilterInterface::class))
+            {
                 $this->cache[$key][$parameter->getName()] = $class->getName();
             }
         }
@@ -134,11 +146,13 @@ 
     {
         $type = $parameter->getType();
 
-        if (!$type instanceof \ReflectionNamedType) {
+        if (!$type instanceof \ReflectionNamedType)
+        {
             return null;
         }
 
-        if ($type->isBuiltin()) {
+        if ($type->isBuiltin())
+        {
             return null;
         }
 

src/Framework/Command/PublishCommand.php

Spacing +9 added lines, -9 removed lines

@@ -52,10 +52,10 @@ 
         FilesInterface $files,
         DirectoriesInterface $directories
     ): void {
-        switch ($this->argument('type')) {
+        switch ($this->argument('type')){
             case 'replace':
             case 'follow':
-                if ($this->isDirectory()) {
+                if ($this->isDirectory()){
                     $this->sprintf(
                         '<fg=cyan>•</fg=cyan> publish directory <comment>%s</comment> to <comment>%s</comment>',
                         $this->getSource($files),
@@ -68,7 +68,7 @@ 
                         $this->getMergeMode(),
                         $this->getFileMode()
                     );
-                } else {
+                }else{
                     $this->sprintf(
                         '<fg=cyan>•</fg=cyan> publish file <comment>%s</comment> to <comment>%s</comment>',
                         $this->getSource($files),
@@ -107,7 +107,7 @@ 
      */
     private function getSource(FilesInterface $files): ?string
     {
-        if (!$this->isDirectory()) {
+        if (!$this->isDirectory()){
             return $files->normalizePath($this->argument('source'));
         }
 
@@ -122,7 +122,7 @@ 
     private function getTarget(FilesInterface $files, DirectoriesInterface $directories): ?string
     {
         $target = $this->argument('target');
-        foreach ($directories->getAll() as $alias => $value) {
+        foreach ($directories->getAll() as $alias => $value){
             $target = str_replace("@{$alias}", $value, $target);
         }
 
@@ -134,11 +134,11 @@ 
      */
     private function isDirectory(): bool
     {
-        if ($this->argument('type') == 'ensure') {
+        if ($this->argument('type') == 'ensure'){
             return true;
         }
 
-        if (strpos($this->argument('source'), '*') !== false) {
+        if (strpos($this->argument('source'), '*') !== false){
             return true;
         }
 
@@ -150,7 +150,7 @@ 
      */
     private function getMergeMode(): string
     {
-        switch ($this->argument('type')) {
+        switch ($this->argument('type')){
             case 'follow':
                 return PublisherInterface::FOLLOW;
             case 'replace':
@@ -165,7 +165,7 @@ 
      */
     private function getFileMode(): int
     {
-        switch ($this->argument('mode')) {
+        switch ($this->argument('mode')){
             case 'readonly':
                 return FilesInterface::READONLY;
             case 'runtime':

Braces +19 added lines, -9 removed lines

@@ -52,10 +52,12 @@ 
         FilesInterface $files,
         DirectoriesInterface $directories
     ): void {
-        switch ($this->argument('type')) {
+        switch ($this->argument('type'))
+        {
             case 'replace':
             case 'follow':
-                if ($this->isDirectory()) {
+                if ($this->isDirectory())
+                {
                     $this->sprintf(
                         '<fg=cyan>•</fg=cyan> publish directory <comment>%s</comment> to <comment>%s</comment>',
                         $this->getSource($files),
@@ -68,7 +70,9 @@ 
                         $this->getMergeMode(),
                         $this->getFileMode()
                     );
-                } else {
+                }
+                else
+                {
                     $this->sprintf(
                         '<fg=cyan>•</fg=cyan> publish file <comment>%s</comment> to <comment>%s</comment>',
                         $this->getSource($files),
@@ -107,7 +111,8 @@ 
      */
     private function getSource(FilesInterface $files): ?string
     {
-        if (!$this->isDirectory()) {
+        if (!$this->isDirectory())
+        {
             return $files->normalizePath($this->argument('source'));
         }
 
@@ -122,7 +127,8 @@ 
     private function getTarget(FilesInterface $files, DirectoriesInterface $directories): ?string
     {
         $target = $this->argument('target');
-        foreach ($directories->getAll() as $alias => $value) {
+        foreach ($directories->getAll() as $alias => $value)
+        {
             $target = str_replace("@{$alias}", $value, $target);
         }
 
@@ -134,11 +140,13 @@ 
      */
     private function isDirectory(): bool
     {
-        if ($this->argument('type') == 'ensure') {
+        if ($this->argument('type') == 'ensure')
+        {
             return true;
         }
 
-        if (strpos($this->argument('source'), '*') !== false) {
+        if (strpos($this->argument('source'), '*') !== false)
+        {
             return true;
         }
 
@@ -150,7 +158,8 @@ 
      */
     private function getMergeMode(): string
     {
-        switch ($this->argument('type')) {
+        switch ($this->argument('type'))
+        {
             case 'follow':
                 return PublisherInterface::FOLLOW;
             case 'replace':
@@ -165,7 +174,8 @@ 
      */
     private function getFileMode(): int
     {
-        switch ($this->argument('mode')) {
+        switch ($this->argument('mode'))
+        {
             case 'readonly':
                 return FilesInterface::READONLY;
             case 'runtime':

src/Framework/Module/Publisher.php

Spacing +7 added lines, -7 removed lines

@@ -41,17 +41,17 @@ 
         string $mergeMode = self::FOLLOW,
         int $mode = FilesInterface::READONLY
     ): void {
-        if (!$this->files->isFile($filename)) {
+        if (!$this->files->isFile($filename)){
             throw new PublishException("Given '{$filename}' is not valid file");
         }
 
-        if ($this->files->exists($destination)) {
-            if ($this->files->md5($destination) === $this->files->md5($filename)) {
+        if ($this->files->exists($destination)){
+            if ($this->files->md5($destination) === $this->files->md5($filename)){
                 //Nothing to do
                 return;
             }
 
-            if ($mergeMode === self::FOLLOW) {
+            if ($mergeMode === self::FOLLOW){
                 return;
             }
         }
@@ -73,17 +73,17 @@ 
         string $mergeMode = self::REPLACE,
         int $mode = FilesInterface::READONLY
     ): void {
-        if (!$this->files->isDirectory($directory)) {
+        if (!$this->files->isDirectory($directory)){
             throw new PublishException("Given '{$directory}' is not valid directory");
         }
 
         $finder = new Finder();
         $finder->files()->in($directory);
 
-        foreach ($finder->getIterator() as $file) {
+        foreach ($finder->getIterator() as $file){
             $this->publish(
                 (string)$file,
-                $destination . '/' . $file->getRelativePathname(),
+                $destination.'/'.$file->getRelativePathname(),
                 $mergeMode,
                 $mode
             );

Braces +12 added lines, -6 removed lines

@@ -41,17 +41,21 @@ 
         string $mergeMode = self::FOLLOW,
         int $mode = FilesInterface::READONLY
     ): void {
-        if (!$this->files->isFile($filename)) {
+        if (!$this->files->isFile($filename))
+        {
             throw new PublishException("Given '{$filename}' is not valid file");
         }
 
-        if ($this->files->exists($destination)) {
-            if ($this->files->md5($destination) === $this->files->md5($filename)) {
+        if ($this->files->exists($destination))
+        {
+            if ($this->files->md5($destination) === $this->files->md5($filename))
+            {
                 //Nothing to do
                 return;
             }
 
-            if ($mergeMode === self::FOLLOW) {
+            if ($mergeMode === self::FOLLOW)
+            {
                 return;
             }
         }
@@ -73,14 +77,16 @@ 
         string $mergeMode = self::REPLACE,
         int $mode = FilesInterface::READONLY
     ): void {
-        if (!$this->files->isDirectory($directory)) {
+        if (!$this->files->isDirectory($directory))
+        {
             throw new PublishException("Given '{$directory}' is not valid directory");
         }
 
         $finder = new Finder();
         $finder->files()->in($directory);
 
-        foreach ($finder->getIterator() as $file) {
+        foreach ($finder->getIterator() as $file)
+        {
             $this->publish(
                 (string)$file,
                 $destination . '/' . $file->getRelativePathname(),

src/Framework/Broadcast/Middleware/WebsocketsMiddleware.php

Spacing +10 added lines, -10 removed lines

@@ -50,7 +50,7 @@ 
         ScopeInterface $scope,
         ResolverInterface $resolver,
         ResponseFactoryInterface $responseFactory
-    ) {
+    ){
         $this->config = $config;
         $this->scope = $scope;
         $this->resolver = $resolver;
@@ -67,13 +67,13 @@ 
      */
     public function process(ServerRequestInterface $request, RequestHandlerInterface $handler): ResponseInterface
     {
-        if ($request->getUri()->getPath() !== $this->config->getPath()) {
+        if ($request->getUri()->getPath() !== $this->config->getPath()){
             return $handler->handle($request);
         }
 
         // server authorization
-        if ($request->getAttribute('ws:joinServer', null) !== null) {
-            if (!$this->authorizeServer($request)) {
+        if ($request->getAttribute('ws:joinServer', null) !== null){
+            if (!$this->authorizeServer($request)){
                 return $this->responseFactory->createResponse(403);
             }
 
@@ -81,10 +81,10 @@ 
         }
 
         // topic authorization
-        if (is_string($request->getAttribute('ws:joinTopics', null))) {
+        if (is_string($request->getAttribute('ws:joinTopics', null))){
             $topics = explode(',', $request->getAttribute('ws:joinTopics'));
-            foreach ($topics as $topic) {
-                if (!$this->authorizeTopic($request, $topic)) {
+            foreach ($topics as $topic){
+                if (!$this->authorizeTopic($request, $topic)){
                     return $this->responseFactory->createResponse(403);
                 }
             }
@@ -104,7 +104,7 @@ 
     private function authorizeServer(ServerRequestInterface $request): bool
     {
         $callback = $this->config->getServerCallback();
-        if ($callback === null) {
+        if ($callback === null){
             return true;
         }
 
@@ -122,7 +122,7 @@ 
     {
         $parameters = [];
         $callback = $this->config->findTopicCallback($topic, $parameters);
-        if ($callback === null) {
+        if ($callback === null){
             return false;
         }
 
@@ -139,7 +139,7 @@ 
      */
     private function invoke(ServerRequestInterface $request, callable $callback, array $parameters = []): bool
     {
-        switch (true) {
+        switch (true){
             case $callback instanceof \Closure || is_string($callback):
                 $reflection = new \ReflectionFunction($callback);
                 break;

Braces +20 added lines, -10 removed lines

@@ -67,13 +67,16 @@ 
      */
     public function process(ServerRequestInterface $request, RequestHandlerInterface $handler): ResponseInterface
     {
-        if ($request->getUri()->getPath() !== $this->config->getPath()) {
+        if ($request->getUri()->getPath() !== $this->config->getPath())
+        {
             return $handler->handle($request);
         }
 
         // server authorization
-        if ($request->getAttribute('ws:joinServer', null) !== null) {
-            if (!$this->authorizeServer($request)) {
+        if ($request->getAttribute('ws:joinServer', null) !== null)
+        {
+            if (!$this->authorizeServer($request))
+            {
                 return $this->responseFactory->createResponse(403);
             }
 
@@ -81,10 +84,13 @@ 
         }
 
         // topic authorization
-        if (is_string($request->getAttribute('ws:joinTopics', null))) {
+        if (is_string($request->getAttribute('ws:joinTopics', null)))
+        {
             $topics = explode(',', $request->getAttribute('ws:joinTopics'));
-            foreach ($topics as $topic) {
-                if (!$this->authorizeTopic($request, $topic)) {
+            foreach ($topics as $topic)
+            {
+                if (!$this->authorizeTopic($request, $topic))
+                {
                     return $this->responseFactory->createResponse(403);
                 }
             }
@@ -104,7 +110,8 @@ 
     private function authorizeServer(ServerRequestInterface $request): bool
     {
         $callback = $this->config->getServerCallback();
-        if ($callback === null) {
+        if ($callback === null)
+        {
             return true;
         }
 
@@ -122,7 +129,8 @@ 
     {
         $parameters = [];
         $callback = $this->config->findTopicCallback($topic, $parameters);
-        if ($callback === null) {
+        if ($callback === null)
+        {
             return false;
         }
 
@@ -139,7 +147,8 @@ 
      */
     private function invoke(ServerRequestInterface $request, callable $callback, array $parameters = []): bool
     {
-        switch (true) {
+        switch (true)
+        {
             case $callback instanceof \Closure || is_string($callback):
                 $reflection = new \ReflectionFunction($callback);
                 break;
@@ -160,7 +169,8 @@ 
             [
                 ServerRequestInterface::class => $request,
             ],
-            function () use ($reflection, $parameters, $callback) {
+            function () use ($reflection, $parameters, $callback)
+            {
                 return call_user_func_array(
                     $callback,
                     $this->resolver->resolveArguments($reflection, $parameters)

src/Framework/Broadcast/Config/WebsocketsConfig.php

Spacing +7 added lines, -7 removed lines

@@ -34,7 +34,7 @@ 
     {
         parent::__construct($config);
 
-        foreach ($config['authorizeTopics'] as $topic => $callback) {
+        foreach ($config['authorizeTopics'] as $topic => $callback){
             $this->patterns[$this->compilePattern($topic)] = $callback;
         }
     }
@@ -62,8 +62,8 @@ 
      */
     public function findTopicCallback(string $topic, array &$matches): ?callable
     {
-        foreach ($this->patterns as $pattern => $callback) {
-            if (preg_match($pattern, $topic, $matches)) {
+        foreach ($this->patterns as $pattern => $callback){
+            if (preg_match($pattern, $topic, $matches)){
                 return $callback;
             }
         }
@@ -78,13 +78,13 @@ 
     private function compilePattern(string $topic): string
     {
         $replaces = [];
-        if (preg_match_all('/\{(\w+):?(.*?)?\}/', $topic, $matches)) {
+        if (preg_match_all('/\{(\w+):?(.*?)?\}/', $topic, $matches)){
             $variables = array_combine($matches[1], $matches[2]);
-            foreach ($variables as $key => $_) {
-                $replaces['{' . $key . '}'] = '(?P<' . $key . '>[^\/\.]+)';
+            foreach ($variables as $key => $_){
+                $replaces['{'.$key.'}'] = '(?P<'.$key.'>[^\/\.]+)';
             }
         }
 
-        return '/^' . strtr($topic, $replaces + ['/' => '\\/', '[' => '(?:', ']' => ')?', '.' => '\.']) . '$/iu';
+        return '/^'.strtr($topic, $replaces + ['/' => '\\/', '[' => '(?:', ']' => ')?', '.' => '\.']).'$/iu';
     }
 }

Braces +10 added lines, -5 removed lines

@@ -34,7 +34,8 @@ 
     {
         parent::__construct($config);
 
-        foreach ($config['authorizeTopics'] as $topic => $callback) {
+        foreach ($config['authorizeTopics'] as $topic => $callback)
+        {
             $this->patterns[$this->compilePattern($topic)] = $callback;
         }
     }
@@ -62,8 +63,10 @@ 
      */
     public function findTopicCallback(string $topic, array &$matches): ?callable
     {
-        foreach ($this->patterns as $pattern => $callback) {
-            if (preg_match($pattern, $topic, $matches)) {
+        foreach ($this->patterns as $pattern => $callback)
+        {
+            if (preg_match($pattern, $topic, $matches))
+            {
                 return $callback;
             }
         }
@@ -78,9 +81,11 @@ 
     private function compilePattern(string $topic): string
     {
         $replaces = [];
-        if (preg_match_all('/\{(\w+):?(.*?)?\}/', $topic, $matches)) {
+        if (preg_match_all('/\{(\w+):?(.*?)?\}/', $topic, $matches))
+        {
             $variables = array_combine($matches[1], $matches[2]);
-            foreach ($variables as $key => $_) {
+            foreach ($variables as $key => $_)
+            {
                 $replaces['{' . $key . '}'] = '(?P<' . $key . '>[^\/\.]+)';
             }
         }

src/Translator/src/Catalogue/CatalogueLoader.php

Spacing +5 added lines, -5 removed lines

@@ -48,7 +48,7 @@ 
      */
     public function getLocales(): array
     {
-        if (!is_dir($this->config->getLocalesDirectory())) {
+        if (!is_dir($this->config->getLocalesDirectory())){
             return [];
         }
 
@@ -57,7 +57,7 @@ 
 
         $locales = [];
 
-        foreach ($finder->directories() as $directory) {
+        foreach ($finder->directories() as $directory){
             $locales[] = $directory->getFilename();
         }
 
@@ -72,14 +72,14 @@ 
         $locale = preg_replace('/[^a-zA-Z_]/', '', mb_strtolower($locale));
         $catalogue = new Catalogue($locale);
 
-        if (!$this->hasLocale($locale)) {
+        if (!$this->hasLocale($locale)){
             return $catalogue;
         }
 
         $finder = new Finder();
         $finder->in($this->config->getLocaleDirectory($locale));
 
-        foreach ($finder->getIterator() as $file) {
+        foreach ($finder->getIterator() as $file){
             $this->getLogger()->info(
                 sprintf(
                     "found locale domain file '%s'",
@@ -91,7 +91,7 @@ 
             //Per application agreement domain name must present in filename
             $domain = strstr($file->getFilename(), '.', true);
 
-            if (!$this->config->hasLoader($file->getExtension())) {
+            if (!$this->config->hasLoader($file->getExtension())){
                 $this->getLogger()->warning(
                     sprintf(
                         "unable to load domain file '%s', no loader found",

Braces +10 added lines, -5 removed lines

@@ -48,7 +48,8 @@ 
      */
     public function getLocales(): array
     {
-        if (!is_dir($this->config->getLocalesDirectory())) {
+        if (!is_dir($this->config->getLocalesDirectory()))
+        {
             return [];
         }
 
@@ -57,7 +58,8 @@ 
 
         $locales = [];
 
-        foreach ($finder->directories() as $directory) {
+        foreach ($finder->directories() as $directory)
+        {
             $locales[] = $directory->getFilename();
         }
 
@@ -72,14 +74,16 @@ 
         $locale = preg_replace('/[^a-zA-Z_]/', '', mb_strtolower($locale));
         $catalogue = new Catalogue($locale);
 
-        if (!$this->hasLocale($locale)) {
+        if (!$this->hasLocale($locale))
+        {
             return $catalogue;
         }
 
         $finder = new Finder();
         $finder->in($this->config->getLocaleDirectory($locale));
 
-        foreach ($finder->getIterator() as $file) {
+        foreach ($finder->getIterator() as $file)
+        {
             $this->getLogger()->info(
                 sprintf(
                     "found locale domain file '%s'",
@@ -91,7 +95,8 @@ 
             //Per application agreement domain name must present in filename
             $domain = strstr($file->getFilename(), '.', true);
 
-            if (!$this->config->hasLoader($file->getExtension())) {
+            if (!$this->config->hasLoader($file->getExtension()))
+            {
                 $this->getLogger()->warning(
                     sprintf(
                         "unable to load domain file '%s', no loader found",