spiral / framework

src/Core/src/Container.php

Spacing +73 added lines, -73 removed lines

@@ -94,7 +94,7 @@ 
     {
         $arguments = [];
 
-        foreach ($reflection->getParameters() as $parameter) {
+        foreach ($reflection->getParameters() as $parameter){
             $type = $parameter->getType();
             $name = $parameter->getName();
             $class = null;
@@ -103,7 +103,7 @@ 
              * Container do not currently support union types. In the future, we
              * can provide the possibility of autowiring based on priorities (TBD).
              */
-            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));
 
@@ -113,17 +113,17 @@ 
             /**
              * Container do not currently support intersection types.
              */
-            if ($type instanceof \ReflectionIntersectionType) {
+            if ($type instanceof \ReflectionIntersectionType){
                 $error = 'Parameter $%s in %s contains a intersection 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';
@@ -133,11 +133,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];
                 }
@@ -145,16 +145,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;
@@ -164,12 +164,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;
@@ -205,7 +205,7 @@ 
      */
     public function get($id, string $context = null)
     {
-        if ($id instanceof Autowire) {
+        if ($id instanceof Autowire){
             return $id->resolve($this);
         }
 
@@ -226,34 +226,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;
         }
@@ -267,28 +267,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]);
             }
         }
@@ -303,7 +303,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];
 
@@ -321,7 +321,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;
 
@@ -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];
         }
@@ -366,18 +366,18 @@ 
      */
     public function invoke($target, array $parameters = [])
     {
-        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'])
-            if (\is_string($resolver)) {
+            if (\is_string($resolver)){
                 $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);
             }
 
@@ -390,14 +390,14 @@ 
             );
         }
 
-        if (\is_string($target) && \is_callable($target)) {
+        if (\is_string($target) && \is_callable($target)){
             $target = Closure::fromCallable($target);
         }
 
-        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);
             }
 
@@ -452,7 +452,7 @@ 
      */
     protected function autowire(string $class, array $parameters, string $context = null)
     {
-        if (!\class_exists($class) && !isset($this->injectors[$class])) {
+        if (!\class_exists($class) && !isset($this->injectors[$class])){
             throw new NotFoundException(\sprintf("Undefined class or binding '%s'", $class));
         }
 
@@ -467,7 +467,7 @@ 
     {
         $location = $reflection->getName();
 
-        if ($reflection instanceof \ReflectionMethod) {
+        if ($reflection instanceof \ReflectionMethod){
             return "{$reflection->getDeclaringClass()->getName()}::{$location}()";
         }
 
@@ -483,8 +483,8 @@ 
      */
     private function assertType(\ReflectionParameter $parameter, ContextFunction $context, $value): void
     {
-        if ($value === null) {
-            if (!$parameter->allowsNull()) {
+        if ($value === null){
+            if (!$parameter->allowsNull()){
                 throw new ArgumentException($parameter, $context);
             }
 
@@ -492,20 +492,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);
         }
     }
@@ -522,22 +522,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|mixed $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'",
@@ -548,7 +548,7 @@ 
                 }
 
                 $instance = $injectorInstance->createInjection($reflection, $context);
-                if (!$reflection->isInstance($instance)) {
+                if (!$reflection->isInstance($instance)){
                     throw new InjectionException(
                         \sprintf(
                             "Invalid injection response for '%s'",
@@ -556,23 +556,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();
         }
@@ -586,25 +586,25 @@ 
     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;
         }
 
         // 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;
@@ -613,7 +613,7 @@ 
             if (
                 \interface_exists($target, true)
                 && $reflection->implementsInterface($target)
-            ) {
+            ){
                 $this->injectors[$class] = $injector;
 
                 return true;
@@ -634,9 +634,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;
             }
         }
@@ -654,18 +654,18 @@ 
      */
     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);
         }
 
-        try {
+        try{
             return $this->invoke($target, $parameters);
-        } catch (NotCallableException $e) {
+        }catch (NotCallableException $e){
             throw new ContainerException(\sprintf("Invalid binding for '%s'", $alias), $e->getCode(), $e);
         }
     }

Braces +153 added lines, -70 removed lines

@@ -94,7 +94,8 @@ 
     {
         $arguments = [];
 
-        foreach ($reflection->getParameters() as $parameter) {
+        foreach ($reflection->getParameters() as $parameter)
+        {
             $type = $parameter->getType();
             $name = $parameter->getName();
             $class = null;
@@ -103,7 +104,8 @@ 
              * Container do not currently support union types. In the future, we
              * can provide the possibility of autowiring based on priorities (TBD).
              */
-            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));
 
@@ -113,17 +115,22 @@ 
             /**
              * Container do not currently support intersection types.
              */
-            if ($type instanceof \ReflectionIntersectionType) {
+            if ($type instanceof \ReflectionIntersectionType)
+            {
                 $error = 'Parameter $%s in %s contains a intersection 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';
@@ -133,11 +140,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];
                 }
@@ -145,16 +156,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;
@@ -164,12 +178,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;
@@ -205,7 +223,8 @@ 
      */
     public function get($id, string $context = null)
     {
-        if ($id instanceof Autowire) {
+        if ($id instanceof Autowire)
+        {
             return $id->resolve($this);
         }
 
@@ -226,34 +245,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;
         }
@@ -267,28 +296,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]);
             }
         }
@@ -303,7 +342,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];
 
@@ -321,7 +361,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;
 
@@ -336,11 +377,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];
         }
@@ -366,18 +409,23 @@ 
      */
     public function invoke($target, array $parameters = [])
     {
-        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'])
-            if (\is_string($resolver)) {
+            if (\is_string($resolver))
+            {
                 $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);
             }
 
@@ -390,14 +438,19 @@ 
             );
         }
 
-        if (\is_string($target) && \is_callable($target)) {
+        if (\is_string($target) && \is_callable($target))
+        {
             $target = Closure::fromCallable($target);
         }
 
-        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);
             }
 
@@ -452,7 +505,8 @@ 
      */
     protected function autowire(string $class, array $parameters, string $context = null)
     {
-        if (!\class_exists($class) && !isset($this->injectors[$class])) {
+        if (!\class_exists($class) && !isset($this->injectors[$class]))
+        {
             throw new NotFoundException(\sprintf("Undefined class or binding '%s'", $class));
         }
 
@@ -467,7 +521,8 @@ 
     {
         $location = $reflection->getName();
 
-        if ($reflection instanceof \ReflectionMethod) {
+        if ($reflection instanceof \ReflectionMethod)
+        {
             return "{$reflection->getDeclaringClass()->getName()}::{$location}()";
         }
 
@@ -483,8 +538,10 @@ 
      */
     private function assertType(\ReflectionParameter $parameter, ContextFunction $context, $value): void
     {
-        if ($value === null) {
-            if (!$parameter->allowsNull()) {
+        if ($value === null)
+        {
+            if (!$parameter->allowsNull())
+            {
                 throw new ArgumentException($parameter, $context);
             }
 
@@ -492,20 +549,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);
         }
     }
@@ -522,22 +583,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|mixed $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'",
@@ -548,7 +615,8 @@ 
                 }
 
                 $instance = $injectorInstance->createInjection($reflection, $context);
-                if (!$reflection->isInstance($instance)) {
+                if (!$reflection->isInstance($instance))
+                {
                     throw new InjectionException(
                         \sprintf(
                             "Invalid injection response for '%s'",
@@ -556,23 +624,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();
         }
@@ -586,7 +660,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;
         }
 
@@ -600,7 +675,8 @@ 
         }
 
         // check interfaces
-        foreach ($this->injectors as $target => $injector) {
+        foreach ($this->injectors as $target => $injector)
+        {
             if (
                 \class_exists($target, true)
                 && $reflection->isSubclassOf($target)
@@ -634,9 +710,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;
             }
         }
@@ -654,18 +732,23 @@ 
      */
     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);
         }
 
-        try {
+        try
+        {
             return $this->invoke($target, $parameters);
-        } catch (NotCallableException $e) {
+        }
+        catch (NotCallableException $e)
+        {
             throw new ContainerException(\sprintf("Invalid binding for '%s'", $alias), $e->getCode(), $e);
         }
     }

src/Core/tests/Fixtures/UnionTypes.php

Spacing +2 added lines, -2 removed lines

@@ -13,11 +13,11 @@
 
 class UnionTypes
 {
-    public static function example(SampleClass|TypedClass $example)
+    public static function example(SampleClass | TypedClass $example)
     {
     }
 
-    public static function unionNull(null|string $nullable): null|string
+    public static function unionNull(null | string $nullable): null | string
     {
         return $nullable;
     }

src/Core/tests/InvokerTest.php

Spacing +2 added lines, -2 removed lines

@@ -99,7 +99,7 @@ 
         $this->container->bindSingleton(Bucket::class, $bucket = new Bucket('foo'));
 
         $result = $this->container->invoke(
-            static function (Bucket $bucket, SampleClass $class, string $name, string $path = 'baz') {
+            static function (Bucket $bucket, SampleClass $class, string $name, string $path = 'baz'){
                 return \compact('bucket', 'class', 'name', 'path');
             },
             ['name' => 'bar']
@@ -117,7 +117,7 @@ 
         $this->expectErrorMessage("Unable to resolve 'name' argument in 'Spiral\Tests\Core\Fixtures\Bucket::__construct'");
 
         $this->container->invoke(
-            static function (Bucket $bucket, SampleClass $class, string $name, string $path = 'baz') {
+            static function (Bucket $bucket, SampleClass $class, string $name, string $path = 'baz'){
                 return \compact('bucket', 'class', 'name', 'path');
             },
             ['name' => 'bar']

Braces +4 added lines, -2 removed lines

@@ -99,7 +99,8 @@ 
         $this->container->bindSingleton(Bucket::class, $bucket = new Bucket('foo'));
 
         $result = $this->container->invoke(
-            static function (Bucket $bucket, SampleClass $class, string $name, string $path = 'baz') {
+            static function (Bucket $bucket, SampleClass $class, string $name, string $path = 'baz')
+            {
                 return \compact('bucket', 'class', 'name', 'path');
             },
             ['name' => 'bar']
@@ -117,7 +118,8 @@ 
         $this->expectErrorMessage("Unable to resolve 'name' argument in 'Spiral\Tests\Core\Fixtures\Bucket::__construct'");
 
         $this->container->invoke(
-            static function (Bucket $bucket, SampleClass $class, string $name, string $path = 'baz') {
+            static function (Bucket $bucket, SampleClass $class, string $name, string $path = 'baz')
+            {
                 return \compact('bucket', 'class', 'name', 'path');
             },
             ['name' => 'bar']

src/Cookies/src/Cookie/SameSite.php

Spacing +2 added lines, -2 removed lines

@@ -28,12 +28,12 @@
 
     private function defineValue(?string $sameSite, bool $secure): ?string
     {
-        if ($sameSite === null) {
+        if ($sameSite === null){
             return null;
         }
 
         $sameSite = ucfirst(strtolower($sameSite));
-        if (!in_array($sameSite, self::VALUES, true)) {
+        if (!in_array($sameSite, self::VALUES, true)){
             return null;
         }
 

Braces +4 added lines, -2 removed lines

@@ -28,12 +28,14 @@
 
     private function defineValue(?string $sameSite, bool $secure): ?string
     {
-        if ($sameSite === null) {
+        if ($sameSite === null)
+        {
             return null;
         }
 
         $sameSite = ucfirst(strtolower($sameSite));
-        if (!in_array($sameSite, self::VALUES, true)) {
+        if (!in_array($sameSite, self::VALUES, true))
+        {
             return null;
         }
 

Upper-Lower-Casing +2 added lines, -2 removed lines

@@ -11,7 +11,7 @@ 
     public const NONE   = 'None';
 
     private const VALUES  = [self::STRICT, self::LAX, self::NONE];
-    private const DEFAULT = self::LAX;
+    private const default = self::LAX;
 
     private ?string $sameSite;
 
@@ -36,6 +36,6 @@ 
             return null;
         }
 
-        return ($sameSite === self::NONE && !$secure) ? self::DEFAULT : $sameSite;
+        return ($sameSite === self::NONE && !$secure) ? self::default : $sameSite;
     }
 }

src/Cookies/src/Middleware/CookiesMiddleware.php

Spacing +15 added lines, -15 removed lines

@@ -66,8 +66,8 @@ 
     {
         $cookies = $request->getCookieParams();
 
-        foreach ($cookies as $name => $cookie) {
-            if (!$this->isProtected($name)) {
+        foreach ($cookies as $name => $cookie){
+            if (!$this->isProtected($name)){
                 continue;
             }
 
@@ -82,7 +82,7 @@ 
      */
     protected function isProtected(string $cookie): bool
     {
-        if (in_array($cookie, $this->config->getExcludedCookies(), true)) {
+        if (in_array($cookie, $this->config->getExcludedCookies(), true)){
             //Excluded
             return false;
         }
@@ -98,14 +98,14 @@ 
      */
     protected function packCookies(Response $response, CookieQueue $queue): Response
     {
-        if (empty($queue->getScheduled())) {
+        if (empty($queue->getScheduled())){
             return $response;
         }
 
         $cookies = $response->getHeader('Set-Cookie');
 
-        foreach ($queue->getScheduled() as $cookie) {
-            if (empty($cookie->getValue()) || !$this->isProtected($cookie->getName())) {
+        foreach ($queue->getScheduled() as $cookie){
+            if (empty($cookie->getValue()) || !$this->isProtected($cookie->getName())){
                 $cookies[] = $cookie->createHeader();
                 continue;
             }
@@ -122,26 +122,26 @@ 
      */
     private function decodeCookie($cookie)
     {
-        try {
-            if (is_array($cookie)) {
+        try{
+            if (is_array($cookie)){
                 return array_map([$this, 'decodeCookie'], $cookie);
             }
-        } catch (DecryptException $exception) {
+        }catch (DecryptException $exception){
             return null;
         }
 
-        switch ($this->config->getProtectionMethod()) {
+        switch ($this->config->getProtectionMethod()){
             case CookiesConfig::COOKIE_ENCRYPT:
-                try {
+                try{
                     return $this->encryption->getEncrypter()->decrypt($cookie);
-                } catch (DecryptException $e) {
+                }catch (DecryptException $e){
                 }
                 return null;
             case CookiesConfig::COOKIE_HMAC:
                 $hmac = substr($cookie, -1 * CookiesConfig::MAC_LENGTH);
                 $value = substr($cookie, 0, strlen($cookie) - strlen($hmac));
 
-                if (hash_equals($this->hmacSign($value), $hmac)) {
+                if (hash_equals($this->hmacSign($value), $hmac)){
                     return $value;
                 }
         }
@@ -165,13 +165,13 @@ 
 
     private function encodeCookie(Cookie $cookie): Cookie
     {
-        if ($this->config->getProtectionMethod() === CookiesConfig::COOKIE_ENCRYPT) {
+        if ($this->config->getProtectionMethod() === CookiesConfig::COOKIE_ENCRYPT){
             $encryptor = $this->encryption->getEncrypter();
 
             return $cookie->withValue($encryptor->encrypt($cookie->getValue()));
         }
 
         //VALUE.HMAC
-        return $cookie->withValue($cookie->getValue() . $this->hmacSign($cookie->getValue()));
+        return $cookie->withValue($cookie->getValue().$this->hmacSign($cookie->getValue()));
     }
 }

Braces +30 added lines, -14 removed lines

@@ -66,8 +66,10 @@ 
     {
         $cookies = $request->getCookieParams();
 
-        foreach ($cookies as $name => $cookie) {
-            if (!$this->isProtected($name)) {
+        foreach ($cookies as $name => $cookie)
+        {
+            if (!$this->isProtected($name))
+            {
                 continue;
             }
 
@@ -82,7 +84,8 @@ 
      */
     protected function isProtected(string $cookie): bool
     {
-        if (in_array($cookie, $this->config->getExcludedCookies(), true)) {
+        if (in_array($cookie, $this->config->getExcludedCookies(), true))
+        {
             //Excluded
             return false;
         }
@@ -98,14 +101,17 @@ 
      */
     protected function packCookies(Response $response, CookieQueue $queue): Response
     {
-        if (empty($queue->getScheduled())) {
+        if (empty($queue->getScheduled()))
+        {
             return $response;
         }
 
         $cookies = $response->getHeader('Set-Cookie');
 
-        foreach ($queue->getScheduled() as $cookie) {
-            if (empty($cookie->getValue()) || !$this->isProtected($cookie->getName())) {
+        foreach ($queue->getScheduled() as $cookie)
+        {
+            if (empty($cookie->getValue()) || !$this->isProtected($cookie->getName()))
+            {
                 $cookies[] = $cookie->createHeader();
                 continue;
             }
@@ -122,26 +128,35 @@ 
      */
     private function decodeCookie($cookie)
     {
-        try {
-            if (is_array($cookie)) {
+        try
+        {
+            if (is_array($cookie))
+            {
                 return array_map([$this, 'decodeCookie'], $cookie);
             }
-        } catch (DecryptException $exception) {
+        }
+        catch (DecryptException $exception)
+        {
             return null;
         }
 
-        switch ($this->config->getProtectionMethod()) {
+        switch ($this->config->getProtectionMethod())
+        {
             case CookiesConfig::COOKIE_ENCRYPT:
-                try {
+                try
+                {
                     return $this->encryption->getEncrypter()->decrypt($cookie);
-                } catch (DecryptException $e) {
+                }
+                catch (DecryptException $e)
+                {
                 }
                 return null;
             case CookiesConfig::COOKIE_HMAC:
                 $hmac = substr($cookie, -1 * CookiesConfig::MAC_LENGTH);
                 $value = substr($cookie, 0, strlen($cookie) - strlen($hmac));
 
-                if (hash_equals($this->hmacSign($value), $hmac)) {
+                if (hash_equals($this->hmacSign($value), $hmac))
+                {
                     return $value;
                 }
         }
@@ -165,7 +180,8 @@ 
 
     private function encodeCookie(Cookie $cookie): Cookie
     {
-        if ($this->config->getProtectionMethod() === CookiesConfig::COOKIE_ENCRYPT) {
+        if ($this->config->getProtectionMethod() === CookiesConfig::COOKIE_ENCRYPT)
+        {
             $encryptor = $this->encryption->getEncrypter();
 
             return $cookie->withValue($encryptor->encrypt($cookie->getValue()));

src/Http/src/Header/AcceptHeaderItem.php

Spacing +10 added lines, -10 removed lines

@@ -39,17 +39,17 @@ 
 
     public function __toString(): string
     {
-        if ($this->value === '' || $this->value === null) {
+        if ($this->value === '' || $this->value === null){
             return '';
         }
 
         $parts = [$this->value];
 
-        if ($this->quality < 1) {
+        if ($this->quality < 1){
             $parts[] = "q=$this->quality";
         }
 
-        foreach ($this->getParams() as $name => $value) {
+        foreach ($this->getParams() as $name => $value){
             $parts[] = "$name=$value";
         }
 
@@ -67,20 +67,20 @@ 
         $quality = 1.0;
         $params = [];
 
-        foreach ($elements as $element) {
+        foreach ($elements as $element){
             $parsed = \explode('=', \trim($element), 2);
 
             // Wrong params must be ignored
-            if (\count($parsed) !== 2) {
+            if (\count($parsed) !== 2){
                 continue;
             }
 
             $name = \trim($parsed[0]);
             $value = \trim($parsed[1]);
 
-            if (\strcasecmp($name, 'q') === 0) {
+            if (\strcasecmp($name, 'q') === 0){
                 $quality = (float)$value;
-            } else {
+            }else{
                 $params[$name] = $value;
             }
         }
@@ -139,15 +139,15 @@ 
 
     private function setParams(array $params): void
     {
-        foreach ($params as $name => $value) {
-            if (is_numeric($name) || !is_scalar($value)) {
+        foreach ($params as $name => $value){
+            if (is_numeric($name) || !is_scalar($value)){
                 continue;
             }
 
             $name = trim($name);
             $value = trim($value);
 
-            if ($name === '' || $value === '') {
+            if ($name === '' || $value === ''){
                 continue;
             }
 

Braces +21 added lines, -10 removed lines

@@ -39,17 +39,20 @@ 
 
     public function __toString(): string
     {
-        if ($this->value === '' || $this->value === null) {
+        if ($this->value === '' || $this->value === null)
+        {
             return '';
         }
 
         $parts = [$this->value];
 
-        if ($this->quality < 1) {
+        if ($this->quality < 1)
+        {
             $parts[] = "q=$this->quality";
         }
 
-        foreach ($this->getParams() as $name => $value) {
+        foreach ($this->getParams() as $name => $value)
+        {
             $parts[] = "$name=$value";
         }
 
@@ -67,20 +70,25 @@ 
         $quality = 1.0;
         $params = [];
 
-        foreach ($elements as $element) {
+        foreach ($elements as $element)
+        {
             $parsed = \explode('=', \trim($element), 2);
 
             // Wrong params must be ignored
-            if (\count($parsed) !== 2) {
+            if (\count($parsed) !== 2)
+            {
                 continue;
             }
 
             $name = \trim($parsed[0]);
             $value = \trim($parsed[1]);
 
-            if (\strcasecmp($name, 'q') === 0) {
+            if (\strcasecmp($name, 'q') === 0)
+            {
                 $quality = (float)$value;
-            } else {
+            }
+            else
+            {
                 $params[$name] = $value;
             }
         }
@@ -139,15 +147,18 @@ 
 
     private function setParams(array $params): void
     {
-        foreach ($params as $name => $value) {
-            if (is_numeric($name) || !is_scalar($value)) {
+        foreach ($params as $name => $value)
+        {
+            if (is_numeric($name) || !is_scalar($value))
+            {
                 continue;
             }
 
             $name = trim($name);
             $value = trim($value);
 
-            if ($name === '' || $value === '') {
+            if ($name === '' || $value === '')
+            {
                 continue;
             }
 

src/Http/src/Request/InputBag.php

Spacing +11 added lines, -11 removed lines

@@ -50,9 +50,9 @@ 
 
     public function all(): array
     {
-        try {
+        try{
             return $this->dotGet('');
-        } catch (DotNotFoundException $e) {
+        }catch (DotNotFoundException $e){
             return [];
         }
     }
@@ -77,7 +77,7 @@ 
     {
         $result = array_intersect_key($this->all(), array_flip($keys));
         ;
-        if (!$fill) {
+        if (!$fill){
             return $result;
         }
 
@@ -97,9 +97,9 @@ 
      */
     public function has(string $name): bool
     {
-        try {
+        try{
             $this->dotGet($name);
-        } catch (DotNotFoundException $e) {
+        }catch (DotNotFoundException $e){
             return false;
         }
 
@@ -123,9 +123,9 @@ 
      */
     public function get(string $name, $default = null)
     {
-        try {
+        try{
             return $this->dotGet($name);
-        } catch (DotNotFoundException $e) {
+        }catch (DotNotFoundException $e){
             return $default;
         }
     }
@@ -161,15 +161,15 @@ 
         $data = $this->data;
 
         //Generating path relative to a given name and prefix
-        $path = (!empty($this->prefix) ? $this->prefix . '.' : '') . $name;
-        if (empty($path)) {
+        $path = (!empty($this->prefix) ? $this->prefix.'.' : '').$name;
+        if (empty($path)){
             return $data;
         }
 
         $path = explode('.', rtrim($path, '.'));
 
-        foreach ($path as $step) {
-            if (!is_array($data) || !array_key_exists($step, $data)) {
+        foreach ($path as $step){
+            if (!is_array($data) || !array_key_exists($step, $data)){
                 throw new DotNotFoundException("Unable to find requested element '{$name}'");
             }
 

Braces +23 added lines, -10 removed lines

@@ -50,9 +50,12 @@ 
 
     public function all(): array
     {
-        try {
+        try
+        {
             return $this->dotGet('');
-        } catch (DotNotFoundException $e) {
+        }
+        catch (DotNotFoundException $e)
+        {
             return [];
         }
     }
@@ -77,7 +80,8 @@ 
     {
         $result = array_intersect_key($this->all(), array_flip($keys));
         ;
-        if (!$fill) {
+        if (!$fill)
+        {
             return $result;
         }
 
@@ -97,9 +101,12 @@ 
      */
     public function has(string $name): bool
     {
-        try {
+        try
+        {
             $this->dotGet($name);
-        } catch (DotNotFoundException $e) {
+        }
+        catch (DotNotFoundException $e)
+        {
             return false;
         }
 
@@ -123,9 +130,12 @@ 
      */
     public function get(string $name, $default = null)
     {
-        try {
+        try
+        {
             return $this->dotGet($name);
-        } catch (DotNotFoundException $e) {
+        }
+        catch (DotNotFoundException $e)
+        {
             return $default;
         }
     }
@@ -162,14 +172,17 @@ 
 
         //Generating path relative to a given name and prefix
         $path = (!empty($this->prefix) ? $this->prefix . '.' : '') . $name;
-        if (empty($path)) {
+        if (empty($path))
+        {
             return $data;
         }
 
         $path = explode('.', rtrim($path, '.'));
 
-        foreach ($path as $step) {
-            if (!is_array($data) || !array_key_exists($step, $data)) {
+        foreach ($path as $step)
+        {
+            if (!is_array($data) || !array_key_exists($step, $data))
+            {
                 throw new DotNotFoundException("Unable to find requested element '{$name}'");
             }
 

src/Http/src/SapiRequestFactory.php

Spacing +25 added lines, -25 removed lines

@@ -71,7 +71,7 @@ 
         UriFactoryInterface $uriFactory,
         StreamFactoryInterface $streamFactory,
         UploadedFileFactoryInterface $uploadedFileFactory
-    ) {
+    ){
         $this->requestFactory = $requestFactory;
         $this->uriFactory = $uriFactory;
         $this->streamFactory = $streamFactory;
@@ -108,12 +108,12 @@ 
         $uri = $this->getUri($server);
 
         $request = $this->requestFactory->createServerRequest($method, $uri, $server);
-        foreach ($headers as $name => $value) {
+        foreach ($headers as $name => $value){
             $request = $request->withAddedHeader($name, $value);
         }
 
         $protocol = '1.1';
-        if (!empty($_SERVER['SERVER_PROTOCOL'])) {
+        if (!empty($_SERVER['SERVER_PROTOCOL'])){
             $protocol = str_replace('HTTP/', '', $_SERVER['SERVER_PROTOCOL']);
         }
 
@@ -124,15 +124,15 @@ 
             ->withCookieParams($cookies)
             ->withUploadedFiles($this->getUploadedFilesArray($files));
 
-        if ($body === null) {
+        if ($body === null){
             return $request;
         }
 
-        if (\is_resource($body)) {
+        if (\is_resource($body)){
             $body = $this->streamFactory->createStreamFromResource($body);
-        } elseif (\is_string($body)) {
+        } elseif (\is_string($body)){
             $body = $this->streamFactory->createStream($body);
-        } elseif (!$body instanceof StreamInterface) {
+        } elseif (!$body instanceof StreamInterface){
             throw new \InvalidArgumentException(
                 'Body parameter for ServerRequestFactory::createFromParameters() '
                 . 'must be instance of StreamInterface, resource or null.'
@@ -145,29 +145,29 @@ 
     private function getUri(array $server): UriInterface
     {
         $uri = $this->uriFactory->createUri();
-        if (isset($server['HTTPS'])) {
+        if (isset($server['HTTPS'])){
             $uri = $uri->withScheme($server['HTTPS'] === 'on' ? 'https' : 'http');
         }
 
-        if (isset($server['HTTP_HOST'])) {
-            if (1 === \preg_match('/^(.+)\:(\d+)$/', $server['HTTP_HOST'], $matches)) {
+        if (isset($server['HTTP_HOST'])){
+            if (1 === \preg_match('/^(.+)\:(\d+)$/', $server['HTTP_HOST'], $matches)){
                 $uri = $uri->withHost($matches[1])->withPort($matches[2]);
-            } else {
+            }else{
                 $uri = $uri->withHost($server['HTTP_HOST']);
             }
-        } elseif (isset($server['SERVER_NAME'])) {
+        } elseif (isset($server['SERVER_NAME'])){
             $uri = $uri->withHost($server['SERVER_NAME']);
         }
 
-        if (isset($server['SERVER_PORT'])) {
+        if (isset($server['SERVER_PORT'])){
             $uri = $uri->withPort($server['SERVER_PORT']);
         }
 
-        if (isset($server['REQUEST_URI'])) {
+        if (isset($server['REQUEST_URI'])){
             $uri = $uri->withPath(\explode('?', $server['REQUEST_URI'])[0]);
         }
 
-        if (isset($server['QUERY_STRING'])) {
+        if (isset($server['QUERY_STRING'])){
             $uri = $uri->withQuery($server['QUERY_STRING']);
         }
 
@@ -176,12 +176,12 @@ 
 
     private static function getHeadersFromGlobals(): array
     {
-        if (\function_exists('getallheaders')) {
+        if (\function_exists('getallheaders')){
             $headers = getallheaders();
-        } else {
+        }else{
             $headers = [];
-            foreach ($_SERVER as $name => $value) {
-                if (strncmp($name, 'HTTP_', 5) === 0) {
+            foreach ($_SERVER as $name => $value){
+                if (strncmp($name, 'HTTP_', 5) === 0){
                     $name = str_replace(' ', '-', ucwords(strtolower(str_replace('_', ' ', substr($name, 5)))));
                     $headers[$name] = $value;
                 }
@@ -194,7 +194,7 @@ 
     private function getUploadedFilesArray(array $filesArray): array
     {
         $files = [];
-        foreach ($filesArray as $class => $info) {
+        foreach ($filesArray as $class => $info){
             $files[$class] = [];
             $this->populateUploadedFileRecursive(
                 $files[$class],
@@ -222,8 +222,8 @@ 
      */
     private function populateUploadedFileRecursive(&$files, $names, $tempNames, $types, $sizes, $errors): void
     {
-        if (\is_array($names)) {
-            foreach ($names as $i => $name) {
+        if (\is_array($names)){
+            foreach ($names as $i => $name){
                 $files[$i] = [];
                 $this->populateUploadedFileRecursive(
                     $files[$i],
@@ -234,10 +234,10 @@ 
                     $errors[$i]
                 );
             }
-        } else {
-            try {
+        }else{
+            try{
                 $stream = $this->streamFactory->createStreamFromFile($tempNames);
-            } catch (\RuntimeException $e) {
+            }catch (\RuntimeException $e){
                 $stream = $this->streamFactory->createStream();
             }
 

Braces +55 added lines, -24 removed lines

@@ -108,12 +108,14 @@ 
         $uri = $this->getUri($server);
 
         $request = $this->requestFactory->createServerRequest($method, $uri, $server);
-        foreach ($headers as $name => $value) {
+        foreach ($headers as $name => $value)
+        {
             $request = $request->withAddedHeader($name, $value);
         }
 
         $protocol = '1.1';
-        if (!empty($_SERVER['SERVER_PROTOCOL'])) {
+        if (!empty($_SERVER['SERVER_PROTOCOL']))
+        {
             $protocol = str_replace('HTTP/', '', $_SERVER['SERVER_PROTOCOL']);
         }
 
@@ -124,15 +126,21 @@ 
             ->withCookieParams($cookies)
             ->withUploadedFiles($this->getUploadedFilesArray($files));
 
-        if ($body === null) {
+        if ($body === null)
+        {
             return $request;
         }
 
-        if (\is_resource($body)) {
+        if (\is_resource($body))
+        {
             $body = $this->streamFactory->createStreamFromResource($body);
-        } elseif (\is_string($body)) {
+        }
+        elseif (\is_string($body))
+        {
             $body = $this->streamFactory->createStream($body);
-        } elseif (!$body instanceof StreamInterface) {
+        }
+        elseif (!$body instanceof StreamInterface)
+        {
             throw new \InvalidArgumentException(
                 'Body parameter for ServerRequestFactory::createFromParameters() '
                 . 'must be instance of StreamInterface, resource or null.'
@@ -145,29 +153,39 @@ 
     private function getUri(array $server): UriInterface
     {
         $uri = $this->uriFactory->createUri();
-        if (isset($server['HTTPS'])) {
+        if (isset($server['HTTPS']))
+        {
             $uri = $uri->withScheme($server['HTTPS'] === 'on' ? 'https' : 'http');
         }
 
-        if (isset($server['HTTP_HOST'])) {
-            if (1 === \preg_match('/^(.+)\:(\d+)$/', $server['HTTP_HOST'], $matches)) {
+        if (isset($server['HTTP_HOST']))
+        {
+            if (1 === \preg_match('/^(.+)\:(\d+)$/', $server['HTTP_HOST'], $matches))
+            {
                 $uri = $uri->withHost($matches[1])->withPort($matches[2]);
-            } else {
+            }
+            else
+            {
                 $uri = $uri->withHost($server['HTTP_HOST']);
             }
-        } elseif (isset($server['SERVER_NAME'])) {
+        }
+        elseif (isset($server['SERVER_NAME']))
+        {
             $uri = $uri->withHost($server['SERVER_NAME']);
         }
 
-        if (isset($server['SERVER_PORT'])) {
+        if (isset($server['SERVER_PORT']))
+        {
             $uri = $uri->withPort($server['SERVER_PORT']);
         }
 
-        if (isset($server['REQUEST_URI'])) {
+        if (isset($server['REQUEST_URI']))
+        {
             $uri = $uri->withPath(\explode('?', $server['REQUEST_URI'])[0]);
         }
 
-        if (isset($server['QUERY_STRING'])) {
+        if (isset($server['QUERY_STRING']))
+        {
             $uri = $uri->withQuery($server['QUERY_STRING']);
         }
 
@@ -176,12 +194,17 @@ 
 
     private static function getHeadersFromGlobals(): array
     {
-        if (\function_exists('getallheaders')) {
+        if (\function_exists('getallheaders'))
+        {
             $headers = getallheaders();
-        } else {
+        }
+        else
+        {
             $headers = [];
-            foreach ($_SERVER as $name => $value) {
-                if (strncmp($name, 'HTTP_', 5) === 0) {
+            foreach ($_SERVER as $name => $value)
+            {
+                if (strncmp($name, 'HTTP_', 5) === 0)
+                {
                     $name = str_replace(' ', '-', ucwords(strtolower(str_replace('_', ' ', substr($name, 5)))));
                     $headers[$name] = $value;
                 }
@@ -194,7 +217,8 @@ 
     private function getUploadedFilesArray(array $filesArray): array
     {
         $files = [];
-        foreach ($filesArray as $class => $info) {
+        foreach ($filesArray as $class => $info)
+        {
             $files[$class] = [];
             $this->populateUploadedFileRecursive(
                 $files[$class],
@@ -222,8 +246,10 @@ 
      */
     private function populateUploadedFileRecursive(&$files, $names, $tempNames, $types, $sizes, $errors): void
     {
-        if (\is_array($names)) {
-            foreach ($names as $i => $name) {
+        if (\is_array($names))
+        {
+            foreach ($names as $i => $name)
+            {
                 $files[$i] = [];
                 $this->populateUploadedFileRecursive(
                     $files[$i],
@@ -234,10 +260,15 @@ 
                     $errors[$i]
                 );
             }
-        } else {
-            try {
+        }
+        else
+        {
+            try
+            {
                 $stream = $this->streamFactory->createStreamFromFile($tempNames);
-            } catch (\RuntimeException $e) {
+            }
+            catch (\RuntimeException $e)
+            {
                 $stream = $this->streamFactory->createStream();
             }
 

src/Models/src/AbstractEntity.php

Spacing +28 added lines, -28 removed lines

@@ -67,7 +67,7 @@ 
      */
     public function hasField(string $name): bool
     {
-        if (!array_key_exists($name, $this->fields)) {
+        if (!array_key_exists($name, $this->fields)){
             return false;
         }
 
@@ -83,14 +83,14 @@ 
      */
     public function setField(string $name, $value, bool $filter = true): void
     {
-        if ($value instanceof ValueInterface) {
+        if ($value instanceof ValueInterface){
             //In case of non scalar values filters must be bypassed (check accessor compatibility?)
             $this->fields[$name] = clone $value;
 
             return;
         }
 
-        if (!$filter || (is_null($value) && $this->isNullable($name))) {
+        if (!$filter || (is_null($value) && $this->isNullable($name))){
             //Bypassing all filters
             $this->fields[$name] = $value;
 
@@ -100,10 +100,10 @@ 
         //Checking if field have accessor
         $accessor = $this->getMutator($name, ModelSchema::MUTATOR_ACCESSOR);
 
-        if ($accessor !== null) {
+        if ($accessor !== null){
             //Setting value thought associated accessor
             $this->thoughValue($accessor, $name, $value);
-        } else {
+        }else{
             //Setting value thought setter filter (if any)
             $this->setMutated($name, $value);
         }
@@ -120,7 +120,7 @@ 
     {
         $value = $this->hasField($name) ? $this->fields[$name] : $default;
 
-        if ($value instanceof ValueInterface || (is_null($value) && $this->isNullable($name))) {
+        if ($value instanceof ValueInterface || (is_null($value) && $this->isNullable($name))){
             //Direct access to value when value is accessor or null and declared as nullable
             return $value;
         }
@@ -128,7 +128,7 @@ 
         //Checking if field have accessor (decorator)
         $accessor = $this->getMutator($name, ModelSchema::MUTATOR_ACCESSOR);
 
-        if (!empty($accessor)) {
+        if (!empty($accessor)){
             return $this->fields[$name] = $this->createValue($accessor, $name, $value);
         }
 
@@ -148,15 +148,15 @@ 
      */
     public function setFields(iterable $fields = [], bool $all = false)
     {
-        if (!\is_array($fields) && !$fields instanceof \Traversable) {
+        if (!\is_array($fields) && !$fields instanceof \Traversable){
             return $this;
         }
 
-        foreach ($fields as $name => $value) {
-            if ($all || $this->isFillable($name)) {
-                try {
+        foreach ($fields as $name => $value){
+            if ($all || $this->isFillable($name)){
+                try{
                     $this->setField($name, $value, true);
-                } catch (AccessExceptionInterface $e) {
+                }catch (AccessExceptionInterface $e){
                     // We are suppressing field setting exceptions
                 }
             }
@@ -177,7 +177,7 @@ 
     public function getFields(bool $filter = true): array
     {
         $result = [];
-        foreach ($this->fields as $name => $_) {
+        foreach ($this->fields as $name => $_){
             $result[$name] = $this->getField($name, null, $filter);
         }
 
@@ -242,10 +242,10 @@ 
     public function getValue(): array
     {
         $result = [];
-        foreach ($this->fields as $field => $value) {
-            if ($value instanceof ValueInterface) {
+        foreach ($this->fields as $field => $value){
+            if ($value instanceof ValueInterface){
                 $result[$field] = $value->getValue();
-            } else {
+            }else{
                 $result[$field] = $value;
             }
         }
@@ -327,9 +327,9 @@ 
         $value,
         array $context = []
     ): ValueInterface {
-        if (!is_string($type) || !class_exists($type)) {
+        if (!is_string($type) || !class_exists($type)){
             throw new EntityException(
-                "Unable to create accessor for field `{$name}` in " . static::class
+                "Unable to create accessor for field `{$name}` in ".static::class
             );
         }
 
@@ -347,10 +347,10 @@ 
     {
         $getter = $this->getMutator($name, ModelSchema::MUTATOR_GETTER);
 
-        if ($filter && !empty($getter)) {
-            try {
+        if ($filter && !empty($getter)){
+            try{
                 return call_user_func($getter, $value);
-            } catch (\Exception $e) {
+            }catch (\Exception $e){
                 //Trying to filter null value, every filter must support it
                 return call_user_func($getter, null);
             }
@@ -368,13 +368,13 @@ 
     {
         $setter = $this->getMutator($name, ModelSchema::MUTATOR_SETTER);
 
-        if (!empty($setter)) {
-            try {
+        if (!empty($setter)){
+            try{
                 $this->fields[$name] = call_user_func($setter, $value);
-            } catch (\Exception $e) {
+            }catch (\Exception $e){
                 //Exceptional situation, we are choosing to keep original field value
             }
-        } else {
+        }else{
             $this->fields[$name] = $value;
         }
     }
@@ -387,13 +387,13 @@ 
      */
     private function thoughValue($type, string $name, $value): void
     {
-        if (array_key_exists($name, $this->fields)) {
+        if (array_key_exists($name, $this->fields)){
             $field = $this->fields[$name];
-        } else {
+        }else{
             $field = null;
         }
 
-        if (empty($field) || !($field instanceof ValueInterface)) {
+        if (empty($field) || !($field instanceof ValueInterface)){
             //New field representation
             $field = $this->createValue($type, $name, $value);
 

Braces +61 added lines, -27 removed lines

@@ -67,7 +67,8 @@ 
      */
     public function hasField(string $name): bool
     {
-        if (!array_key_exists($name, $this->fields)) {
+        if (!array_key_exists($name, $this->fields))
+        {
             return false;
         }
 
@@ -83,14 +84,16 @@ 
      */
     public function setField(string $name, $value, bool $filter = true): void
     {
-        if ($value instanceof ValueInterface) {
+        if ($value instanceof ValueInterface)
+        {
             //In case of non scalar values filters must be bypassed (check accessor compatibility?)
             $this->fields[$name] = clone $value;
 
             return;
         }
 
-        if (!$filter || (is_null($value) && $this->isNullable($name))) {
+        if (!$filter || (is_null($value) && $this->isNullable($name)))
+        {
             //Bypassing all filters
             $this->fields[$name] = $value;
 
@@ -100,10 +103,13 @@ 
         //Checking if field have accessor
         $accessor = $this->getMutator($name, ModelSchema::MUTATOR_ACCESSOR);
 
-        if ($accessor !== null) {
+        if ($accessor !== null)
+        {
             //Setting value thought associated accessor
             $this->thoughValue($accessor, $name, $value);
-        } else {
+        }
+        else
+        {
             //Setting value thought setter filter (if any)
             $this->setMutated($name, $value);
         }
@@ -120,7 +126,8 @@ 
     {
         $value = $this->hasField($name) ? $this->fields[$name] : $default;
 
-        if ($value instanceof ValueInterface || (is_null($value) && $this->isNullable($name))) {
+        if ($value instanceof ValueInterface || (is_null($value) && $this->isNullable($name)))
+        {
             //Direct access to value when value is accessor or null and declared as nullable
             return $value;
         }
@@ -128,7 +135,8 @@ 
         //Checking if field have accessor (decorator)
         $accessor = $this->getMutator($name, ModelSchema::MUTATOR_ACCESSOR);
 
-        if (!empty($accessor)) {
+        if (!empty($accessor))
+        {
             return $this->fields[$name] = $this->createValue($accessor, $name, $value);
         }
 
@@ -148,15 +156,21 @@ 
      */
     public function setFields(iterable $fields = [], bool $all = false)
     {
-        if (!\is_array($fields) && !$fields instanceof \Traversable) {
+        if (!\is_array($fields) && !$fields instanceof \Traversable)
+        {
             return $this;
         }
 
-        foreach ($fields as $name => $value) {
-            if ($all || $this->isFillable($name)) {
-                try {
+        foreach ($fields as $name => $value)
+        {
+            if ($all || $this->isFillable($name))
+            {
+                try
+                {
                     $this->setField($name, $value, true);
-                } catch (AccessExceptionInterface $e) {
+                }
+                catch (AccessExceptionInterface $e)
+                {
                     // We are suppressing field setting exceptions
                 }
             }
@@ -177,7 +191,8 @@ 
     public function getFields(bool $filter = true): array
     {
         $result = [];
-        foreach ($this->fields as $name => $_) {
+        foreach ($this->fields as $name => $_)
+        {
             $result[$name] = $this->getField($name, null, $filter);
         }
 
@@ -242,10 +257,14 @@ 
     public function getValue(): array
     {
         $result = [];
-        foreach ($this->fields as $field => $value) {
-            if ($value instanceof ValueInterface) {
+        foreach ($this->fields as $field => $value)
+        {
+            if ($value instanceof ValueInterface)
+            {
                 $result[$field] = $value->getValue();
-            } else {
+            }
+            else
+            {
                 $result[$field] = $value;
             }
         }
@@ -327,7 +346,8 @@ 
         $value,
         array $context = []
     ): ValueInterface {
-        if (!is_string($type) || !class_exists($type)) {
+        if (!is_string($type) || !class_exists($type))
+        {
             throw new EntityException(
                 "Unable to create accessor for field `{$name}` in " . static::class
             );
@@ -347,10 +367,14 @@ 
     {
         $getter = $this->getMutator($name, ModelSchema::MUTATOR_GETTER);
 
-        if ($filter && !empty($getter)) {
-            try {
+        if ($filter && !empty($getter))
+        {
+            try
+            {
                 return call_user_func($getter, $value);
-            } catch (\Exception $e) {
+            }
+            catch (\Exception $e)
+            {
                 //Trying to filter null value, every filter must support it
                 return call_user_func($getter, null);
             }
@@ -368,13 +392,19 @@ 
     {
         $setter = $this->getMutator($name, ModelSchema::MUTATOR_SETTER);
 
-        if (!empty($setter)) {
-            try {
+        if (!empty($setter))
+        {
+            try
+            {
                 $this->fields[$name] = call_user_func($setter, $value);
-            } catch (\Exception $e) {
+            }
+            catch (\Exception $e)
+            {
                 //Exceptional situation, we are choosing to keep original field value
             }
-        } else {
+        }
+        else
+        {
             $this->fields[$name] = $value;
         }
     }
@@ -387,13 +417,17 @@ 
      */
     private function thoughValue($type, string $name, $value): void
     {
-        if (array_key_exists($name, $this->fields)) {
+        if (array_key_exists($name, $this->fields))
+        {
             $field = $this->fields[$name];
-        } else {
+        }
+        else
+        {
             $field = null;
         }
 
-        if (empty($field) || !($field instanceof ValueInterface)) {
+        if (empty($field) || !($field instanceof ValueInterface))
+        {
             //New field representation
             $field = $this->createValue($type, $name, $value);