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/Config/StorageConfig.php

Spacing +27 added lines, -27 removed lines

@@ -143,19 +143,19 @@ 
      */
     public function buildFileSystemInfo(string $fs, ?bool $force = false): FileSystemInfoInterface
     {
-        if (!$this->hasBucket($fs)) {
+        if (!$this->hasBucket($fs)){
             throw new ConfigException(
                 \sprintf('Bucket `%s` was not found', $fs)
             );
         }
 
-        if (!$force && array_key_exists($fs, $this->fileSystemsInfoList)) {
+        if (!$force && array_key_exists($fs, $this->fileSystemsInfoList)){
             return $this->fileSystemsInfoList[$fs];
         }
 
         $bucketInfo = $this->buildBucketInfo($fs);
 
-        if (!$this->hasServer($bucketInfo->getServer())) {
+        if (!$this->hasServer($bucketInfo->getServer())){
             throw new ConfigException(
                 \sprintf(
                     'Server `%s` info for filesystem `%s` was not detected',
@@ -167,7 +167,7 @@ 
 
         $serverInfo = $this->config[self::SERVERS_KEY][$bucketInfo->getServer()];
 
-        switch ($this->extractServerAdapter($serverInfo)) {
+        switch ($this->extractServerAdapter($serverInfo)){
             case \League\Flysystem\Local\LocalFilesystemAdapter::class:
                 $fsInfoDTO = new FileSystemInfo\LocalInfo($fs, $serverInfo);
                 break;
@@ -201,13 +201,13 @@ 
      */
     public function buildBucketInfo(string $bucketLabel, ?bool $force = false): BucketInfoInterface
     {
-        if (!$this->hasBucket($bucketLabel)) {
+        if (!$this->hasBucket($bucketLabel)){
             throw new StorageException(
                 \sprintf('Bucket `%s` was not found', $bucketLabel)
             );
         }
 
-        if (!$force && array_key_exists($bucketLabel, $this->bucketsInfoList)) {
+        if (!$force && array_key_exists($bucketLabel, $this->bucketsInfoList)){
             return $this->bucketsInfoList[$bucketLabel];
         }
 
@@ -246,7 +246,7 @@ 
      */
     private function normalizeServers(array $config): array
     {
-        if (!isset($config[self::SERVERS_KEY])) {
+        if (!isset($config[self::SERVERS_KEY])){
             $config[self::SERVERS_KEY] = [];
 
             return $config;
@@ -254,20 +254,20 @@ 
 
         $servers = $config[self::SERVERS_KEY];
 
-        if (!\is_array($servers)) {
+        if (!\is_array($servers)){
             $message = 'Storage servers list must be an array, but `%s` defined';
             throw new ConfigException(\sprintf($message, $this->valueToString($servers)), 0x01);
         }
 
-        foreach ($servers as $name => $server) {
-            if (!\is_string($name)) {
+        foreach ($servers as $name => $server){
+            if (!\is_string($name)){
                 $message = 'Storage server name must be a string, but %s defined';
                 $message = \sprintf($message, $this->valueToString($name));
 
                 throw new ConfigException($message, 0x02);
             }
 
-            if (!\is_array($server)) {
+            if (!\is_array($server)){
                 $message = 'Storage server `%s` config must be an array, but %s defined';
                 $message = \sprintf($message, $name, $this->valueToString($server));
 
@@ -276,8 +276,8 @@ 
 
             $adapter = $server['adapter'] ?? null;
 
-            if (!\is_string($adapter) || !\is_subclass_of($adapter, FilesystemAdapter::class, true)) {
-                $message = 'Storage server `%s` adapter must be a class ' .
+            if (!\is_string($adapter) || !\is_subclass_of($adapter, FilesystemAdapter::class, true)){
+                $message = 'Storage server `%s` adapter must be a class '.
                     'string that implements %s interface, but %s defined'
                 ;
 
@@ -286,7 +286,7 @@ 
                 throw new ConfigException($message, 0x04);
             }
 
-            if (isset($server['options']) && !\is_array($server['options'])) {
+            if (isset($server['options']) && !\is_array($server['options'])){
                 $message = 'Storage server `%s` options must be an array, but %s defined';
                 $message = \sprintf($message, $name, $this->valueToString($server['options']));
 
@@ -307,7 +307,7 @@ 
      */
     private function normalizeBuckets(array $config): array
     {
-        if (!isset($config[self::BUCKETS_KEY])) {
+        if (!isset($config[self::BUCKETS_KEY])){
             $config[self::BUCKETS_KEY] = [];
 
             return $config;
@@ -315,20 +315,20 @@ 
 
         $buckets = $config[self::BUCKETS_KEY];
 
-        if (!\is_array($buckets)) {
+        if (!\is_array($buckets)){
             $message = 'Storage buckets list must be an array, but `%s` defined';
             throw new ConfigException(\sprintf($message, $this->valueToString($buckets)), 0x06);
         }
 
-        foreach ($buckets as $name => $bucket) {
-            if (!\is_string($name)) {
+        foreach ($buckets as $name => $bucket){
+            if (!\is_string($name)){
                 $message = 'Storage bucket name must be a string, but %s defined';
                 $message = \sprintf($message, $this->valueToString($name));
 
                 throw new ConfigException($message, 0x07);
             }
 
-            if (!\is_array($bucket)) {
+            if (!\is_array($bucket)){
                 $message = 'Storage bucket `%s` config must be an array, but %s defined';
                 $message = \sprintf($message, $name, $this->valueToString($bucket));
 
@@ -337,14 +337,14 @@ 
 
             $server = $bucket['server'] ?? null;
 
-            if (!\is_string($server)) {
+            if (!\is_string($server)){
                 $message = 'Storage server of bucket `%s` must be a string, but %s defined';
                 $message = \sprintf($message, $name, $this->valueToString($server));
 
                 throw new ConfigException($message, 0x09);
             }
 
-            if (!isset($config[self::SERVERS_KEY][$server])) {
+            if (!isset($config[self::SERVERS_KEY][$server])){
                 $variants = \implode(', ', \array_keys($config[self::SERVERS_KEY] ?? []));
                 $message = 'Storage server `%s` of bucket `%s` has not been defined, one of [%s] required';
                 $message = \sprintf($message, $server, $name, $variants);
@@ -352,7 +352,7 @@ 
                 throw new ConfigException($message, 0x0A);
             }
 
-            if (isset($bucket['options']) && !\is_array($bucket['options'])) {
+            if (isset($bucket['options']) && !\is_array($bucket['options'])){
                 $message = 'Storage bucket `%s` options must be an array, but %s defined';
                 $message = \sprintf($message, $name, $this->valueToString($bucket['options']));
 
@@ -373,7 +373,7 @@ 
      */
     private function normalizeTemporaryDirectory(array $config): array
     {
-        if (!isset($config[self::TMP_DIR_KEY])) {
+        if (!isset($config[self::TMP_DIR_KEY])){
             $config[self::TMP_DIR_KEY] = \sys_get_temp_dir();
 
             return $config;
@@ -381,17 +381,17 @@ 
 
         $directory = $config[self::TMP_DIR_KEY];
 
-        if (!\is_string($directory)) {
+        if (!\is_string($directory)){
             $message = 'Storage temporary directory must be a string, but `%s` defined';
             throw new ConfigException(\sprintf($message, $this->valueToString($directory)), 0x0C);
         }
 
-        if (!\is_dir($directory)) {
+        if (!\is_dir($directory)){
             $message = 'Storage temporary directory `%s` must be a valid directory';
             throw new ConfigException(\sprintf($message, $directory), 0x0D);
         }
 
-        if (!\is_writable($directory)) {
+        if (!\is_writable($directory)){
             $message = 'Storage temporary directory `%s` must be writable';
             throw new ConfigException(\sprintf($message, $directory), 0x0E);
         }
@@ -407,7 +407,7 @@ 
     {
         $suffix = \is_scalar($value) ? "($value)" : (string)$value;
 
-        return \get_debug_type($value) . $suffix;
+        return \get_debug_type($value).$suffix;
     }
 
     /**

Braces +50 added lines, -25 removed lines

@@ -143,19 +143,22 @@ 
      */
     public function buildFileSystemInfo(string $fs, ?bool $force = false): FileSystemInfoInterface
     {
-        if (!$this->hasBucket($fs)) {
+        if (!$this->hasBucket($fs))
+        {
             throw new ConfigException(
                 \sprintf('Bucket `%s` was not found', $fs)
             );
         }
 
-        if (!$force && array_key_exists($fs, $this->fileSystemsInfoList)) {
+        if (!$force && array_key_exists($fs, $this->fileSystemsInfoList))
+        {
             return $this->fileSystemsInfoList[$fs];
         }
 
         $bucketInfo = $this->buildBucketInfo($fs);
 
-        if (!$this->hasServer($bucketInfo->getServer())) {
+        if (!$this->hasServer($bucketInfo->getServer()))
+        {
             throw new ConfigException(
                 \sprintf(
                     'Server `%s` info for filesystem `%s` was not detected',
@@ -167,7 +170,8 @@ 
 
         $serverInfo = $this->config[self::SERVERS_KEY][$bucketInfo->getServer()];
 
-        switch ($this->extractServerAdapter($serverInfo)) {
+        switch ($this->extractServerAdapter($serverInfo))
+        {
             case \League\Flysystem\Local\LocalFilesystemAdapter::class:
                 $fsInfoDTO = new FileSystemInfo\LocalInfo($fs, $serverInfo);
                 break;
@@ -201,13 +205,15 @@ 
      */
     public function buildBucketInfo(string $bucketLabel, ?bool $force = false): BucketInfoInterface
     {
-        if (!$this->hasBucket($bucketLabel)) {
+        if (!$this->hasBucket($bucketLabel))
+        {
             throw new StorageException(
                 \sprintf('Bucket `%s` was not found', $bucketLabel)
             );
         }
 
-        if (!$force && array_key_exists($bucketLabel, $this->bucketsInfoList)) {
+        if (!$force && array_key_exists($bucketLabel, $this->bucketsInfoList))
+        {
             return $this->bucketsInfoList[$bucketLabel];
         }
 
@@ -246,7 +252,8 @@ 
      */
     private function normalizeServers(array $config): array
     {
-        if (!isset($config[self::SERVERS_KEY])) {
+        if (!isset($config[self::SERVERS_KEY]))
+        {
             $config[self::SERVERS_KEY] = [];
 
             return $config;
@@ -254,20 +261,24 @@ 
 
         $servers = $config[self::SERVERS_KEY];
 
-        if (!\is_array($servers)) {
+        if (!\is_array($servers))
+        {
             $message = 'Storage servers list must be an array, but `%s` defined';
             throw new ConfigException(\sprintf($message, $this->valueToString($servers)), 0x01);
         }
 
-        foreach ($servers as $name => $server) {
-            if (!\is_string($name)) {
+        foreach ($servers as $name => $server)
+        {
+            if (!\is_string($name))
+            {
                 $message = 'Storage server name must be a string, but %s defined';
                 $message = \sprintf($message, $this->valueToString($name));
 
                 throw new ConfigException($message, 0x02);
             }
 
-            if (!\is_array($server)) {
+            if (!\is_array($server))
+            {
                 $message = 'Storage server `%s` config must be an array, but %s defined';
                 $message = \sprintf($message, $name, $this->valueToString($server));
 
@@ -276,7 +287,8 @@ 
 
             $adapter = $server['adapter'] ?? null;
 
-            if (!\is_string($adapter) || !\is_subclass_of($adapter, FilesystemAdapter::class, true)) {
+            if (!\is_string($adapter) || !\is_subclass_of($adapter, FilesystemAdapter::class, true))
+            {
                 $message = 'Storage server `%s` adapter must be a class ' .
                     'string that implements %s interface, but %s defined'
                 ;
@@ -286,7 +298,8 @@ 
                 throw new ConfigException($message, 0x04);
             }
 
-            if (isset($server['options']) && !\is_array($server['options'])) {
+            if (isset($server['options']) && !\is_array($server['options']))
+            {
                 $message = 'Storage server `%s` options must be an array, but %s defined';
                 $message = \sprintf($message, $name, $this->valueToString($server['options']));
 
@@ -307,7 +320,8 @@ 
      */
     private function normalizeBuckets(array $config): array
     {
-        if (!isset($config[self::BUCKETS_KEY])) {
+        if (!isset($config[self::BUCKETS_KEY]))
+        {
             $config[self::BUCKETS_KEY] = [];
 
             return $config;
@@ -315,20 +329,24 @@ 
 
         $buckets = $config[self::BUCKETS_KEY];
 
-        if (!\is_array($buckets)) {
+        if (!\is_array($buckets))
+        {
             $message = 'Storage buckets list must be an array, but `%s` defined';
             throw new ConfigException(\sprintf($message, $this->valueToString($buckets)), 0x06);
         }
 
-        foreach ($buckets as $name => $bucket) {
-            if (!\is_string($name)) {
+        foreach ($buckets as $name => $bucket)
+        {
+            if (!\is_string($name))
+            {
                 $message = 'Storage bucket name must be a string, but %s defined';
                 $message = \sprintf($message, $this->valueToString($name));
 
                 throw new ConfigException($message, 0x07);
             }
 
-            if (!\is_array($bucket)) {
+            if (!\is_array($bucket))
+            {
                 $message = 'Storage bucket `%s` config must be an array, but %s defined';
                 $message = \sprintf($message, $name, $this->valueToString($bucket));
 
@@ -337,14 +355,16 @@ 
 
             $server = $bucket['server'] ?? null;
 
-            if (!\is_string($server)) {
+            if (!\is_string($server))
+            {
                 $message = 'Storage server of bucket `%s` must be a string, but %s defined';
                 $message = \sprintf($message, $name, $this->valueToString($server));
 
                 throw new ConfigException($message, 0x09);
             }
 
-            if (!isset($config[self::SERVERS_KEY][$server])) {
+            if (!isset($config[self::SERVERS_KEY][$server]))
+            {
                 $variants = \implode(', ', \array_keys($config[self::SERVERS_KEY] ?? []));
                 $message = 'Storage server `%s` of bucket `%s` has not been defined, one of [%s] required';
                 $message = \sprintf($message, $server, $name, $variants);
@@ -352,7 +372,8 @@ 
                 throw new ConfigException($message, 0x0A);
             }
 
-            if (isset($bucket['options']) && !\is_array($bucket['options'])) {
+            if (isset($bucket['options']) && !\is_array($bucket['options']))
+            {
                 $message = 'Storage bucket `%s` options must be an array, but %s defined';
                 $message = \sprintf($message, $name, $this->valueToString($bucket['options']));
 
@@ -373,7 +394,8 @@ 
      */
     private function normalizeTemporaryDirectory(array $config): array
     {
-        if (!isset($config[self::TMP_DIR_KEY])) {
+        if (!isset($config[self::TMP_DIR_KEY]))
+        {
             $config[self::TMP_DIR_KEY] = \sys_get_temp_dir();
 
             return $config;
@@ -381,17 +403,20 @@ 
 
         $directory = $config[self::TMP_DIR_KEY];
 
-        if (!\is_string($directory)) {
+        if (!\is_string($directory))
+        {
             $message = 'Storage temporary directory must be a string, but `%s` defined';
             throw new ConfigException(\sprintf($message, $this->valueToString($directory)), 0x0C);
         }
 
-        if (!\is_dir($directory)) {
+        if (!\is_dir($directory))
+        {
             $message = 'Storage temporary directory `%s` must be a valid directory';
             throw new ConfigException(\sprintf($message, $directory), 0x0D);
         }
 
-        if (!\is_writable($directory)) {
+        if (!\is_writable($directory))
+        {
             $message = 'Storage temporary directory `%s` must be writable';
             throw new ConfigException(\sprintf($message, $directory), 0x0E);
         }

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/Storage.php

Spacing +35 added lines, -35 removed lines

@@ -50,7 +50,7 @@ 
         $this->config = $config;
         $this->uriParser = $uriParser;
 
-        foreach ($config->getBucketsKeys() as $fs) {
+        foreach ($config->getBucketsKeys() as $fs){
             $this->mountFilesystem($fs, new Filesystem(
                 AdapterFactory::build($this->config->buildFileSystemInfo($fs))
             ));
@@ -62,7 +62,7 @@ 
      */
     public function getFileSystem(string $key): FilesystemOperator
     {
-        if (!$this->isFileSystemExists($key)) {
+        if (!$this->isFileSystemExists($key)){
             throw new MountException(\sprintf('Filesystem `%s` has not been defined', $key));
         }
 
@@ -85,9 +85,9 @@ 
         /** @var FilesystemOperator $filesystem */
         [$filesystem, $path] = $this->determineFilesystemAndPath($uri);
 
-        try {
+        try{
             return $filesystem->fileExists($path);
-        } catch (FilesystemException $e) {
+        }catch (FilesystemException $e){
             throw new FileOperationException($e->getMessage(), $e->getCode(), $e);
         }
     }
@@ -100,9 +100,9 @@ 
         /** @var FilesystemOperator $filesystem */
         [$filesystem, $path] = $this->determineFilesystemAndPath($uri);
 
-        try {
+        try{
             return $filesystem->read($path);
-        } catch (FilesystemException $e) {
+        }catch (FilesystemException $e){
             throw new FileOperationException($e->getMessage(), (int)$e->getCode(), $e);
         }
     }
@@ -115,9 +115,9 @@ 
         /** @var FilesystemOperator $filesystem */
         [$filesystem, $path] = $this->determineFilesystemAndPath($uri);
 
-        try {
+        try{
             return $filesystem->readStream($path);
-        } catch (FilesystemException $e) {
+        }catch (FilesystemException $e){
             throw new FileOperationException($e->getMessage(), (int)$e->getCode(), $e);
         }
     }
@@ -130,9 +130,9 @@ 
         /** @var FilesystemOperator $filesystem */
         [$filesystem, $path] = $this->determineFilesystemAndPath($uri);
 
-        try {
+        try{
             return $filesystem->lastModified($path);
-        } catch (FilesystemException $e) {
+        }catch (FilesystemException $e){
             throw new FileOperationException($e->getMessage(), (int)$e->getCode(), $e);
         }
     }
@@ -145,9 +145,9 @@ 
         /** @var FilesystemOperator $filesystem */
         [$filesystem, $path] = $this->determineFilesystemAndPath($uri);
 
-        try {
+        try{
             return $filesystem->fileSize($path);
-        } catch (FilesystemException $e) {
+        }catch (FilesystemException $e){
             throw new FileOperationException($e->getMessage(), (int)$e->getCode(), $e);
         }
     }
@@ -160,9 +160,9 @@ 
         /** @var FilesystemOperator $filesystem */
         [$filesystem, $path] = $this->determineFilesystemAndPath($uri);
 
-        try {
+        try{
             return $filesystem->mimeType($path);
-        } catch (FilesystemException $e) {
+        }catch (FilesystemException $e){
             throw new FileOperationException($e->getMessage(), (int)$e->getCode(), $e);
         }
     }
@@ -175,9 +175,9 @@ 
         /** @var FilesystemOperator $filesystem */
         [$filesystem, $path] = $this->determineFilesystemAndPath($uri);
 
-        try {
+        try{
             return $filesystem->visibility($path);
-        } catch (FilesystemException $e) {
+        }catch (FilesystemException $e){
             throw new FileOperationException($e->getMessage(), (int)$e->getCode(), $e);
         }
     }
@@ -187,24 +187,24 @@ 
      */
     public function tempFilename(string $uri = null): string
     {
-        try {
+        try{
             $prefix = 'tmpStorageFile_';
 
-            if ($uri !== null) {
+            if ($uri !== null){
                 /** @var FilesystemOperator $filesystem */
                 [$filesystem, $path] = $this->determineFilesystemAndPath($uri);
                 $content = $filesystem->readStream($path);
-                $prefix = basename($uri) . '_';
+                $prefix = basename($uri).'_';
             }
 
             $filePath = tempnam($this->config->getTmpDir(), $prefix);
 
-            if (isset($content)) {
+            if (isset($content)){
                 file_put_contents($filePath, $content);
             }
 
             return $filePath;
-        } catch (\Throwable $e) {
+        }catch (\Throwable $e){
             throw new FileOperationException($e->getMessage(), (int)$e->getCode(), $e);
         }
     }
@@ -219,11 +219,11 @@ 
         /** @var FilesystemOperator $filesystem */
         [$filesystem, $path] = $this->determineFilesystemAndPath($uri);
 
-        try {
+        try{
             $filesystem->write($path, $content, $config);
 
             return $uri;
-        } catch (FilesystemException $e) {
+        }catch (FilesystemException $e){
             throw new FileOperationException($e->getMessage(), (int)$e->getCode(), $e);
         }
     }
@@ -238,11 +238,11 @@ 
         /** @var FilesystemOperator $filesystem */
         [$filesystem, $path] = $this->determineFilesystemAndPath($uri);
 
-        try {
+        try{
             $filesystem->writeStream($path, $content, $config);
 
             return $uri;
-        } catch (FilesystemException $e) {
+        }catch (FilesystemException $e){
             throw new FileOperationException($e->getMessage(), (int)$e->getCode(), $e);
         }
     }
@@ -255,9 +255,9 @@ 
         /** @var FilesystemOperator $filesystem */
         [$filesystem, $path] = $this->determineFilesystemAndPath($uri);
 
-        try {
+        try{
             $filesystem->setVisibility($path, $visibility);
-        } catch (FilesystemException $e) {
+        }catch (FilesystemException $e){
             throw new FileOperationException($e->getMessage(), (int)$e->getCode(), $e);
         }
     }
@@ -276,7 +276,7 @@ 
 
         $destinationFilesystem = $this->getFileSystem($destinationFileSystem);
 
-        try {
+        try{
             $targetFilePath = $targetFilePath ?: $sourcePath;
 
             $sourceFilesystem === $destinationFilesystem
@@ -284,7 +284,7 @@ 
                 : $this->moveAcrossFilesystems($sourceUri, $destinationFileSystem, $targetFilePath, $config);
 
             return (string)Uri::create($destinationFileSystem, $targetFilePath);
-        } catch (FilesystemException $e) {
+        }catch (FilesystemException $e){
             throw new FileOperationException($e->getMessage(), (int)$e->getCode(), $e);
         }
     }
@@ -303,7 +303,7 @@ 
 
         $destinationFilesystem = $this->getFileSystem($destinationFileSystem);
 
-        try {
+        try{
             $targetFilePath = $targetFilePath ?: $sourcePath;
 
             $sourceFilesystem === $destinationFilesystem
@@ -318,7 +318,7 @@ 
                 );
 
             return (string)Uri::create($destinationFileSystem, $targetFilePath);
-        } catch (FilesystemException $e) {
+        }catch (FilesystemException $e){
             throw new FileOperationException($e->getMessage(), (int)$e->getCode(), $e);
         }
     }
@@ -331,9 +331,9 @@ 
         /** @var FilesystemOperator $filesystem */
         [$filesystem, $path] = $this->determineFilesystemAndPath($uri);
 
-        try {
+        try{
             $filesystem->delete($path);
-        } catch (FilesystemException $e) {
+        }catch (FilesystemException $e){
             throw new FileOperationException($e->getMessage(), (int)$e->getCode(), $e);
         }
     }
@@ -349,7 +349,7 @@ 
      */
     protected function mountFilesystem(string $key, FilesystemOperator $filesystem): void
     {
-        if ($this->isFileSystemExists($key)) {
+        if ($this->isFileSystemExists($key)){
             throw new MountException(\sprintf('Filesystem %s is already mounted', $key));
         }
 
@@ -454,7 +454,7 @@ 
         string $destinationPath,
         array $config = []
     ): void {
-        if ($sourcePath === $destinationPath && empty($config)) {
+        if ($sourcePath === $destinationPath && empty($config)){
             return;
         }
 

Braces +82 added lines, -34 removed lines

@@ -50,7 +50,8 @@ 
         $this->config = $config;
         $this->uriParser = $uriParser;
 
-        foreach ($config->getBucketsKeys() as $fs) {
+        foreach ($config->getBucketsKeys() as $fs)
+        {
             $this->mountFilesystem($fs, new Filesystem(
                 AdapterFactory::build($this->config->buildFileSystemInfo($fs))
             ));
@@ -62,7 +63,8 @@ 
      */
     public function getFileSystem(string $key): FilesystemOperator
     {
-        if (!$this->isFileSystemExists($key)) {
+        if (!$this->isFileSystemExists($key))
+        {
             throw new MountException(\sprintf('Filesystem `%s` has not been defined', $key));
         }
 
@@ -85,9 +87,12 @@ 
         /** @var FilesystemOperator $filesystem */
         [$filesystem, $path] = $this->determineFilesystemAndPath($uri);
 
-        try {
+        try
+        {
             return $filesystem->fileExists($path);
-        } catch (FilesystemException $e) {
+        }
+        catch (FilesystemException $e)
+        {
             throw new FileOperationException($e->getMessage(), $e->getCode(), $e);
         }
     }
@@ -100,9 +105,12 @@ 
         /** @var FilesystemOperator $filesystem */
         [$filesystem, $path] = $this->determineFilesystemAndPath($uri);
 
-        try {
+        try
+        {
             return $filesystem->read($path);
-        } catch (FilesystemException $e) {
+        }
+        catch (FilesystemException $e)
+        {
             throw new FileOperationException($e->getMessage(), (int)$e->getCode(), $e);
         }
     }
@@ -115,9 +123,12 @@ 
         /** @var FilesystemOperator $filesystem */
         [$filesystem, $path] = $this->determineFilesystemAndPath($uri);
 
-        try {
+        try
+        {
             return $filesystem->readStream($path);
-        } catch (FilesystemException $e) {
+        }
+        catch (FilesystemException $e)
+        {
             throw new FileOperationException($e->getMessage(), (int)$e->getCode(), $e);
         }
     }
@@ -130,9 +141,12 @@ 
         /** @var FilesystemOperator $filesystem */
         [$filesystem, $path] = $this->determineFilesystemAndPath($uri);
 
-        try {
+        try
+        {
             return $filesystem->lastModified($path);
-        } catch (FilesystemException $e) {
+        }
+        catch (FilesystemException $e)
+        {
             throw new FileOperationException($e->getMessage(), (int)$e->getCode(), $e);
         }
     }
@@ -145,9 +159,12 @@ 
         /** @var FilesystemOperator $filesystem */
         [$filesystem, $path] = $this->determineFilesystemAndPath($uri);
 
-        try {
+        try
+        {
             return $filesystem->fileSize($path);
-        } catch (FilesystemException $e) {
+        }
+        catch (FilesystemException $e)
+        {
             throw new FileOperationException($e->getMessage(), (int)$e->getCode(), $e);
         }
     }
@@ -160,9 +177,12 @@ 
         /** @var FilesystemOperator $filesystem */
         [$filesystem, $path] = $this->determineFilesystemAndPath($uri);
 
-        try {
+        try
+        {
             return $filesystem->mimeType($path);
-        } catch (FilesystemException $e) {
+        }
+        catch (FilesystemException $e)
+        {
             throw new FileOperationException($e->getMessage(), (int)$e->getCode(), $e);
         }
     }
@@ -175,9 +195,12 @@ 
         /** @var FilesystemOperator $filesystem */
         [$filesystem, $path] = $this->determineFilesystemAndPath($uri);
 
-        try {
+        try
+        {
             return $filesystem->visibility($path);
-        } catch (FilesystemException $e) {
+        }
+        catch (FilesystemException $e)
+        {
             throw new FileOperationException($e->getMessage(), (int)$e->getCode(), $e);
         }
     }
@@ -187,10 +210,12 @@ 
      */
     public function tempFilename(string $uri = null): string
     {
-        try {
+        try
+        {
             $prefix = 'tmpStorageFile_';
 
-            if ($uri !== null) {
+            if ($uri !== null)
+            {
                 /** @var FilesystemOperator $filesystem */
                 [$filesystem, $path] = $this->determineFilesystemAndPath($uri);
                 $content = $filesystem->readStream($path);
@@ -199,12 +224,15 @@ 
 
             $filePath = tempnam($this->config->getTmpDir(), $prefix);
 
-            if (isset($content)) {
+            if (isset($content))
+            {
                 file_put_contents($filePath, $content);
             }
 
             return $filePath;
-        } catch (\Throwable $e) {
+        }
+        catch (\Throwable $e)
+        {
             throw new FileOperationException($e->getMessage(), (int)$e->getCode(), $e);
         }
     }
@@ -219,11 +247,14 @@ 
         /** @var FilesystemOperator $filesystem */
         [$filesystem, $path] = $this->determineFilesystemAndPath($uri);
 
-        try {
+        try
+        {
             $filesystem->write($path, $content, $config);
 
             return $uri;
-        } catch (FilesystemException $e) {
+        }
+        catch (FilesystemException $e)
+        {
             throw new FileOperationException($e->getMessage(), (int)$e->getCode(), $e);
         }
     }
@@ -238,11 +269,14 @@ 
         /** @var FilesystemOperator $filesystem */
         [$filesystem, $path] = $this->determineFilesystemAndPath($uri);
 
-        try {
+        try
+        {
             $filesystem->writeStream($path, $content, $config);
 
             return $uri;
-        } catch (FilesystemException $e) {
+        }
+        catch (FilesystemException $e)
+        {
             throw new FileOperationException($e->getMessage(), (int)$e->getCode(), $e);
         }
     }
@@ -255,9 +289,12 @@ 
         /** @var FilesystemOperator $filesystem */
         [$filesystem, $path] = $this->determineFilesystemAndPath($uri);
 
-        try {
+        try
+        {
             $filesystem->setVisibility($path, $visibility);
-        } catch (FilesystemException $e) {
+        }
+        catch (FilesystemException $e)
+        {
             throw new FileOperationException($e->getMessage(), (int)$e->getCode(), $e);
         }
     }
@@ -276,7 +313,8 @@ 
 
         $destinationFilesystem = $this->getFileSystem($destinationFileSystem);
 
-        try {
+        try
+        {
             $targetFilePath = $targetFilePath ?: $sourcePath;
 
             $sourceFilesystem === $destinationFilesystem
@@ -284,7 +322,9 @@ 
                 : $this->moveAcrossFilesystems($sourceUri, $destinationFileSystem, $targetFilePath, $config);
 
             return (string)Uri::create($destinationFileSystem, $targetFilePath);
-        } catch (FilesystemException $e) {
+        }
+        catch (FilesystemException $e)
+        {
             throw new FileOperationException($e->getMessage(), (int)$e->getCode(), $e);
         }
     }
@@ -303,7 +343,8 @@ 
 
         $destinationFilesystem = $this->getFileSystem($destinationFileSystem);
 
-        try {
+        try
+        {
             $targetFilePath = $targetFilePath ?: $sourcePath;
 
             $sourceFilesystem === $destinationFilesystem
@@ -318,7 +359,9 @@ 
                 );
 
             return (string)Uri::create($destinationFileSystem, $targetFilePath);
-        } catch (FilesystemException $e) {
+        }
+        catch (FilesystemException $e)
+        {
             throw new FileOperationException($e->getMessage(), (int)$e->getCode(), $e);
         }
     }
@@ -331,9 +374,12 @@ 
         /** @var FilesystemOperator $filesystem */
         [$filesystem, $path] = $this->determineFilesystemAndPath($uri);
 
-        try {
+        try
+        {
             $filesystem->delete($path);
-        } catch (FilesystemException $e) {
+        }
+        catch (FilesystemException $e)
+        {
             throw new FileOperationException($e->getMessage(), (int)$e->getCode(), $e);
         }
     }
@@ -349,7 +395,8 @@ 
      */
     protected function mountFilesystem(string $key, FilesystemOperator $filesystem): void
     {
-        if ($this->isFileSystemExists($key)) {
+        if ($this->isFileSystemExists($key))
+        {
             throw new MountException(\sprintf('Filesystem %s is already mounted', $key));
         }
 
@@ -454,7 +501,8 @@ 
         string $destinationPath,
         array $config = []
     ): void {
-        if ($sourcePath === $destinationPath && empty($config)) {
+        if ($sourcePath === $destinationPath && empty($config))
+        {
             return;
         }
 

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: