spiral / framework

src/Router/src/CoreHandler.php

Spacing +17 added lines, -17 removed lines

@@ -52,7 +52,7 @@ 
         CoreInterface $core,
         ScopeInterface $scope,
         ResponseFactoryInterface $responseFactory
-    ) {
+    ){
         $this->core = $core;
         $this->scope = $scope;
         $this->responseFactory = $responseFactory;
@@ -90,7 +90,7 @@ 
      */
     public function handle(Request $request): Response
     {
-        if ($this->controller === null) {
+        if ($this->controller === null){
             throw new HandlerException('Controller and action pair is not set');
         }
 
@@ -100,7 +100,7 @@ 
         $output = $result = null;
 
         $response = $this->responseFactory->createResponse(200);
-        try {
+        try{
             // run the core withing PSR-7 Request/Response scope
             $result = $this->scope->runScope(
                 [
@@ -113,29 +113,29 @@ 
                     $this->parameters
                 )
             );
-        } catch (ControllerException $e) {
+        }catch (ControllerException $e){
             ob_get_clean();
             throw $this->mapException($e);
-        } catch (Throwable $e) {
+        }catch (Throwable $e){
             ob_get_clean();
             throw $e;
-        } finally {
-            while (ob_get_level() > $outputLevel + 1) {
-                $output = ob_get_clean() . $output;
+        }finally{
+            while (ob_get_level() > $outputLevel + 1){
+                $output = ob_get_clean().$output;
             }
         }
 
         return $this->wrapResponse(
             $response,
             $result,
-            ob_get_clean() . $output
+            ob_get_clean().$output
         );
     }
 
     private function getAction(Request $request): string
     {
-        if ($this->verbActions) {
-            return strtolower($request->getMethod()) . ucfirst($this->action);
+        if ($this->verbActions){
+            return strtolower($request->getMethod()).ucfirst($this->action);
         }
 
         return $this->action;
@@ -150,21 +150,21 @@ 
      */
     private function wrapResponse(Response $response, $result = null, string $output = ''): Response
     {
-        if ($result instanceof Response) {
-            if ($output !== '' && $result->getBody()->isWritable()) {
+        if ($result instanceof Response){
+            if ($output !== '' && $result->getBody()->isWritable()){
                 $result->getBody()->write($output);
             }
 
             return $result;
         }
 
-        if ($result instanceof Generator) {
+        if ($result instanceof Generator){
             return $response->withBody(new GeneratorStream($result));
         }
 
-        if (\is_array($result) || $result instanceof JsonSerializable) {
+        if (\is_array($result) || $result instanceof JsonSerializable){
             $response = $this->writeJson($response, $result);
-        } else {
+        }else{
             $response->getBody()->write((string)$result);
         }
 
@@ -179,7 +179,7 @@ 
      */
     private function mapException(ControllerException $exception): ClientException
     {
-        switch ($exception->getCode()) {
+        switch ($exception->getCode()){
             case ControllerException::BAD_ACTION:
             case ControllerException::NOT_FOUND:
                 return new NotFoundException($exception->getMessage());

Braces +30 added lines, -13 removed lines

@@ -90,7 +90,8 @@ 
      */
     public function handle(Request $request): Response
     {
-        if ($this->controller === null) {
+        if ($this->controller === null)
+        {
             throw new HandlerException('Controller and action pair is not set');
         }
 
@@ -100,7 +101,8 @@ 
         $output = $result = null;
 
         $response = $this->responseFactory->createResponse(200);
-        try {
+        try
+        {
             // run the core withing PSR-7 Request/Response scope
             $result = $this->scope->runScope(
                 [
@@ -113,14 +115,21 @@ 
                     $this->parameters
                 )
             );
-        } catch (ControllerException $e) {
+        }
+        catch (ControllerException $e)
+        {
             ob_get_clean();
             throw $this->mapException($e);
-        } catch (Throwable $e) {
+        }
+        catch (Throwable $e)
+        {
             ob_get_clean();
             throw $e;
-        } finally {
-            while (ob_get_level() > $outputLevel + 1) {
+        }
+        finally
+        {
+            while (ob_get_level() > $outputLevel + 1)
+            {
                 $output = ob_get_clean() . $output;
             }
         }
@@ -134,7 +143,8 @@ 
 
     private function getAction(Request $request): string
     {
-        if ($this->verbActions) {
+        if ($this->verbActions)
+        {
             return strtolower($request->getMethod()) . ucfirst($this->action);
         }
 
@@ -150,21 +160,27 @@ 
      */
     private function wrapResponse(Response $response, $result = null, string $output = ''): Response
     {
-        if ($result instanceof Response) {
-            if ($output !== '' && $result->getBody()->isWritable()) {
+        if ($result instanceof Response)
+        {
+            if ($output !== '' && $result->getBody()->isWritable())
+            {
                 $result->getBody()->write($output);
             }
 
             return $result;
         }
 
-        if ($result instanceof Generator) {
+        if ($result instanceof Generator)
+        {
             return $response->withBody(new GeneratorStream($result));
         }
 
-        if (\is_array($result) || $result instanceof JsonSerializable) {
+        if (\is_array($result) || $result instanceof JsonSerializable)
+        {
             $response = $this->writeJson($response, $result);
-        } else {
+        }
+        else
+        {
             $response->getBody()->write((string)$result);
         }
 
@@ -179,7 +195,8 @@ 
      */
     private function mapException(ControllerException $exception): ClientException
     {
-        switch ($exception->getCode()) {
+        switch ($exception->getCode())
+        {
             case ControllerException::BAD_ACTION:
             case ControllerException::NOT_FOUND:
                 return new NotFoundException($exception->getMessage());

src/Router/src/UriHandler.php

Spacing +31 added lines, -31 removed lines

@@ -34,7 +34,7 @@ 
         'integer' => '\d+',
         'uuid'    => '[0-9a-fA-F]{8}\-[0-9a-fA-F]{4}\-[0-9a-fA-F]{4}\-[0-9a-fA-F]{4}\-[0-9a-fA-F]{12}',
     ];
-    private const URI_FIXERS       = [
+    private const URI_FIXERS = [
         '[]'  => '',
         '[/]' => '',
         '['   => '',
@@ -70,7 +70,7 @@ 
     public function __construct(
         UriFactoryInterface $uriFactory,
         SlugifyInterface $slugify = null
-    ) {
+    ){
         $this->uriFactory = $uriFactory;
         $this->slugify = $slugify ?? new Slugify();
     }
@@ -133,12 +133,12 @@ 
      */
     public function match(UriInterface $uri, array $defaults): ?array
     {
-        if (!$this->isCompiled()) {
+        if (!$this->isCompiled()){
             $this->compile();
         }
 
         $matches = [];
-        if (!preg_match($this->compiled, $this->fetchTarget($uri), $matches)) {
+        if (!preg_match($this->compiled, $this->fetchTarget($uri), $matches)){
             return null;
         }
 
@@ -154,7 +154,7 @@ 
      */
     public function uri($parameters = [], array $defaults = []): UriInterface
     {
-        if (!$this->isCompiled()) {
+        if (!$this->isCompiled()){
             $this->compile();
         }
 
@@ -164,8 +164,8 @@ 
             $this->fetchOptions($parameters, $query)
         );
 
-        foreach ($this->constrains as $key => $_) {
-            if (empty($parameters[$key])) {
+        foreach ($this->constrains as $key => $_){
+            if (empty($parameters[$key])){
                 throw new UriHandlerException("Unable to generate Uri, parameter `{$key}` is missing");
             }
         }
@@ -174,7 +174,7 @@ 
         $path = $this->interpolate($this->template, $parameters);
 
         //Uri with added prefix
-        $uri = $this->uriFactory->createUri(($this->matchHost ? '' : $this->prefix) . trim($path, '/'));
+        $uri = $this->uriFactory->createUri(($this->matchHost ? '' : $this->prefix).trim($path, '/'));
 
         return empty($query) ? $uri : $uri->withQuery(http_build_query($query));
     }
@@ -190,18 +190,18 @@ 
         $allowed = array_keys($this->options);
 
         $result = [];
-        foreach ($parameters as $key => $parameter) {
-            if (is_numeric($key) && isset($allowed[$key])) {
+        foreach ($parameters as $key => $parameter){
+            if (is_numeric($key) && isset($allowed[$key])){
                 // this segment fetched keys from given parameters either by name or by position
                 $key = $allowed[$key];
-            } elseif (!array_key_exists($key, $this->options) && is_array($parameters)) {
+            } elseif (!array_key_exists($key, $this->options) && is_array($parameters)){
                 // all additional parameters given in array form can be glued to query string
                 $query[$key] = $parameter;
                 continue;
             }
 
             //String must be normalized here
-            if (is_string($parameter) && !preg_match('/^[a-z\-_0-9]+$/i', $parameter)) {
+            if (is_string($parameter) && !preg_match('/^[a-z\-_0-9]+$/i', $parameter)){
                 $result[$key] = $this->slugify->slugify($parameter);
                 continue;
             }
@@ -219,15 +219,15 @@ 
     {
         $path = $uri->getPath();
 
-        if (empty($path) || $path[0] !== '/') {
-            $path = '/' . $path;
+        if (empty($path) || $path[0] !== '/'){
+            $path = '/'.$path;
         }
 
-        if ($this->matchHost) {
-            $uriString = $uri->getHost() . $path;
-        } else {
+        if ($this->matchHost){
+            $uriString = $uri->getHost().$path;
+        }else{
             $uriString = substr($path, strlen($this->prefix));
-            if ($uriString === false) {
+            if ($uriString === false){
                 $uriString = '';
             }
         }
@@ -240,7 +240,7 @@ 
      */
     private function compile(): void
     {
-        if ($this->pattern === null) {
+        if ($this->pattern === null){
             throw new UriHandlerException('Unable to compile UriHandler, pattern is not set');
         }
 
@@ -248,14 +248,14 @@ 
         $pattern = rtrim(ltrim($this->pattern, ':/'), '/');
 
         // correct [/ first occurrence]
-        if (strpos($pattern, '[/') === 0) {
-            $pattern = '[' . substr($pattern, 2);
+        if (strpos($pattern, '[/') === 0){
+            $pattern = '['.substr($pattern, 2);
         }
 
-        if (preg_match_all('/<(\w+):?(.*?)?>/', $pattern, $matches)) {
+        if (preg_match_all('/<(\w+):?(.*?)?>/', $pattern, $matches)){
             $variables = array_combine($matches[1], $matches[2]);
 
-            foreach ($variables as $key => $segment) {
+            foreach ($variables as $key => $segment){
                 $segment = $this->prepareSegment($key, $segment);
                 $replaces["<$key>"] = "(?P<$key>$segment)";
                 $options[] = $key;
@@ -265,13 +265,13 @@ 
         $template = preg_replace('/<(\w+):?.*?>/', '<\1>', $pattern);
         $options = array_fill_keys($options, null);
 
-        foreach ($this->constrains as $key => $value) {
-            if ($value instanceof Autofill) {
+        foreach ($this->constrains as $key => $value){
+            if ($value instanceof Autofill){
                 // only forces value replacement, not required to be presented as parameter
                 continue;
             }
 
-            if (!array_key_exists($key, $options) && !isset($this->defaults[$key])) {
+            if (!array_key_exists($key, $options) && !isset($this->defaults[$key])){
                 throw new ConstrainException(
                     sprintf(
                         'Route `%s` does not define routing parameter `<%s>`.',
@@ -282,7 +282,7 @@ 
             }
         }
 
-        $this->compiled = '/^' . strtr($template, $replaces + self::PATTERN_REPLACES) . '$/iu';
+        $this->compiled = '/^'.strtr($template, $replaces + self::PATTERN_REPLACES).'$/iu';
         $this->template = stripslashes(str_replace('?', '', $template));
         $this->options = $options;
     }
@@ -293,7 +293,7 @@ 
     private function interpolate(string $string, array $values): string
     {
         $replaces = [];
-        foreach ($values as $key => $value) {
+        foreach ($values as $key => $value){
             $value = (is_array($value) || $value instanceof Closure) ? '' : $value;
             $replaces["<{$key}>"] = is_object($value) ? (string)$value : $value;
         }
@@ -306,15 +306,15 @@ 
      */
     private function prepareSegment(string $name, string $segment): string
     {
-        if ($segment !== '') {
+        if ($segment !== ''){
             return self::SEGMENT_TYPES[$segment] ?? $segment;
         }
 
-        if (!isset($this->constrains[$name])) {
+        if (!isset($this->constrains[$name])){
             return self::DEFAULT_SEGMENT;
         }
 
-        if (is_array($this->constrains[$name])) {
+        if (is_array($this->constrains[$name])){
             $values = array_map([$this, 'filterSegment'], $this->constrains[$name]);
 
             return implode('|', $values);

Braces +50 added lines, -24 removed lines

@@ -133,12 +133,14 @@ 
      */
     public function match(UriInterface $uri, array $defaults): ?array
     {
-        if (!$this->isCompiled()) {
+        if (!$this->isCompiled())
+        {
             $this->compile();
         }
 
         $matches = [];
-        if (!preg_match($this->compiled, $this->fetchTarget($uri), $matches)) {
+        if (!preg_match($this->compiled, $this->fetchTarget($uri), $matches))
+        {
             return null;
         }
 
@@ -154,7 +156,8 @@ 
      */
     public function uri($parameters = [], array $defaults = []): UriInterface
     {
-        if (!$this->isCompiled()) {
+        if (!$this->isCompiled())
+        {
             $this->compile();
         }
 
@@ -164,8 +167,10 @@ 
             $this->fetchOptions($parameters, $query)
         );
 
-        foreach ($this->constrains as $key => $_) {
-            if (empty($parameters[$key])) {
+        foreach ($this->constrains as $key => $_)
+        {
+            if (empty($parameters[$key]))
+            {
                 throw new UriHandlerException("Unable to generate Uri, parameter `{$key}` is missing");
             }
         }
@@ -190,18 +195,23 @@ 
         $allowed = array_keys($this->options);
 
         $result = [];
-        foreach ($parameters as $key => $parameter) {
-            if (is_numeric($key) && isset($allowed[$key])) {
+        foreach ($parameters as $key => $parameter)
+        {
+            if (is_numeric($key) && isset($allowed[$key]))
+            {
                 // this segment fetched keys from given parameters either by name or by position
                 $key = $allowed[$key];
-            } elseif (!array_key_exists($key, $this->options) && is_array($parameters)) {
+            }
+            elseif (!array_key_exists($key, $this->options) && is_array($parameters))
+            {
                 // all additional parameters given in array form can be glued to query string
                 $query[$key] = $parameter;
                 continue;
             }
 
             //String must be normalized here
-            if (is_string($parameter) && !preg_match('/^[a-z\-_0-9]+$/i', $parameter)) {
+            if (is_string($parameter) && !preg_match('/^[a-z\-_0-9]+$/i', $parameter))
+            {
                 $result[$key] = $this->slugify->slugify($parameter);
                 continue;
             }
@@ -219,15 +229,20 @@ 
     {
         $path = $uri->getPath();
 
-        if (empty($path) || $path[0] !== '/') {
+        if (empty($path) || $path[0] !== '/')
+        {
             $path = '/' . $path;
         }
 
-        if ($this->matchHost) {
+        if ($this->matchHost)
+        {
             $uriString = $uri->getHost() . $path;
-        } else {
+        }
+        else
+        {
             $uriString = substr($path, strlen($this->prefix));
-            if ($uriString === false) {
+            if ($uriString === false)
+            {
                 $uriString = '';
             }
         }
@@ -240,7 +255,8 @@ 
      */
     private function compile(): void
     {
-        if ($this->pattern === null) {
+        if ($this->pattern === null)
+        {
             throw new UriHandlerException('Unable to compile UriHandler, pattern is not set');
         }
 
@@ -248,14 +264,17 @@ 
         $pattern = rtrim(ltrim($this->pattern, ':/'), '/');
 
         // correct [/ first occurrence]
-        if (strpos($pattern, '[/') === 0) {
+        if (strpos($pattern, '[/') === 0)
+        {
             $pattern = '[' . substr($pattern, 2);
         }
 
-        if (preg_match_all('/<(\w+):?(.*?)?>/', $pattern, $matches)) {
+        if (preg_match_all('/<(\w+):?(.*?)?>/', $pattern, $matches))
+        {
             $variables = array_combine($matches[1], $matches[2]);
 
-            foreach ($variables as $key => $segment) {
+            foreach ($variables as $key => $segment)
+            {
                 $segment = $this->prepareSegment($key, $segment);
                 $replaces["<$key>"] = "(?P<$key>$segment)";
                 $options[] = $key;
@@ -265,13 +284,16 @@ 
         $template = preg_replace('/<(\w+):?.*?>/', '<\1>', $pattern);
         $options = array_fill_keys($options, null);
 
-        foreach ($this->constrains as $key => $value) {
-            if ($value instanceof Autofill) {
+        foreach ($this->constrains as $key => $value)
+        {
+            if ($value instanceof Autofill)
+            {
                 // only forces value replacement, not required to be presented as parameter
                 continue;
             }
 
-            if (!array_key_exists($key, $options) && !isset($this->defaults[$key])) {
+            if (!array_key_exists($key, $options) && !isset($this->defaults[$key]))
+            {
                 throw new ConstrainException(
                     sprintf(
                         'Route `%s` does not define routing parameter `<%s>`.',
@@ -293,7 +315,8 @@ 
     private function interpolate(string $string, array $values): string
     {
         $replaces = [];
-        foreach ($values as $key => $value) {
+        foreach ($values as $key => $value)
+        {
             $value = (is_array($value) || $value instanceof Closure) ? '' : $value;
             $replaces["<{$key}>"] = is_object($value) ? (string)$value : $value;
         }
@@ -306,15 +329,18 @@ 
      */
     private function prepareSegment(string $name, string $segment): string
     {
-        if ($segment !== '') {
+        if ($segment !== '')
+        {
             return self::SEGMENT_TYPES[$segment] ?? $segment;
         }
 
-        if (!isset($this->constrains[$name])) {
+        if (!isset($this->constrains[$name]))
+        {
             return self::DEFAULT_SEGMENT;
         }
 
-        if (is_array($this->constrains[$name])) {
+        if (is_array($this->constrains[$name]))
+        {
             $values = array_map([$this, 'filterSegment'], $this->constrains[$name]);
 
             return implode('|', $values);

src/Core/src/InjectableConfig.php

Spacing +1 added lines, -1 removed lines

@@ -75,7 +75,7 @@
     #[ReturnTypeWillChange]
     public function offsetGet($offset)
     {
-        if (!$this->offsetExists($offset)) {
+        if (!$this->offsetExists($offset)){
             throw new ConfigException("Undefined configuration key '{$offset}'");
         }
 

Braces +2 added lines, -1 removed lines

@@ -75,7 +75,8 @@
     #[ReturnTypeWillChange]
     public function offsetGet($offset)
     {
-        if (!$this->offsetExists($offset)) {
+        if (!$this->offsetExists($offset))
+        {
             throw new ConfigException("Undefined configuration key '{$offset}'");
         }
 

src/Core/src/Container.php

Spacing +73 added lines, -73 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;
@@ -107,7 +107,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));
 
@@ -117,17 +117,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';
@@ -137,11 +137,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];
                 }
@@ -149,16 +149,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;
@@ -168,12 +168,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;
@@ -209,7 +209,7 @@ 
      */
     public function get($id, string $context = null)
     {
-        if ($id instanceof Autowire) {
+        if ($id instanceof Autowire){
             return $id->resolve($this);
         }
 
@@ -230,34 +230,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;
         }
@@ -271,28 +271,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]);
             }
         }
@@ -307,7 +307,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];
 
@@ -325,7 +325,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;
 
@@ -340,11 +340,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];
         }
@@ -370,18 +370,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);
             }
 
@@ -394,14 +394,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);
             }
 
@@ -461,7 +461,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));
         }
 
@@ -476,7 +476,7 @@ 
     {
         $location = $reflection->getName();
 
-        if ($reflection instanceof ReflectionMethod) {
+        if ($reflection instanceof ReflectionMethod){
             return "{$reflection->getDeclaringClass()->getName()}::{$location}()";
         }
 
@@ -492,8 +492,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);
             }
 
@@ -501,20 +501,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);
         }
     }
@@ -531,22 +531,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'",
@@ -557,7 +557,7 @@ 
                 }
 
                 $instance = $injectorInstance->createInjection($reflection, $context);
-                if (!$reflection->isInstance($instance)) {
+                if (!$reflection->isInstance($instance)){
                     throw new InjectionException(
                         \sprintf(
                             "Invalid injection response for '%s'",
@@ -565,23 +565,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();
         }
@@ -595,25 +595,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;
@@ -622,7 +622,7 @@ 
             if (
                 \interface_exists($target, true)
                 && $reflection->implementsInterface($target)
-            ) {
+            ){
                 $this->injectors[$class] = $injector;
 
                 return true;
@@ -643,9 +643,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;
             }
         }
@@ -663,18 +663,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

@@ -98,7 +98,8 @@ 
     {
         $arguments = [];
 
-        foreach ($reflection->getParameters() as $parameter) {
+        foreach ($reflection->getParameters() as $parameter)
+        {
             $type = $parameter->getType();
             $name = $parameter->getName();
             $class = null;
@@ -107,7 +108,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));
 
@@ -117,17 +119,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';
@@ -137,11 +144,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];
                 }
@@ -149,16 +160,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;
@@ -168,12 +182,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;
@@ -209,7 +227,8 @@ 
      */
     public function get($id, string $context = null)
     {
-        if ($id instanceof Autowire) {
+        if ($id instanceof Autowire)
+        {
             return $id->resolve($this);
         }
 
@@ -230,34 +249,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;
         }
@@ -271,28 +300,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]);
             }
         }
@@ -307,7 +346,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];
 
@@ -325,7 +365,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;
 
@@ -340,11 +381,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];
         }
@@ -370,18 +413,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);
             }
 
@@ -394,14 +442,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);
             }
 
@@ -461,7 +514,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));
         }
 
@@ -476,7 +530,8 @@ 
     {
         $location = $reflection->getName();
 
-        if ($reflection instanceof ReflectionMethod) {
+        if ($reflection instanceof ReflectionMethod)
+        {
             return "{$reflection->getDeclaringClass()->getName()}::{$location}()";
         }
 
@@ -492,8 +547,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);
             }
 
@@ -501,20 +558,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);
         }
     }
@@ -531,22 +592,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'",
@@ -557,7 +624,8 @@ 
                 }
 
                 $instance = $injectorInstance->createInjection($reflection, $context);
-                if (!$reflection->isInstance($instance)) {
+                if (!$reflection->isInstance($instance))
+                {
                     throw new InjectionException(
                         \sprintf(
                             "Invalid injection response for '%s'",
@@ -565,23 +633,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();
         }
@@ -595,7 +669,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;
         }
 
@@ -609,7 +684,8 @@ 
         }
 
         // check interfaces
-        foreach ($this->injectors as $target => $injector) {
+        foreach ($this->injectors as $target => $injector)
+        {
             if (
                 \class_exists($target, true)
                 && $reflection->isSubclassOf($target)
@@ -643,9 +719,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;
             }
         }
@@ -663,18 +741,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/Security/src/RuleManager.php

Spacing +16 added lines, -16 removed lines

@@ -38,11 +38,11 @@ 
      */
     public function set(string $name, $rule = null): RuleManager
     {
-        if (empty($rule)) {
+        if (empty($rule)){
             $rule = $name;
         }
 
-        if (!$this->validateRule($rule)) {
+        if (!$this->validateRule($rule)){
             throw new RuleException("Unable to set rule '{$name}', invalid rule body");
         }
 
@@ -56,7 +56,7 @@ 
      */
     public function remove(string $name): RuleManager
     {
-        if (!$this->has($name)) {
+        if (!$this->has($name)){
             throw new RuleException("Undefined rule '{$name}'");
         }
 
@@ -70,11 +70,11 @@ 
      */
     public function has(string $name): bool
     {
-        if (isset($this->rules[$name])) {
+        if (isset($this->rules[$name])){
             return true;
         }
 
-        if (class_exists($name)) {
+        if (class_exists($name)){
             //We are allowing to use class names without direct registration
             return true;
         }
@@ -88,26 +88,26 @@ 
      */
     public function get(string $name): RuleInterface
     {
-        if (!$this->has($name)) {
+        if (!$this->has($name)){
             throw new RuleException("Undefined rule '{$name}'");
         }
 
-        if (!isset($this->rules[$name])) {
+        if (!isset($this->rules[$name])){
             //Rule represented as class name
             $rule = $name;
-        } else {
+        }else{
             $rule = $this->rules[$name];
         }
 
-        if ($rule instanceof RuleInterface) {
+        if ($rule instanceof RuleInterface){
             return $rule;
         }
 
-        if (is_string($rule)) {
+        if (is_string($rule)){
             //We are expecting that rule points to
             $rule = $this->container->get($rule);
 
-            if (!$rule instanceof RuleInterface) {
+            if (!$rule instanceof RuleInterface){
                 throw new RuleException(sprintf(
                     "Rule '%s' must point to RuleInterface, '%s' given",
                     $name,
@@ -129,18 +129,18 @@ 
      */
     private function validateRule($rule): bool
     {
-        if ($rule instanceof Closure || $rule instanceof RuleInterface) {
+        if ($rule instanceof Closure || $rule instanceof RuleInterface){
             return true;
         }
 
-        if (is_array($rule)) {
+        if (is_array($rule)){
             return is_callable($rule, true);
         }
 
-        if (is_string($rule) && class_exists($rule)) {
-            try {
+        if (is_string($rule) && class_exists($rule)){
+            try{
                 $reflection = new ReflectionClass($rule);
-            } catch (ReflectionException $e) {
+            }catch (ReflectionException $e){
                 return false;
             }
 

Braces +34 added lines, -16 removed lines

@@ -38,11 +38,13 @@ 
      */
     public function set(string $name, $rule = null): RuleManager
     {
-        if (empty($rule)) {
+        if (empty($rule))
+        {
             $rule = $name;
         }
 
-        if (!$this->validateRule($rule)) {
+        if (!$this->validateRule($rule))
+        {
             throw new RuleException("Unable to set rule '{$name}', invalid rule body");
         }
 
@@ -56,7 +58,8 @@ 
      */
     public function remove(string $name): RuleManager
     {
-        if (!$this->has($name)) {
+        if (!$this->has($name))
+        {
             throw new RuleException("Undefined rule '{$name}'");
         }
 
@@ -70,11 +73,13 @@ 
      */
     public function has(string $name): bool
     {
-        if (isset($this->rules[$name])) {
+        if (isset($this->rules[$name]))
+        {
             return true;
         }
 
-        if (class_exists($name)) {
+        if (class_exists($name))
+        {
             //We are allowing to use class names without direct registration
             return true;
         }
@@ -88,26 +93,33 @@ 
      */
     public function get(string $name): RuleInterface
     {
-        if (!$this->has($name)) {
+        if (!$this->has($name))
+        {
             throw new RuleException("Undefined rule '{$name}'");
         }
 
-        if (!isset($this->rules[$name])) {
+        if (!isset($this->rules[$name]))
+        {
             //Rule represented as class name
             $rule = $name;
-        } else {
+        }
+        else
+        {
             $rule = $this->rules[$name];
         }
 
-        if ($rule instanceof RuleInterface) {
+        if ($rule instanceof RuleInterface)
+        {
             return $rule;
         }
 
-        if (is_string($rule)) {
+        if (is_string($rule))
+        {
             //We are expecting that rule points to
             $rule = $this->container->get($rule);
 
-            if (!$rule instanceof RuleInterface) {
+            if (!$rule instanceof RuleInterface)
+            {
                 throw new RuleException(sprintf(
                     "Rule '%s' must point to RuleInterface, '%s' given",
                     $name,
@@ -129,18 +141,24 @@ 
      */
     private function validateRule($rule): bool
     {
-        if ($rule instanceof Closure || $rule instanceof RuleInterface) {
+        if ($rule instanceof Closure || $rule instanceof RuleInterface)
+        {
             return true;
         }
 
-        if (is_array($rule)) {
+        if (is_array($rule))
+        {
             return is_callable($rule, true);
         }
 
-        if (is_string($rule) && class_exists($rule)) {
-            try {
+        if (is_string($rule) && class_exists($rule))
+        {
+            try
+            {
                 $reflection = new ReflectionClass($rule);
-            } catch (ReflectionException $e) {
+            }
+            catch (ReflectionException $e)
+            {
                 return false;
             }
 

src/Security/src/Traits/GuardedTrait.php

Spacing +3 added lines, -3 removed lines

@@ -27,7 +27,7 @@ 
     public function getGuard(): GuardInterface
     {
         $container = ContainerScope::getContainer();
-        if (empty($container) || !$container->has(GuardInterface::class)) {
+        if (empty($container) || !$container->has(GuardInterface::class)){
             throw new ScopeException(
                 'Unable to get `GuardInterface`, binding is missing or container scope is not set'
             );
@@ -51,9 +51,9 @@ 
      */
     protected function resolvePermission(string $permission): string
     {
-        if (defined('static::GUARD_NAMESPACE')) {
+        if (defined('static::GUARD_NAMESPACE')){
             // Yay! Isolation
-            $permission = constant(static::class . '::' . 'GUARD_NAMESPACE') . '.' . $permission;
+            $permission = constant(static::class.'::'.'GUARD_NAMESPACE').'.'.$permission;
         }
 
         return $permission;

Braces +4 added lines, -2 removed lines

@@ -27,7 +27,8 @@ 
     public function getGuard(): GuardInterface
     {
         $container = ContainerScope::getContainer();
-        if (empty($container) || !$container->has(GuardInterface::class)) {
+        if (empty($container) || !$container->has(GuardInterface::class))
+        {
             throw new ScopeException(
                 'Unable to get `GuardInterface`, binding is missing or container scope is not set'
             );
@@ -51,7 +52,8 @@ 
      */
     protected function resolvePermission(string $permission): string
     {
-        if (defined('static::GUARD_NAMESPACE')) {
+        if (defined('static::GUARD_NAMESPACE'))
+        {
             // Yay! Isolation
             $permission = constant(static::class . '::' . 'GUARD_NAMESPACE') . '.' . $permission;
         }

src/Security/src/Rule.php

Spacing +5 added lines, -5 removed lines

@@ -63,20 +63,20 @@
         $parameters = compact('actor', 'permission', 'context') + $context;
 
         //Mounting aliases
-        foreach (static::ALIASES as $target => $alias) {
+        foreach (static::ALIASES as $target => $alias){
             $parameters[$target] = $parameters[$alias];
         }
 
-        try {
+        try{
             $method = new ReflectionMethod($this, static::CHECK_METHOD);
             $method->setAccessible(true);
-        } catch (ReflectionException $e) {
+        }catch (ReflectionException $e){
             throw new RuleException($e->getMessage(), $e->getCode(), $e);
         }
 
-        try {
+        try{
             return $method->invokeArgs($this, $this->resolver->resolveArguments($method, $parameters));
-        } catch (Throwable $e) {
+        }catch (Throwable $e){
             throw new RuleException(sprintf('[%s] %s', get_class($this), $e->getMessage()), $e->getCode(), $e);
         }
     }

Braces +12 added lines, -5 removed lines

@@ -63,20 +63,27 @@
         $parameters = compact('actor', 'permission', 'context') + $context;
 
         //Mounting aliases
-        foreach (static::ALIASES as $target => $alias) {
+        foreach (static::ALIASES as $target => $alias)
+        {
             $parameters[$target] = $parameters[$alias];
         }
 
-        try {
+        try
+        {
             $method = new ReflectionMethod($this, static::CHECK_METHOD);
             $method->setAccessible(true);
-        } catch (ReflectionException $e) {
+        }
+        catch (ReflectionException $e)
+        {
             throw new RuleException($e->getMessage(), $e->getCode(), $e);
         }
 
-        try {
+        try
+        {
             return $method->invokeArgs($this, $this->resolver->resolveArguments($method, $parameters));
-        } catch (Throwable $e) {
+        }
+        catch (Throwable $e)
+        {
             throw new RuleException(sprintf('[%s] %s', get_class($this), $e->getMessage()), $e->getCode(), $e);
         }
     }

src/Storage/src/Storage.php

Spacing +7 added lines, -7 removed lines

@@ -73,7 +73,7 @@ 
     {
         $name ??= $this->default;
 
-        if (!isset($this->buckets[$name])) {
+        if (!isset($this->buckets[$name])){
             throw new InvalidArgumentException(\sprintf(self::ERROR_NOT_FOUND, $name));
         }
 
@@ -95,7 +95,7 @@ 
      */
     public function add(string $name, BucketInterface $storage, bool $overwrite = false): void
     {
-        if ($overwrite === false && isset($this->buckets[$name])) {
+        if ($overwrite === false && isset($this->buckets[$name])){
             throw new \InvalidArgumentException(\sprintf(self::ERROR_REDEFINITION, $name));
         }
 
@@ -128,22 +128,22 @@ 
         $uri = $this->uriToString($uri);
         $result = \parse_url($uri);
 
-        if ($result === false) {
+        if ($result === false){
             $message = 'URI argument must be a valid URI in "[STORAGE]://[PATH_TO_FILE]" format, but `%s` given';
             throw new InvalidArgumentException(\sprintf($message, $uri));
         }
 
-        if (!isset($result['scheme'])) {
+        if (!isset($result['scheme'])){
             $result['scheme'] = $withScheme ? $this->default : null;
         }
 
-        if (!isset($result['host'])) {
+        if (!isset($result['host'])){
             $result['host'] = '';
         }
 
         return [
             $result['scheme'] ?? null,
-            $result['host'] . \rtrim($result['path'] ?? '', '/'),
+            $result['host'].\rtrim($result['path'] ?? '', '/'),
         ];
     }
 
@@ -153,7 +153,7 @@ 
      */
     private function uriToString($uri): string
     {
-        switch (true) {
+        switch (true){
             case $uri instanceof UriInterface:
             case $uri instanceof Stringable:
             case \is_object($uri) && \method_exists($uri, '__toString'):

Braces +12 added lines, -6 removed lines

@@ -73,7 +73,8 @@ 
     {
         $name ??= $this->default;
 
-        if (!isset($this->buckets[$name])) {
+        if (!isset($this->buckets[$name]))
+        {
             throw new InvalidArgumentException(\sprintf(self::ERROR_NOT_FOUND, $name));
         }
 
@@ -95,7 +96,8 @@ 
      */
     public function add(string $name, BucketInterface $storage, bool $overwrite = false): void
     {
-        if ($overwrite === false && isset($this->buckets[$name])) {
+        if ($overwrite === false && isset($this->buckets[$name]))
+        {
             throw new \InvalidArgumentException(\sprintf(self::ERROR_REDEFINITION, $name));
         }
 
@@ -128,16 +130,19 @@ 
         $uri = $this->uriToString($uri);
         $result = \parse_url($uri);
 
-        if ($result === false) {
+        if ($result === false)
+        {
             $message = 'URI argument must be a valid URI in "[STORAGE]://[PATH_TO_FILE]" format, but `%s` given';
             throw new InvalidArgumentException(\sprintf($message, $uri));
         }
 
-        if (!isset($result['scheme'])) {
+        if (!isset($result['scheme']))
+        {
             $result['scheme'] = $withScheme ? $this->default : null;
         }
 
-        if (!isset($result['host'])) {
+        if (!isset($result['host']))
+        {
             $result['host'] = '';
         }
 
@@ -153,7 +158,8 @@ 
      */
     private function uriToString($uri): string
     {
-        switch (true) {
+        switch (true)
+        {
             case $uri instanceof UriInterface:
             case $uri instanceof Stringable:
             case \is_object($uri) && \method_exists($uri, '__toString'):

src/Storage/src/File/UriResolvableTrait.php

Spacing +1 added lines, -1 removed lines

@@ -32,7 +32,7 @@
     {
         $resolver = $this->getResolver();
 
-        if ($resolver === null) {
+        if ($resolver === null){
             throw new LogicException('Can not generate public url: File not accessible by HTTP');
         }
 

Braces +2 added lines, -1 removed lines

@@ -32,7 +32,8 @@
     {
         $resolver = $this->getResolver();
 
-        if ($resolver === null) {
+        if ($resolver === null)
+        {
             throw new LogicException('Can not generate public url: File not accessible by HTTP');
         }