spiral / framework

src/Storage/src/Config/StorageConfig.php

Spacing +15 added lines, -15 removed lines

@@ -77,8 +77,8 @@ 
 
     private function bootStorages(array $config): void
     {
-        foreach ($config['buckets'] as $name => $bucket) {
-            if (!\is_string($name)) {
+        foreach ($config['buckets'] as $name => $bucket){
+            if (!\is_string($name)){
                 throw new InvalidArgumentException(
                     \vsprintf('Storage bucket config key must be a string, but %s defined', [
                         \get_debug_type($name),
@@ -87,7 +87,7 @@ 
             }
 
             $serverName = $bucket['server'] ?? null;
-            if (!\is_string($serverName)) {
+            if (!\is_string($serverName)){
                 throw new InvalidArgumentException(
                     \vsprintf('Storage bucket `%s.server` config key required and must be a string, but %s defined', [
                         $name,
@@ -97,7 +97,7 @@ 
             }
 
             $server = $config['servers'][$serverName] ?? null;
-            if (!\is_array($server)) {
+            if (!\is_array($server)){
                 throw new InvalidArgumentException(
                     \vsprintf('Storage bucket `%s` relates to non-existing server `%s`', [
                         $name,
@@ -107,7 +107,7 @@ 
             }
 
             $adapter = $server['adapter'] ?? null;
-            if (!\is_string($adapter)) {
+            if (!\is_string($adapter)){
                 throw new InvalidArgumentException(
                     \vsprintf('Storage server `%s.adapter` config key required and must be a string, but %s defined', [
                         $serverName,
@@ -120,7 +120,7 @@ 
 
             $this->adapters[$name] = $adapter;
 
-            if (isset($bucket['distribution'])) {
+            if (isset($bucket['distribution'])){
                 $this->distributions[$name] = $bucket['distribution'];
             }
         }
@@ -138,9 +138,9 @@ 
 
     private function createS3Adapter(string $serverName, array $bucket, array $server, bool $async): FilesystemAdapter
     {
-        if (!\class_exists(Credentials::class)) {
+        if (!\class_exists(Credentials::class)){
             throw new ConfigException(
-                'Can not create AWS credentials while creating "' . $serverName . '" server. '
+                'Can not create AWS credentials while creating "'.$serverName.'" server. '
                 . 'Perhaps you forgot to install the "league/flysystem-aws-s3-v3" package?'
             );
         }
@@ -160,8 +160,8 @@ 
         $name = $bucket['bucket'] ?? $server['bucket'];
         $visibility = $bucket['visibility'] ?? $server['bucket'] ?? Visibility::VISIBILITY_PUBLIC;
 
-        if ($async) {
-            if (!\class_exists(AsyncAwsS3Adapter::class)) {
+        if ($async){
+            if (!\class_exists(AsyncAwsS3Adapter::class)){
                 throw new InvalidArgumentException(
                     'Can not create async S3 client, please install "league/flysystem-async-aws-s3"'
                 );
@@ -177,7 +177,7 @@ 
             );
         }
 
-        if (!\class_exists(AwsS3V3Adapter::class)) {
+        if (!\class_exists(AwsS3V3Adapter::class)){
             throw new InvalidArgumentException(
                 'Can not create S3 client, please install "league/flysystem-aws-s3-v3"'
             );
@@ -195,7 +195,7 @@ 
 
     private function createLocalAdapter(string $serverName, array $bucket, array $server): FilesystemAdapter
     {
-        if (!\is_string($server['directory'] ?? null)) {
+        if (!\is_string($server['directory'] ?? null)){
             throw new InvalidArgumentException(
                 \vsprintf('Storage server `%s.directory` config key required and must be a string, but %s defined', [
                     $serverName,
@@ -225,7 +225,7 @@ 
         $adapter = $server['adapter'];
         $isFilesystemAdapter = \is_subclass_of($adapter, FilesystemAdapter::class, true);
 
-        if (!$isFilesystemAdapter) {
+        if (!$isFilesystemAdapter){
             throw new InvalidArgumentException(
                 \vsprintf('Storage server `%s` must be a class string of %s, but `%s` defined', [
                     $serverName,
@@ -235,9 +235,9 @@ 
             );
         }
 
-        try {
+        try{
             return new $adapter(...\array_values($server['options'] ?? []));
-        } catch (\Throwable $e) {
+        }catch (\Throwable $e){
             $message = 'An error occurred while server `%s` initializing: %s';
             throw new InvalidArgumentException(\sprintf($message, $serverName, $e->getMessage()), 0, $e);
         }

Braces +29 added lines, -14 removed lines

@@ -77,8 +77,10 @@ 
 
     private function bootStorages(array $config): void
     {
-        foreach ($config['buckets'] as $name => $bucket) {
-            if (!\is_string($name)) {
+        foreach ($config['buckets'] as $name => $bucket)
+        {
+            if (!\is_string($name))
+            {
                 throw new InvalidArgumentException(
                     \vsprintf('Storage bucket config key must be a string, but %s defined', [
                         \get_debug_type($name),
@@ -87,7 +89,8 @@ 
             }
 
             $serverName = $bucket['server'] ?? null;
-            if (!\is_string($serverName)) {
+            if (!\is_string($serverName))
+            {
                 throw new InvalidArgumentException(
                     \vsprintf('Storage bucket `%s.server` config key required and must be a string, but %s defined', [
                         $name,
@@ -97,7 +100,8 @@ 
             }
 
             $server = $config['servers'][$serverName] ?? null;
-            if (!\is_array($server)) {
+            if (!\is_array($server))
+            {
                 throw new InvalidArgumentException(
                     \vsprintf('Storage bucket `%s` relates to non-existing server `%s`', [
                         $name,
@@ -107,7 +111,8 @@ 
             }
 
             $adapter = $server['adapter'] ?? null;
-            if (!\is_string($adapter)) {
+            if (!\is_string($adapter))
+            {
                 throw new InvalidArgumentException(
                     \vsprintf('Storage server `%s.adapter` config key required and must be a string, but %s defined', [
                         $serverName,
@@ -120,7 +125,8 @@ 
 
             $this->adapters[$name] = $adapter;
 
-            if (isset($bucket['distribution'])) {
+            if (isset($bucket['distribution']))
+            {
                 $this->distributions[$name] = $bucket['distribution'];
             }
         }
@@ -138,7 +144,8 @@ 
 
     private function createS3Adapter(string $serverName, array $bucket, array $server, bool $async): FilesystemAdapter
     {
-        if (!\class_exists(Credentials::class)) {
+        if (!\class_exists(Credentials::class))
+        {
             throw new ConfigException(
                 'Can not create AWS credentials while creating "' . $serverName . '" server. '
                 . 'Perhaps you forgot to install the "league/flysystem-aws-s3-v3" package?'
@@ -160,8 +167,10 @@ 
         $name = $bucket['bucket'] ?? $server['bucket'];
         $visibility = $bucket['visibility'] ?? $server['bucket'] ?? Visibility::VISIBILITY_PUBLIC;
 
-        if ($async) {
-            if (!\class_exists(AsyncAwsS3Adapter::class)) {
+        if ($async)
+        {
+            if (!\class_exists(AsyncAwsS3Adapter::class))
+            {
                 throw new InvalidArgumentException(
                     'Can not create async S3 client, please install "league/flysystem-async-aws-s3"'
                 );
@@ -177,7 +186,8 @@ 
             );
         }
 
-        if (!\class_exists(AwsS3V3Adapter::class)) {
+        if (!\class_exists(AwsS3V3Adapter::class))
+        {
             throw new InvalidArgumentException(
                 'Can not create S3 client, please install "league/flysystem-aws-s3-v3"'
             );
@@ -195,7 +205,8 @@ 
 
     private function createLocalAdapter(string $serverName, array $bucket, array $server): FilesystemAdapter
     {
-        if (!\is_string($server['directory'] ?? null)) {
+        if (!\is_string($server['directory'] ?? null))
+        {
             throw new InvalidArgumentException(
                 \vsprintf('Storage server `%s.directory` config key required and must be a string, but %s defined', [
                     $serverName,
@@ -225,7 +236,8 @@ 
         $adapter = $server['adapter'];
         $isFilesystemAdapter = \is_subclass_of($adapter, FilesystemAdapter::class, true);
 
-        if (!$isFilesystemAdapter) {
+        if (!$isFilesystemAdapter)
+        {
             throw new InvalidArgumentException(
                 \vsprintf('Storage server `%s` must be a class string of %s, but `%s` defined', [
                     $serverName,
@@ -235,9 +247,12 @@ 
             );
         }
 
-        try {
+        try
+        {
             return new $adapter(...\array_values($server['options'] ?? []));
-        } catch (\Throwable $e) {
+        }
+        catch (\Throwable $e)
+        {
             $message = 'An error occurred while server `%s` initializing: %s';
             throw new InvalidArgumentException(\sprintf($message, $serverName, $e->getMessage()), 0, $e);
         }

src/Storage/src/Bucket.php

Spacing +1 added lines, -1 removed lines

@@ -21,7 +21,7 @@
         protected FilesystemOperator $fs,
         protected ?string $name = null,
         protected ?UriResolverInterface $resolver = null
-    ) {
+    ){
     }
 
     public function getName(): ?string

src/Storage/src/StorageInterface.php

Spacing +1 added lines, -1 removed lines

@@ -28,7 +28,7 @@
     /**
      * @throws InvalidArgumentException
      */
-    public function file(string|\Stringable $id): FileInterface;
+    public function file(string | \Stringable $id): FileInterface;
 
     public function withDefault(string $name): self;
 }

src/Storage/src/Storage.php

Spacing +10 added lines, -10 removed lines

@@ -55,14 +55,14 @@ 
     {
         $name ??= $this->default;
 
-        if (!isset($this->buckets[$name])) {
+        if (!isset($this->buckets[$name])){
             throw new InvalidArgumentException(\sprintf(self::ERROR_NOT_FOUND, $name));
         }
 
         return $this->buckets[$name];
     }
 
-    public function file(string|\Stringable $id): FileInterface
+    public function file(string | \Stringable $id): FileInterface
     {
         [$bucket, $file] = $this->parseUri($id);
 
@@ -71,7 +71,7 @@ 
 
     public function add(string $name, BucketInterface $storage, bool $overwrite = false): void
     {
-        if (!$overwrite && isset($this->buckets[$name])) {
+        if (!$overwrite && isset($this->buckets[$name])){
             throw new \InvalidArgumentException(\sprintf(self::ERROR_REDEFINITION, $name));
         }
 
@@ -92,35 +92,35 @@ 
      * @return array{0: string|null, 1: string}
      * @throws InvalidArgumentException
      */
-    protected function parseUri(string|\Stringable $uri, bool $withScheme = true): array
+    protected function parseUri(string | \Stringable $uri, bool $withScheme = true): array
     {
         $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'] ?? '', '/'),
         ];
     }
 
-    private function uriToString(string|\Stringable $uri): string
+    private function uriToString(string | \Stringable $uri): string
     {
         return match (true) {
             \is_string($uri) => $uri,
-            default => (string) $uri
+            default => (string)$uri
         };
     }
 }

Braces +10 added lines, -5 removed lines

@@ -55,7 +55,8 @@ 
     {
         $name ??= $this->default;
 
-        if (!isset($this->buckets[$name])) {
+        if (!isset($this->buckets[$name]))
+        {
             throw new InvalidArgumentException(\sprintf(self::ERROR_NOT_FOUND, $name));
         }
 
@@ -71,7 +72,8 @@ 
 
     public function add(string $name, BucketInterface $storage, bool $overwrite = false): void
     {
-        if (!$overwrite && isset($this->buckets[$name])) {
+        if (!$overwrite && isset($this->buckets[$name]))
+        {
             throw new \InvalidArgumentException(\sprintf(self::ERROR_REDEFINITION, $name));
         }
 
@@ -97,16 +99,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'] = '';
         }
 

src/Storage/src/Storage/ReadableTrait.php

Spacing +8 added lines, -8 removed lines

@@ -18,21 +18,21 @@ 
      */
     abstract public function bucket(string $name = null): BucketInterface;
 
-    public function getContents(string|\Stringable $id): string
+    public function getContents(string | \Stringable $id): string
     {
         [$name, $pathname] = $this->parseUri($id);
 
         return $this->bucket($name)->getContents($pathname);
     }
 
-    public function getStream(string|\Stringable $id)
+    public function getStream(string | \Stringable $id)
     {
         [$name, $pathname] = $this->parseUri($id);
 
         return $this->bucket($name)->getStream($pathname);
     }
 
-    public function exists(string|\Stringable $id): bool
+    public function exists(string | \Stringable $id): bool
     {
         [$name, $pathname] = $this->parseUri($id);
 
@@ -42,7 +42,7 @@ 
     /**
      * @return positive-int|0
      */
-    public function getLastModified(string|\Stringable $id): int
+    public function getLastModified(string | \Stringable $id): int
     {
         [$name, $pathname] = $this->parseUri($id);
 
@@ -52,14 +52,14 @@ 
     /**
      * @return positive-int|0
      */
-    public function getSize(string|\Stringable $id): int
+    public function getSize(string | \Stringable $id): int
     {
         [$name, $pathname] = $this->parseUri($id);
 
         return $this->bucket($name)->getSize($pathname);
     }
 
-    public function getMimeType(string|\Stringable $id): string
+    public function getMimeType(string | \Stringable $id): string
     {
         [$name, $pathname] = $this->parseUri($id);
 
@@ -70,7 +70,7 @@ 
      * @return Visibility::VISIBILITY_*
      */
     #[ExpectedValues(valuesFromClass: Visibility::class)]
-    public function getVisibility(string|\Stringable $id): string
+    public function getVisibility(string | \Stringable $id): string
     {
         [$name, $pathname] = $this->parseUri($id);
 
@@ -80,5 +80,5 @@ 
     /**
      * {@see Storage::parseUri()}
      */
-    abstract protected function parseUri(string|\Stringable $uri, bool $withScheme = true): array;
+    abstract protected function parseUri(string | \Stringable $uri, bool $withScheme = true): array;
 }

src/Storage/src/Storage/WritableInterface.php

Spacing +8 added lines, -8 removed lines

@@ -25,7 +25,7 @@ 
      * @throws FileOperationException
      * @throws InvalidArgumentException
      */
-    public function create(string|\Stringable $id, array $config = []): FileInterface;
+    public function create(string | \Stringable $id, array $config = []): FileInterface;
 
     /**
      * {@see BucketInterface::write()}
@@ -34,7 +34,7 @@ 
      * @throws FileOperationException
      * @throws InvalidArgumentException
      */
-    public function write(string|\Stringable $id, mixed $content, array $config = []): FileInterface;
+    public function write(string | \Stringable $id, mixed $content, array $config = []): FileInterface;
 
     /**
      * {@see BucketInterface::setVisibility()}
@@ -44,7 +44,7 @@ 
      * @throws InvalidArgumentException
      */
     public function setVisibility(
-        string|\Stringable $id,
+        string | \Stringable $id,
         #[ExpectedValues(valuesFromClass: Visibility::class)]
         string $visibility
     ): FileInterface;
@@ -56,8 +56,8 @@ 
      * @throws InvalidArgumentException
      */
     public function copy(
-        string|\Stringable $source,
-        string|\Stringable $destination,
+        string | \Stringable $source,
+        string | \Stringable $destination,
         array $config = []
     ): FileInterface;
 
@@ -68,8 +68,8 @@ 
      * @throws InvalidArgumentException
      */
     public function move(
-        string|\Stringable $source,
-        string|\Stringable $destination,
+        string | \Stringable $source,
+        string | \Stringable $destination,
         array $config = []
     ): FileInterface;
 
@@ -79,5 +79,5 @@ 
      * @throws FileOperationException
      * @throws InvalidArgumentException
      */
-    public function delete(string|\Stringable $id, bool $clean = false): void;
+    public function delete(string | \Stringable $id, bool $clean = false): void;
 }

src/Storage/src/Storage/ReadableInterface.php

Spacing +7 added lines, -7 removed lines

@@ -23,7 +23,7 @@ 
      * @throws FileOperationException
      * @throws InvalidArgumentException
      */
-    public function getContents(string|\Stringable $id): string;
+    public function getContents(string | \Stringable $id): string;
 
     /**
      * {@see BucketInterface::getStream()}
@@ -32,7 +32,7 @@ 
      * @throws FileOperationException
      * @throws InvalidArgumentException
      */
-    public function getStream(string|\Stringable $id);
+    public function getStream(string | \Stringable $id);
 
     /**
      * {@see BucketInterface::exists()}
@@ -40,7 +40,7 @@ 
      * @throws FileOperationException
      * @throws InvalidArgumentException
      */
-    public function exists(string|\Stringable $id): bool;
+    public function exists(string | \Stringable $id): bool;
 
     /**
      * {@see BucketInterface::getLastModified()}
@@ -49,7 +49,7 @@ 
      * @throws FileOperationException
      * @throws InvalidArgumentException
      */
-    public function getLastModified(string|\Stringable $id): int;
+    public function getLastModified(string | \Stringable $id): int;
 
     /**
      * {@see BucketInterface::getSize()}
@@ -58,7 +58,7 @@ 
      * @throws FileOperationException
      * @throws InvalidArgumentException
      */
-    public function getSize(string|\Stringable $id): int;
+    public function getSize(string | \Stringable $id): int;
 
     /**
      *{@see BucketInterface::getMimeType()}
@@ -66,7 +66,7 @@ 
      * @throws FileOperationException
      * @throws InvalidArgumentException
      */
-    public function getMimeType(string|\Stringable $id): string;
+    public function getMimeType(string | \Stringable $id): string;
 
     /**
      * {@see BucketInterface::getVisibility()}
@@ -76,5 +76,5 @@ 
      * @throws InvalidArgumentException
      */
     #[ExpectedValues(valuesFromClass: Visibility::class)]
-    public function getVisibility(string|\Stringable $id): string;
+    public function getVisibility(string | \Stringable $id): string;
 }

src/Storage/src/Storage/WritableTrait.php

Spacing +9 added lines, -9 removed lines

@@ -19,14 +19,14 @@ 
      */
     abstract public function bucket(string $name = null): BucketInterface;
 
-    public function create(string|\Stringable $id, array $config = []): FileInterface
+    public function create(string | \Stringable $id, array $config = []): FileInterface
     {
         [$name, $pathname] = $this->parseUri($id);
 
         return $this->bucket($name)->create($pathname, $config);
     }
 
-    public function write(string|\Stringable $id, mixed $content, array $config = []): FileInterface
+    public function write(string | \Stringable $id, mixed $content, array $config = []): FileInterface
     {
         [$name, $pathname] = $this->parseUri($id);
 
@@ -34,7 +34,7 @@ 
     }
 
     public function setVisibility(
-        string|\Stringable $id,
+        string | \Stringable $id,
         #[ExpectedValues(valuesFromClass: Visibility::class)]
         string $visibility
     ): FileInterface {
@@ -44,8 +44,8 @@ 
     }
 
     public function copy(
-        string|\Stringable $source,
-        string|\Stringable $destination,
+        string | \Stringable $source,
+        string | \Stringable $destination,
         array $config = []
     ): FileInterface {
         [$sourceName, $sourcePathname] = $this->parseUri($source);
@@ -58,8 +58,8 @@ 
     }
 
     public function move(
-        string|\Stringable $source,
-        string|\Stringable $destination,
+        string | \Stringable $source,
+        string | \Stringable $destination,
         array $config = []
     ): FileInterface {
         [$sourceName, $sourcePathname] = $this->parseUri($source);
@@ -71,7 +71,7 @@ 
         return $sourceStorage->move($sourcePathname, $destPathname, $destStorage, $config);
     }
 
-    public function delete(string|\Stringable $id, bool $clean = false): void
+    public function delete(string | \Stringable $id, bool $clean = false): void
     {
         [$name, $pathname] = $this->parseUri($id);
 
@@ -83,5 +83,5 @@ 
     /**
      * {@see Storage::parseUri()}
      */
-    abstract protected function parseUri(string|\Stringable $uri, bool $withScheme = true): array;
+    abstract protected function parseUri(string | \Stringable $uri, bool $withScheme = true): array;
 }

src/Storage/src/Bootloader/StorageBootloader.php

Spacing +6 added lines, -6 removed lines

@@ -30,7 +30,7 @@ 
 
     public function __construct(
         private readonly ConfiguratorInterface $config
-    ) {
+    ){
     }
 
     public function init(BinderInterface $binder, EnvironmentInterface $env): void
@@ -45,18 +45,18 @@ 
             BucketFactoryInterface $bucketFactory,
             StorageConfig $config,
             FactoryInterface $factory
-        ) {
+        ){
             $manager = new Storage($config->getDefaultBucket());
 
             $distributions = $config->getDistributions();
 
-            foreach ($config->getAdapters() as $name => $adapter) {
+            foreach ($config->getAdapters() as $name => $adapter){
                 $resolver = null;
 
-                if (isset($distributions[$name])) {
-                    try {
+                if (isset($distributions[$name])){
+                    try{
                         $cdn = $factory->make(CdnInterface::class);
-                    } catch (NotFoundException $e) {
+                    }catch (NotFoundException $e){
                         $message = 'Unable to create distribution for bucket "%s". '
                             . 'Please make sure that bootloader %s is added in your application';
                         $message = \sprintf($message, $name, DistributionBootloader::class);

Braces +9 added lines, -4 removed lines

@@ -50,13 +50,18 @@
 
             $distributions = $config->getDistributions();
 
-            foreach ($config->getAdapters() as $name => $adapter) {
+            foreach ($config->getAdapters() as $name => $adapter)
+            {
                 $resolver = null;
 
-                if (isset($distributions[$name])) {
-                    try {
+                if (isset($distributions[$name]))
+                {
+                    try
+                    {
                         $cdn = $factory->make(CdnInterface::class);
-                    } catch (NotFoundException $e) {
+                    }
+                    catch (NotFoundException $e)
+                    {
                         $message = 'Unable to create distribution for bucket "%s". '
                             . 'Please make sure that bootloader %s is added in your application';
                         $message = \sprintf($message, $name, DistributionBootloader::class);