spiral / framework

src/storage/src/Config/DTO/FileSystemInfo/FileSystemInfo.php

Spacing +10 added lines, -10 removed lines

@@ -57,14 +57,14 @@ 
         $this->checkClass($info[static::ADAPTER_KEY], \sprintf('Filesystem %s adapter', $this->name));
         $this->adapter = $info[static::ADAPTER_KEY];
 
-        if (array_key_exists(static::RESOLVER_KEY, $info)) {
+        if (array_key_exists(static::RESOLVER_KEY, $info)){
             $this->checkClass($info[static::RESOLVER_KEY], \sprintf('Filesystem %s resolver', $this->name));
             $this->resolver = $info[static::RESOLVER_KEY];
         }
 
         $this->prepareOptions($info[OptionsBasedInterface::OPTIONS_KEY]);
 
-        if ($this instanceof SpecificConfigurableFileSystemInfo) {
+        if ($this instanceof SpecificConfigurableFileSystemInfo){
             $this->constructSpecific($info);
         }
     }
@@ -98,8 +98,8 @@ 
      */
     public function isAdvancedUsage(): bool
     {
-        foreach (static::ADDITIONAL_OPTIONS as $optionalOption => $type) {
-            if ($this->hasOption($optionalOption)) {
+        foreach (static::ADDITIONAL_OPTIONS as $optionalOption => $type){
+            if ($this->hasOption($optionalOption)){
                 return true;
             }
         }
@@ -122,8 +122,8 @@ 
             \sprintf(' for filesystem `%s`', $this->getName())
         );
 
-        foreach ($options as $optionKey => $option) {
-            if (($type = $this->getOptionType($optionKey)) === null) {
+        foreach ($options as $optionKey => $option){
+            if (($type = $this->getOptionType($optionKey)) === null){
                 continue;
             }
 
@@ -143,13 +143,13 @@ 
      */
     protected function validateInfoSufficient(string $fs, array $info): void
     {
-        if (!array_key_exists(static::ADAPTER_KEY, $info)) {
+        if (!array_key_exists(static::ADAPTER_KEY, $info)){
             throw new ConfigException(
                 \sprintf('Filesystem `%s` needs adapter class defined', $fs)
             );
         }
 
-        if (!array_key_exists(OptionsBasedInterface::OPTIONS_KEY, $info)) {
+        if (!array_key_exists(OptionsBasedInterface::OPTIONS_KEY, $info)){
             throw new ConfigException(
                 \sprintf('Filesystem `%s` needs options defined', $fs)
             );
@@ -167,7 +167,7 @@ 
      */
     protected function validateOptionByType(string $optionLabel, string $optionType, $optionVal): void
     {
-        if (!$this->isOptionHasRequiredType($optionLabel, $optionVal, $optionType)) {
+        if (!$this->isOptionHasRequiredType($optionLabel, $optionVal, $optionType)){
             throw new ConfigException(
                 \sprintf(
                     'Option `%s` defined in wrong format for filesystem `%s`, %s expected',
@@ -188,7 +188,7 @@ 
      */
     protected function getOptionType(string $option): ?string
     {
-        if (array_key_exists($option, static::REQUIRED_OPTIONS)) {
+        if (array_key_exists($option, static::REQUIRED_OPTIONS)){
             return static::REQUIRED_OPTIONS[$option];
         }
 

Braces +20 added lines, -10 removed lines

@@ -57,14 +57,16 @@ 
         $this->checkClass($info[static::ADAPTER_KEY], \sprintf('Filesystem %s adapter', $this->name));
         $this->adapter = $info[static::ADAPTER_KEY];
 
-        if (array_key_exists(static::RESOLVER_KEY, $info)) {
+        if (array_key_exists(static::RESOLVER_KEY, $info))
+        {
             $this->checkClass($info[static::RESOLVER_KEY], \sprintf('Filesystem %s resolver', $this->name));
             $this->resolver = $info[static::RESOLVER_KEY];
         }
 
         $this->prepareOptions($info[OptionsBasedInterface::OPTIONS_KEY]);
 
-        if ($this instanceof SpecificConfigurableFileSystemInfo) {
+        if ($this instanceof SpecificConfigurableFileSystemInfo)
+        {
             $this->constructSpecific($info);
         }
     }
@@ -98,8 +100,10 @@ 
      */
     public function isAdvancedUsage(): bool
     {
-        foreach (static::ADDITIONAL_OPTIONS as $optionalOption => $type) {
-            if ($this->hasOption($optionalOption)) {
+        foreach (static::ADDITIONAL_OPTIONS as $optionalOption => $type)
+        {
+            if ($this->hasOption($optionalOption))
+            {
                 return true;
             }
         }
@@ -122,8 +126,10 @@ 
             \sprintf(' for filesystem `%s`', $this->getName())
         );
 
-        foreach ($options as $optionKey => $option) {
-            if (($type = $this->getOptionType($optionKey)) === null) {
+        foreach ($options as $optionKey => $option)
+        {
+            if (($type = $this->getOptionType($optionKey)) === null)
+            {
                 continue;
             }
 
@@ -143,13 +149,15 @@ 
      */
     protected function validateInfoSufficient(string $fs, array $info): void
     {
-        if (!array_key_exists(static::ADAPTER_KEY, $info)) {
+        if (!array_key_exists(static::ADAPTER_KEY, $info))
+        {
             throw new ConfigException(
                 \sprintf('Filesystem `%s` needs adapter class defined', $fs)
             );
         }
 
-        if (!array_key_exists(OptionsBasedInterface::OPTIONS_KEY, $info)) {
+        if (!array_key_exists(OptionsBasedInterface::OPTIONS_KEY, $info))
+        {
             throw new ConfigException(
                 \sprintf('Filesystem `%s` needs options defined', $fs)
             );
@@ -167,7 +175,8 @@ 
      */
     protected function validateOptionByType(string $optionLabel, string $optionType, $optionVal): void
     {
-        if (!$this->isOptionHasRequiredType($optionLabel, $optionVal, $optionType)) {
+        if (!$this->isOptionHasRequiredType($optionLabel, $optionVal, $optionType))
+        {
             throw new ConfigException(
                 \sprintf(
                     'Option `%s` defined in wrong format for filesystem `%s`, %s expected',
@@ -188,7 +197,8 @@ 
      */
     protected function getOptionType(string $option): ?string
     {
-        if (array_key_exists($option, static::REQUIRED_OPTIONS)) {
+        if (array_key_exists($option, static::REQUIRED_OPTIONS))
+        {
             return static::REQUIRED_OPTIONS[$option];
         }
 

src/storage/src/Resolver/AbstractAdapterResolver.php

Spacing +3 added lines, -3 removed lines

@@ -52,7 +52,7 @@ 
 
         $fsInfo = $config->buildFileSystemInfo($fs);
 
-        if (empty($requiredClass) || !$fsInfo instanceof $requiredClass) {
+        if (empty($requiredClass) || !$fsInfo instanceof $requiredClass){
             throw new StorageException(
                 \sprintf(
                     'Wrong filesystem info (`%s`) for resolver `%s`',
@@ -78,11 +78,11 @@ 
      */
     public function normalizeFilePath(string $filePath): string
     {
-        try {
+        try{
             $uri = $this->uriParser->parse($filePath);
 
             return $uri->getPath();
-        } catch (UriException $e) {
+        }catch (UriException $e){
             // if filePath is not uri we suppose it is short form of filepath - without fs part
         }
 

Braces +7 added lines, -3 removed lines

@@ -52,7 +52,8 @@ 
 
         $fsInfo = $config->buildFileSystemInfo($fs);
 
-        if (empty($requiredClass) || !$fsInfo instanceof $requiredClass) {
+        if (empty($requiredClass) || !$fsInfo instanceof $requiredClass)
+        {
             throw new StorageException(
                 \sprintf(
                     'Wrong filesystem info (`%s`) for resolver `%s`',
@@ -78,11 +79,14 @@ 
      */
     public function normalizeFilePath(string $filePath): string
     {
-        try {
+        try
+        {
             $uri = $this->uriParser->parse($filePath);
 
             return $uri->getPath();
-        } catch (UriException $e) {
+        }
+        catch (UriException $e)
+        {
             // if filePath is not uri we suppose it is short form of filepath - without fs part
         }
 

src/storage/src/Resolver/LocalSystemResolver.php

Spacing +1 added lines, -1 removed lines

@@ -34,7 +34,7 @@
      */
     public function buildUrl(string $uri, array $options = [])
     {
-        if (!$this->fsInfo->hasOption(LocalInfo::HOST_KEY)) {
+        if (!$this->fsInfo->hasOption(LocalInfo::HOST_KEY)){
             throw new ResolveException(
                 \sprintf('Url can\'t be built for filesystem `%s` - host was not defined', $this->fsInfo->getName())
             );

Braces +2 added lines, -1 removed lines

@@ -34,7 +34,8 @@
      */
     public function buildUrl(string $uri, array $options = [])
     {
-        if (!$this->fsInfo->hasOption(LocalInfo::HOST_KEY)) {
+        if (!$this->fsInfo->hasOption(LocalInfo::HOST_KEY))
+        {
             throw new ResolveException(
                 \sprintf('Url can\'t be built for filesystem `%s` - host was not defined', $this->fsInfo->getName())
             );

src/storage/src/Parser/UriParser.php

Spacing +2 added lines, -2 removed lines

@@ -20,7 +20,7 @@ 
      * @var string
      */
     private const ERROR_INVALID_URI_TYPE =
-        'URI argument must be a string-like ' .
+        'URI argument must be a string-like '.
         'or instance of one of [%s], but %s passed'
     ;
 
@@ -29,7 +29,7 @@ 
      */
     public function parse($uri): UriInterface
     {
-        switch (true) {
+        switch (true){
             case $uri instanceof UriInterface:
                 return $uri;
 

Braces +2 added lines, -1 removed lines

@@ -29,7 +29,8 @@
      */
     public function parse($uri): UriInterface
     {
-        switch (true) {
+        switch (true)
+        {
             case $uri instanceof UriInterface:
                 return $uri;
 

src/storage/src/Parser/Uri.php

Spacing +3 added lines, -3 removed lines

@@ -51,7 +51,7 @@ 
      */
     public function __toString(): string
     {
-        return $this->getFileSystem() . self::SCHEME_PATH_DELIMITER . $this->getPath();
+        return $this->getFileSystem().self::SCHEME_PATH_DELIMITER.$this->getPath();
     }
 
     /**
@@ -109,7 +109,7 @@ 
      */
     private function setFileSystem(string $fs): void
     {
-        if ($fs === '') {
+        if ($fs === ''){
             throw new UriException('Filesystem name can not be empty');
         }
 
@@ -125,7 +125,7 @@ 
         $path = \str_replace(['\\', '/'], self::PATH_DELIMITER, $path);
         $path = \trim(\trim($path), self::PATH_DELIMITER);
 
-        if ($path === '') {
+        if ($path === ''){
             throw new UriException('Filesystem pathname can not be empty');
         }
 

Braces +4 added lines, -2 removed lines

@@ -109,7 +109,8 @@ 
      */
     private function setFileSystem(string $fs): void
     {
-        if ($fs === '') {
+        if ($fs === '')
+        {
             throw new UriException('Filesystem name can not be empty');
         }
 
@@ -125,7 +126,8 @@ 
         $path = \str_replace(['\\', '/'], self::PATH_DELIMITER, $path);
         $path = \trim(\trim($path), self::PATH_DELIMITER);
 
-        if ($path === '') {
+        if ($path === '')
+        {
             throw new UriException('Filesystem pathname can not be empty');
         }
 

src/storage/src/UriResolver.php

Spacing +5 added lines, -5 removed lines

@@ -56,7 +56,7 @@ 
      */
     public function resolveAll(iterable $uris): iterable
     {
-        foreach ($uris as $uri) {
+        foreach ($uris as $uri){
             yield $this->resolve($uri);
         }
     }
@@ -66,15 +66,15 @@ 
      */
     public function resolve($uri)
     {
-        try {
+        try{
             $uri = $this->parser->parse($uri);
 
             return $this->getResolver($uri->getFileSystem())
                 ->buildUrl($uri->getPath())
             ;
-        } catch (StorageException $e) {
+        }catch (StorageException $e){
             throw $e;
-        } catch (\Throwable $e) {
+        }catch (\Throwable $e){
             throw new ResolveException($e->getMessage(), (int)$e->getCode(), $e);
         }
     }
@@ -90,7 +90,7 @@ 
      */
     protected function getResolver(string $fileSystem): AdapterResolverInterface
     {
-        if (!\array_key_exists($fileSystem, $this->resolvers)) {
+        if (!\array_key_exists($fileSystem, $this->resolvers)){
             $this->resolvers[$fileSystem] = $this->prepareResolverForFileSystem(
                 $this->config->buildFileSystemInfo($fileSystem)
             );

Braces +12 added lines, -5 removed lines

@@ -56,7 +56,8 @@ 
      */
     public function resolveAll(iterable $uris): iterable
     {
-        foreach ($uris as $uri) {
+        foreach ($uris as $uri)
+        {
             yield $this->resolve($uri);
         }
     }
@@ -66,15 +67,20 @@ 
      */
     public function resolve($uri)
     {
-        try {
+        try
+        {
             $uri = $this->parser->parse($uri);
 
             return $this->getResolver($uri->getFileSystem())
                 ->buildUrl($uri->getPath())
             ;
-        } catch (StorageException $e) {
+        }
+        catch (StorageException $e)
+        {
             throw $e;
-        } catch (\Throwable $e) {
+        }
+        catch (\Throwable $e)
+        {
             throw new ResolveException($e->getMessage(), (int)$e->getCode(), $e);
         }
     }
@@ -90,7 +96,8 @@ 
      */
     protected function getResolver(string $fileSystem): AdapterResolverInterface
     {
-        if (!\array_key_exists($fileSystem, $this->resolvers)) {
+        if (!\array_key_exists($fileSystem, $this->resolvers))
+        {
             $this->resolvers[$fileSystem] = $this->prepareResolverForFileSystem(
                 $this->config->buildFileSystemInfo($fileSystem)
             );

src/storage/src/Builder/AdapterFactory.php

Spacing +2 added lines, -2 removed lines

@@ -31,7 +31,7 @@ 
     {
         $builder = static::detectAdapterBuilder($info);
 
-        if ($info->isAdvancedUsage()) {
+        if ($info->isAdvancedUsage()){
             return $builder->buildAdvanced();
         }
 
@@ -50,7 +50,7 @@ 
     private static function detectAdapterBuilder(
         FileSystemInfo\FileSystemInfoInterface $info
     ): AdapterBuilder\AdapterBuilderInterface {
-        switch (get_class($info)) {
+        switch (get_class($info)){
             case FileSystemInfo\LocalInfo::class:
                 return new AdapterBuilder\LocalBuilder($info);
             case FileSystemInfo\Aws\AwsS3Info::class:

Braces +4 added lines, -2 removed lines

@@ -31,7 +31,8 @@ 
     {
         $builder = static::detectAdapterBuilder($info);
 
-        if ($info->isAdvancedUsage()) {
+        if ($info->isAdvancedUsage())
+        {
             return $builder->buildAdvanced();
         }
 
@@ -50,7 +51,8 @@ 
     private static function detectAdapterBuilder(
         FileSystemInfo\FileSystemInfoInterface $info
     ): AdapterBuilder\AdapterBuilderInterface {
-        switch (get_class($info)) {
+        switch (get_class($info))
+        {
             case FileSystemInfo\LocalInfo::class:
                 return new AdapterBuilder\LocalBuilder($info);
             case FileSystemInfo\Aws\AwsS3Info::class:

src/storage/src/Builder/Adapter/AbstractBuilder.php

Spacing +1 added lines, -1 removed lines

@@ -35,7 +35,7 @@
     {
         $requiredClass = static::FILE_SYSTEM_INFO_CLASS;
 
-        if (empty($requiredClass) || !$fsInfo instanceof $requiredClass) {
+        if (empty($requiredClass) || !$fsInfo instanceof $requiredClass){
             throw new StorageException(
                 \sprintf('Wrong filesystem info `%s` provided for `%s`', get_class($fsInfo), static::class)
             );

Braces +2 added lines, -1 removed lines

@@ -35,7 +35,8 @@
     {
         $requiredClass = static::FILE_SYSTEM_INFO_CLASS;
 
-        if (empty($requiredClass) || !$fsInfo instanceof $requiredClass) {
+        if (empty($requiredClass) || !$fsInfo instanceof $requiredClass)
+        {
             throw new StorageException(
                 \sprintf('Wrong filesystem info `%s` provided for `%s`', get_class($fsInfo), static::class)
             );

src/Framework/Bootloader/StorageBootloader.php

Spacing +4 added lines, -4 removed lines

@@ -40,12 +40,12 @@ 
         $app->bindInjector(StorageConfig::class, ConfiguratorInterface::class);
 
         $app->bindSingleton(UriResolverInterface::class, $this->uriResolverRegistrar());
-        $app->bindSingleton(UriResolver::class, static function (UriResolverInterface $resolver) {
+        $app->bindSingleton(UriResolver::class, static function (UriResolverInterface $resolver){
             return $resolver;
         });
 
         $app->bindSingleton(StorageInterface::class, $this->storageRegistrar());
-        $app->bindSingleton(Storage::class, static function (StorageInterface $storage) {
+        $app->bindSingleton(Storage::class, static function (StorageInterface $storage){
             return $storage;
         });
     }
@@ -55,7 +55,7 @@ 
      */
     private function storageRegistrar(): \Closure
     {
-        return static function (StorageConfig $config, UriParserInterface $parser) {
+        return static function (StorageConfig $config, UriParserInterface $parser){
             return new Storage($config, $parser);
         };
     }
@@ -65,7 +65,7 @@ 
      */
     private function uriResolverRegistrar(): \Closure
     {
-        return static function (StorageConfig $config, UriParserInterface $parser) {
+        return static function (StorageConfig $config, UriParserInterface $parser){
             return new UriResolver($config, $parser);
         };
     }

Braces +8 added lines, -4 removed lines

@@ -40,12 +40,14 @@ 
         $app->bindInjector(StorageConfig::class, ConfiguratorInterface::class);
 
         $app->bindSingleton(UriResolverInterface::class, $this->uriResolverRegistrar());
-        $app->bindSingleton(UriResolver::class, static function (UriResolverInterface $resolver) {
+        $app->bindSingleton(UriResolver::class, static function (UriResolverInterface $resolver)
+        {
             return $resolver;
         });
 
         $app->bindSingleton(StorageInterface::class, $this->storageRegistrar());
-        $app->bindSingleton(Storage::class, static function (StorageInterface $storage) {
+        $app->bindSingleton(Storage::class, static function (StorageInterface $storage)
+        {
             return $storage;
         });
     }
@@ -55,7 +57,8 @@ 
      */
     private function storageRegistrar(): \Closure
     {
-        return static function (StorageConfig $config, UriParserInterface $parser) {
+        return static function (StorageConfig $config, UriParserInterface $parser)
+        {
             return new Storage($config, $parser);
         };
     }
@@ -65,7 +68,8 @@ 
      */
     private function uriResolverRegistrar(): \Closure
     {
-        return static function (StorageConfig $config, UriParserInterface $parser) {
+        return static function (StorageConfig $config, UriParserInterface $parser)
+        {
             return new UriResolver($config, $parser);
         };
     }