spiral / framework

src/Framework/Bootloader/Distribution/DistributionConfig.php

Spacing +27 added lines, -27 removed lines

@@ -71,8 +71,8 @@ 
      */
     private function bootResolvers(array $config): void
     {
-        foreach ($config['resolvers'] ?? [] as $name => $child) {
-            if (!\is_string($name)) {
+        foreach ($config['resolvers'] ?? [] as $name => $child){
+            if (!\is_string($name)){
                 throw new InvalidArgumentException(
                     \vsprintf('Distribution driver config key must be a string, but %s given', [
                         \get_debug_type($child),
@@ -80,7 +80,7 @@ 
                 );
             }
 
-            if (!\is_array($child)) {
+            if (!\is_array($child)){
                 throw new InvalidArgumentException(
                     \vsprintf('Distribution driver config `%s` must be an array, but %s given', [
                         $name,
@@ -100,9 +100,9 @@ 
     {
         $default = $config['default'] ?? null;
 
-        if ($default !== null) {
+        if ($default !== null){
             // Validate config
-            if (!\is_string($default)) {
+            if (!\is_string($default)){
                 throw new InvalidArgumentException(
                     \vsprintf('Distribution config default driver must be a string, but %s given', [
                         \get_debug_type($default),
@@ -121,13 +121,13 @@ 
      */
     private function createResolver(string $name, array $config): UriResolverInterface
     {
-        if (!isset($config['type']) || !\is_string($config['type'])) {
+        if (!isset($config['type']) || !\is_string($config['type'])){
             throw $this->invalidConfigKey($name, 'type', 'string');
         }
 
         $type = $config['type'];
 
-        switch ($type) {
+        switch ($type){
             case 'static':
                 return $this->createStaticResolver($name, $config);
 
@@ -150,17 +150,17 @@ 
      */
     private function createCustomResolver(string $type, string $name, array $config): UriResolverInterface
     {
-        if (!\is_subclass_of($type, UriResolverInterface::class, true)) {
+        if (!\is_subclass_of($type, UriResolverInterface::class, true)){
             throw $this->invalidConfigKey($name, 'type', UriResolverInterface::class);
         }
 
-        if (isset($config['options']) && !\is_array($config['options'])) {
+        if (isset($config['options']) && !\is_array($config['options'])){
             throw $this->invalidConfigKey($name, 'options', 'array');
         }
 
-        try {
+        try{
             return new $type(...\array_values($config['options'] ?? []));
-        } catch (\Throwable $e) {
+        }catch (\Throwable $e){
             $message = 'An error occurred while resolver `%s` initializing: %s';
             throw new InvalidArgumentException(\sprintf($message, $name, $e->getMessage()), 0, $e);
         }
@@ -174,32 +174,32 @@ 
     private function createS3Resolver(string $name, array $config): UriResolverInterface
     {
         // Required config options
-        if (!isset($config['region']) || !\is_string($config['region'])) {
+        if (!isset($config['region']) || !\is_string($config['region'])){
             throw $this->invalidConfigKey($name, 'region', 'string');
         }
 
-        if (!isset($config['key']) || !\is_string($config['key'])) {
+        if (!isset($config['key']) || !\is_string($config['key'])){
             throw $this->invalidConfigKey($name, 'key', 'string');
         }
 
-        if (!isset($config['secret']) || !\is_string($config['secret'])) {
+        if (!isset($config['secret']) || !\is_string($config['secret'])){
             throw $this->invalidConfigKey($name, 'secret', 'string');
         }
 
-        if (!isset($config['bucket']) || !\is_string($config['bucket'])) {
+        if (!isset($config['bucket']) || !\is_string($config['bucket'])){
             throw $this->invalidConfigKey($name, 'bucket', 'string');
         }
 
         // Optional config options
-        if (!\is_string($config['version'] ?? '')) {
+        if (!\is_string($config['version'] ?? '')){
             throw $this->invalidConfigKey($name, 'version', 'string or null');
         }
 
-        if (!\is_string($config['token'] ?? '')) {
+        if (!\is_string($config['token'] ?? '')){
             throw $this->invalidConfigKey($name, 'token', 'string or null');
         }
 
-        if (!\is_int($config['expires'] ?? 0)) {
+        if (!\is_int($config['expires'] ?? 0)){
             throw $this->invalidConfigKey($name, 'expires', 'positive int (unix timestamp)');
         }
 
@@ -224,15 +224,15 @@ 
      */
     private function createCloudFrontResolver(string $name, array $config): UriResolverInterface
     {
-        if (!isset($config['key']) || !\is_string($config['key'])) {
+        if (!isset($config['key']) || !\is_string($config['key'])){
             throw $this->invalidConfigKey($name, 'key', 'string');
         }
 
-        if (!isset($config['private']) || !\is_string($config['private'])) {
+        if (!isset($config['private']) || !\is_string($config['private'])){
             throw $this->invalidConfigKey($name, 'private', 'string value or path to key file');
         }
 
-        if (!isset($config['domain']) || !\is_string($config['domain'])) {
+        if (!isset($config['domain']) || !\is_string($config['domain'])){
             throw $this->invalidConfigKey($name, 'domain', 'string');
         }
 
@@ -250,7 +250,7 @@ 
      */
     private function createStaticResolver(string $name, array $config): UriResolverInterface
     {
-        if (!isset($config['uri']) || !\is_string($config['uri'])) {
+        if (!isset($config['uri']) || !\is_string($config['uri'])){
             throw $this->invalidConfigKey($name, 'uri', 'string');
         }
 
@@ -265,17 +265,17 @@ 
      */
     private function createUri(string $name, string $uri, array $config): UriInterface
     {
-        if (!\is_string($config['factory'] ?? '')) {
+        if (!\is_string($config['factory'] ?? '')){
             throw $this->invalidConfigKey($name, 'factory', 'string (PSR-7 uri factory implementation)');
         }
 
-        switch (true) {
+        switch (true){
             case isset($config['factory']):
                 /** @var UriFactoryInterface $factory */
                 $factory = new $config['factory']();
 
-                if (!$factory instanceof UriFactoryInterface) {
-                    $message = 'Distribution config driver `%s` should contain class that must be a valid PSR-7 ' .
+                if (!$factory instanceof UriFactoryInterface){
+                    $message = 'Distribution config driver `%s` should contain class that must be a valid PSR-7 '.
                         'uri factory implementation, but `%s` given';
                     throw new InvalidArgumentException(\sprintf($message, $name, $config['factory']));
                 }
@@ -289,7 +289,7 @@ 
                 return new GuzzleUri($uri);
 
             default:
-                $message = 'Can not resolve available PSR-7 UriFactory implementation; ' .
+                $message = 'Can not resolve available PSR-7 UriFactory implementation; '.
                     'Please define `factory` config section in `%s` distribution driver config';
                 throw new InvalidArgumentException(\sprintf($message, $name));
         }

Braces +51 added lines, -25 removed lines

@@ -71,8 +71,10 @@ 
      */
     private function bootResolvers(array $config): void
     {
-        foreach ($config['resolvers'] ?? [] as $name => $child) {
-            if (!\is_string($name)) {
+        foreach ($config['resolvers'] ?? [] as $name => $child)
+        {
+            if (!\is_string($name))
+            {
                 throw new InvalidArgumentException(
                     \vsprintf('Distribution driver config key must be a string, but %s given', [
                         \get_debug_type($child),
@@ -80,7 +82,8 @@ 
                 );
             }
 
-            if (!\is_array($child)) {
+            if (!\is_array($child))
+            {
                 throw new InvalidArgumentException(
                     \vsprintf('Distribution driver config `%s` must be an array, but %s given', [
                         $name,
@@ -100,9 +103,11 @@ 
     {
         $default = $config['default'] ?? null;
 
-        if ($default !== null) {
+        if ($default !== null)
+        {
             // Validate config
-            if (!\is_string($default)) {
+            if (!\is_string($default))
+            {
                 throw new InvalidArgumentException(
                     \vsprintf('Distribution config default driver must be a string, but %s given', [
                         \get_debug_type($default),
@@ -121,13 +126,15 @@ 
      */
     private function createResolver(string $name, array $config): UriResolverInterface
     {
-        if (!isset($config['type']) || !\is_string($config['type'])) {
+        if (!isset($config['type']) || !\is_string($config['type']))
+        {
             throw $this->invalidConfigKey($name, 'type', 'string');
         }
 
         $type = $config['type'];
 
-        switch ($type) {
+        switch ($type)
+        {
             case 'static':
                 return $this->createStaticResolver($name, $config);
 
@@ -150,17 +157,22 @@ 
      */
     private function createCustomResolver(string $type, string $name, array $config): UriResolverInterface
     {
-        if (!\is_subclass_of($type, UriResolverInterface::class, true)) {
+        if (!\is_subclass_of($type, UriResolverInterface::class, true))
+        {
             throw $this->invalidConfigKey($name, 'type', UriResolverInterface::class);
         }
 
-        if (isset($config['options']) && !\is_array($config['options'])) {
+        if (isset($config['options']) && !\is_array($config['options']))
+        {
             throw $this->invalidConfigKey($name, 'options', 'array');
         }
 
-        try {
+        try
+        {
             return new $type(...\array_values($config['options'] ?? []));
-        } catch (\Throwable $e) {
+        }
+        catch (\Throwable $e)
+        {
             $message = 'An error occurred while resolver `%s` initializing: %s';
             throw new InvalidArgumentException(\sprintf($message, $name, $e->getMessage()), 0, $e);
         }
@@ -174,32 +186,39 @@ 
     private function createS3Resolver(string $name, array $config): UriResolverInterface
     {
         // Required config options
-        if (!isset($config['region']) || !\is_string($config['region'])) {
+        if (!isset($config['region']) || !\is_string($config['region']))
+        {
             throw $this->invalidConfigKey($name, 'region', 'string');
         }
 
-        if (!isset($config['key']) || !\is_string($config['key'])) {
+        if (!isset($config['key']) || !\is_string($config['key']))
+        {
             throw $this->invalidConfigKey($name, 'key', 'string');
         }
 
-        if (!isset($config['secret']) || !\is_string($config['secret'])) {
+        if (!isset($config['secret']) || !\is_string($config['secret']))
+        {
             throw $this->invalidConfigKey($name, 'secret', 'string');
         }
 
-        if (!isset($config['bucket']) || !\is_string($config['bucket'])) {
+        if (!isset($config['bucket']) || !\is_string($config['bucket']))
+        {
             throw $this->invalidConfigKey($name, 'bucket', 'string');
         }
 
         // Optional config options
-        if (!\is_string($config['version'] ?? '')) {
+        if (!\is_string($config['version'] ?? ''))
+        {
             throw $this->invalidConfigKey($name, 'version', 'string or null');
         }
 
-        if (!\is_string($config['token'] ?? '')) {
+        if (!\is_string($config['token'] ?? ''))
+        {
             throw $this->invalidConfigKey($name, 'token', 'string or null');
         }
 
-        if (!\is_int($config['expires'] ?? 0)) {
+        if (!\is_int($config['expires'] ?? 0))
+        {
             throw $this->invalidConfigKey($name, 'expires', 'positive int (unix timestamp)');
         }
 
@@ -224,15 +243,18 @@ 
      */
     private function createCloudFrontResolver(string $name, array $config): UriResolverInterface
     {
-        if (!isset($config['key']) || !\is_string($config['key'])) {
+        if (!isset($config['key']) || !\is_string($config['key']))
+        {
             throw $this->invalidConfigKey($name, 'key', 'string');
         }
 
-        if (!isset($config['private']) || !\is_string($config['private'])) {
+        if (!isset($config['private']) || !\is_string($config['private']))
+        {
             throw $this->invalidConfigKey($name, 'private', 'string value or path to key file');
         }
 
-        if (!isset($config['domain']) || !\is_string($config['domain'])) {
+        if (!isset($config['domain']) || !\is_string($config['domain']))
+        {
             throw $this->invalidConfigKey($name, 'domain', 'string');
         }
 
@@ -250,7 +272,8 @@ 
      */
     private function createStaticResolver(string $name, array $config): UriResolverInterface
     {
-        if (!isset($config['uri']) || !\is_string($config['uri'])) {
+        if (!isset($config['uri']) || !\is_string($config['uri']))
+        {
             throw $this->invalidConfigKey($name, 'uri', 'string');
         }
 
@@ -265,16 +288,19 @@ 
      */
     private function createUri(string $name, string $uri, array $config): UriInterface
     {
-        if (!\is_string($config['factory'] ?? '')) {
+        if (!\is_string($config['factory'] ?? ''))
+        {
             throw $this->invalidConfigKey($name, 'factory', 'string (PSR-7 uri factory implementation)');
         }
 
-        switch (true) {
+        switch (true)
+        {
             case isset($config['factory']):
                 /** @var UriFactoryInterface $factory */
                 $factory = new $config['factory']();
 
-                if (!$factory instanceof UriFactoryInterface) {
+                if (!$factory instanceof UriFactoryInterface)
+                {
                     $message = 'Distribution config driver `%s` should contain class that must be a valid PSR-7 ' .
                         'uri factory implementation, but `%s` given';
                     throw new InvalidArgumentException(\sprintf($message, $name, $config['factory']));

src/Distribution/src/Manager.php

Spacing +2 added lines, -2 removed lines

@@ -65,7 +65,7 @@ 
     {
         $name = $name ?? $this->default;
 
-        if (!isset($this->resolvers[$name])) {
+        if (!isset($this->resolvers[$name])){
             throw new \InvalidArgumentException(\sprintf(self::ERROR_NOT_FOUND, $name));
         }
 
@@ -77,7 +77,7 @@ 
      */
     public function add(string $name, UriResolverInterface $resolver, bool $overwrite = false): void
     {
-        if ($overwrite === false && isset($this->resolvers[$name])) {
+        if ($overwrite === false && isset($this->resolvers[$name])){
             throw new \InvalidArgumentException(\sprintf(self::ERROR_REDEFINITION, $name));
         }
 

Braces +4 added lines, -2 removed lines

@@ -65,7 +65,8 @@ 
     {
         $name = $name ?? $this->default;
 
-        if (!isset($this->resolvers[$name])) {
+        if (!isset($this->resolvers[$name]))
+        {
             throw new \InvalidArgumentException(\sprintf(self::ERROR_NOT_FOUND, $name));
         }
 
@@ -77,7 +78,8 @@ 
      */
     public function add(string $name, UriResolverInterface $resolver, bool $overwrite = false): void
     {
-        if ($overwrite === false && isset($this->resolvers[$name])) {
+        if ($overwrite === false && isset($this->resolvers[$name]))
+        {
             throw new \InvalidArgumentException(\sprintf(self::ERROR_REDEFINITION, $name));
         }