spiral / framework

src/Prototype/src/ClassNode/ConstructorParam.php

Spacing +2 added lines, -2 removed lines

@@ -56,13 +56,13 @@
         $stmt->name = $parameter->getName();
 
         $type = $parameter->getType();
-        if ($type instanceof \ReflectionNamedType) {
+        if ($type instanceof \ReflectionNamedType){
             $stmt->type = Type::create($type->getName());
             $stmt->builtIn = $type->isBuiltin();
             $stmt->nullable = $type->allowsNull();
         }
 
-        if ($parameter->isDefaultValueAvailable()) {
+        if ($parameter->isDefaultValueAvailable()){
             $stmt->hasDefault = true;
             $stmt->default = $parameter->getDefaultValue();
         }

Braces +4 added lines, -2 removed lines

@@ -56,13 +56,15 @@
         $stmt->name = $parameter->getName();
 
         $type = $parameter->getType();
-        if ($type instanceof \ReflectionNamedType) {
+        if ($type instanceof \ReflectionNamedType)
+        {
             $stmt->type = Type::create($type->getName());
             $stmt->builtIn = $type->isBuiltin();
             $stmt->nullable = $type->allowsNull();
         }
 
-        if ($parameter->isDefaultValueAvailable()) {
+        if ($parameter->isDefaultValueAvailable())
+        {
             $stmt->hasDefault = true;
             $stmt->default = $parameter->getDefaultValue();
         }

src/Attributes/src/polyfill.php

Spacing +4 added lines, -4 removed lines

@@ -13,7 +13,7 @@ 
 
     use Doctrine\Common\Annotations\Annotation\NamedArgumentConstructor;
 
-    if (!\interface_exists(NamedArgumentConstructorAnnotation::class)) {
+    if (!\interface_exists(NamedArgumentConstructorAnnotation::class)){
         /**
          * Marker interface for PHP7/PHP8 compatible support for named
          * arguments (and constructor property promotion).
@@ -31,7 +31,7 @@ 
 
 namespace Doctrine\Common\Annotations\Annotation {
 
-    if (!\class_exists(NamedArgumentConstructor::class, false)) {
+    if (!\class_exists(NamedArgumentConstructor::class, false)){
         /**
          * Annotation that indicates that the annotated class should be
          * constructed with a named argument call.
@@ -51,7 +51,7 @@ 
 
     use JetBrains\PhpStorm\ExpectedValues;
 
-    if (!\class_exists(Attribute::class, false)) {
+    if (!\class_exists(Attribute::class, false)){
         #[Attribute(Attribute::TARGET_CLASS)]
         final class Attribute
         {
@@ -127,7 +127,7 @@ 
             public function __construct(
                 #[ExpectedValues(flagsFromClass: Attribute::class)]
                 int $flags = self::TARGET_ALL
-            ) {
+            ){
             }
         }
     }

Braces +6 added lines, -3 removed lines

@@ -13,7 +13,8 @@ 
 
     use Doctrine\Common\Annotations\Annotation\NamedArgumentConstructor;
 
-    if (!\interface_exists(NamedArgumentConstructorAnnotation::class)) {
+    if (!\interface_exists(NamedArgumentConstructorAnnotation::class))
+    {
         /**
          * Marker interface for PHP7/PHP8 compatible support for named
          * arguments (and constructor property promotion).
@@ -31,7 +32,8 @@ 
 
 namespace Doctrine\Common\Annotations\Annotation {
 
-    if (!\class_exists(NamedArgumentConstructor::class, false)) {
+    if (!\class_exists(NamedArgumentConstructor::class, false))
+    {
         /**
          * Annotation that indicates that the annotated class should be
          * constructed with a named argument call.
@@ -51,7 +53,8 @@ 
 
     use JetBrains\PhpStorm\ExpectedValues;
 
-    if (!\class_exists(Attribute::class, false)) {
+    if (!\class_exists(Attribute::class, false))
+    {
         #[Attribute(Attribute::TARGET_CLASS)]
         final class Attribute
         {

src/Storage/src/Storage.php

Spacing +7 added lines, -7 removed lines

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

Braces +12 added lines, -6 removed lines

@@ -77,7 +77,8 @@ 
     {
         $name = $name ?? $this->default;
 
-        if (!isset($this->buckets[$name])) {
+        if (!isset($this->buckets[$name]))
+        {
             throw new InvalidArgumentException(\sprintf(self::ERROR_NOT_FOUND, $name));
         }
 
@@ -99,7 +100,8 @@ 
      */
     public function add(string $name, BucketInterface $storage, bool $overwrite = false): void
     {
-        if ($overwrite === false && isset($this->buckets[$name])) {
+        if ($overwrite === false && isset($this->buckets[$name]))
+        {
             throw new \InvalidArgumentException(\sprintf(self::ERROR_REDEFINITION, $name));
         }
 
@@ -133,16 +135,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'] = '';
         }
 
@@ -159,7 +164,8 @@ 
      */
     private function uriToString($uri): string
     {
-        switch (true) {
+        switch (true)
+        {
             case $uri instanceof UriInterface:
             case $uri instanceof \Stringable:
             case \is_object($uri) && \method_exists($uri, '__toString'):

src/Storage/src/File.php

Spacing +1 added lines, -1 removed lines

@@ -64,7 +64,7 @@
     {
         $name = $this->storage->getName();
 
-        if ($name === null) {
+        if ($name === null){
             return $this->getPathname();
         }
 

Braces +2 added lines, -1 removed lines

@@ -64,7 +64,8 @@
     {
         $name = $this->storage->getName();
 
-        if ($name === null) {
+        if ($name === null)
+        {
             return $this->getPathname();
         }
 

src/Storage/src/Bucket/ReadableTrait.php

Spacing +14 added lines, -14 removed lines

@@ -29,9 +29,9 @@ 
     {
         $fs = $this->getOperator();
 
-        try {
+        try{
             return $fs->fileExists($pathname);
-        } catch (FilesystemException $e) {
+        }catch (FilesystemException $e){
             throw new FileOperationException($e->getMessage(), (int)$e->getCode(), $e);
         }
     }
@@ -43,9 +43,9 @@ 
     {
         $fs = $this->getOperator();
 
-        try {
+        try{
             return $fs->read($pathname);
-        } catch (FilesystemException $e) {
+        }catch (FilesystemException $e){
             throw new FileOperationException($e->getMessage(), (int)$e->getCode(), $e);
         }
     }
@@ -57,9 +57,9 @@ 
     {
         $fs = $this->getOperator();
 
-        try {
+        try{
             return $fs->readStream($pathname);
-        } catch (FilesystemException $e) {
+        }catch (FilesystemException $e){
             throw new FileOperationException($e->getMessage(), (int)$e->getCode(), $e);
         }
     }
@@ -71,9 +71,9 @@ 
     {
         $fs = $this->getOperator();
 
-        try {
+        try{
             return $fs->lastModified($pathname);
-        } catch (FilesystemException $e) {
+        }catch (FilesystemException $e){
             throw new FileOperationException($e->getMessage(), (int)$e->getCode(), $e);
         }
     }
@@ -85,9 +85,9 @@ 
     {
         $fs = $this->getOperator();
 
-        try {
+        try{
             return $fs->fileSize($pathname);
-        } catch (FilesystemException $e) {
+        }catch (FilesystemException $e){
             throw new FileOperationException($e->getMessage(), (int)$e->getCode(), $e);
         }
     }
@@ -99,9 +99,9 @@ 
     {
         $fs = $this->getOperator();
 
-        try {
+        try{
             return $fs->mimeType($pathname);
-        } catch (FilesystemException $e) {
+        }catch (FilesystemException $e){
             throw new FileOperationException($e->getMessage(), (int)$e->getCode(), $e);
         }
     }
@@ -114,11 +114,11 @@ 
     {
         $fs = $this->getOperator();
 
-        try {
+        try{
             return $this->fromFlysystemVisibility(
                 $fs->visibility($pathname)
             );
-        } catch (FilesystemException $e) {
+        }catch (FilesystemException $e){
             throw new FileOperationException($e->getMessage(), (int)$e->getCode(), $e);
         }
     }

Braces +35 added lines, -14 removed lines

@@ -29,9 +29,12 @@ 
     {
         $fs = $this->getOperator();
 
-        try {
+        try
+        {
             return $fs->fileExists($pathname);
-        } catch (FilesystemException $e) {
+        }
+        catch (FilesystemException $e)
+        {
             throw new FileOperationException($e->getMessage(), (int)$e->getCode(), $e);
         }
     }
@@ -43,9 +46,12 @@ 
     {
         $fs = $this->getOperator();
 
-        try {
+        try
+        {
             return $fs->read($pathname);
-        } catch (FilesystemException $e) {
+        }
+        catch (FilesystemException $e)
+        {
             throw new FileOperationException($e->getMessage(), (int)$e->getCode(), $e);
         }
     }
@@ -57,9 +63,12 @@ 
     {
         $fs = $this->getOperator();
 
-        try {
+        try
+        {
             return $fs->readStream($pathname);
-        } catch (FilesystemException $e) {
+        }
+        catch (FilesystemException $e)
+        {
             throw new FileOperationException($e->getMessage(), (int)$e->getCode(), $e);
         }
     }
@@ -71,9 +80,12 @@ 
     {
         $fs = $this->getOperator();
 
-        try {
+        try
+        {
             return $fs->lastModified($pathname);
-        } catch (FilesystemException $e) {
+        }
+        catch (FilesystemException $e)
+        {
             throw new FileOperationException($e->getMessage(), (int)$e->getCode(), $e);
         }
     }
@@ -85,9 +97,12 @@ 
     {
         $fs = $this->getOperator();
 
-        try {
+        try
+        {
             return $fs->fileSize($pathname);
-        } catch (FilesystemException $e) {
+        }
+        catch (FilesystemException $e)
+        {
             throw new FileOperationException($e->getMessage(), (int)$e->getCode(), $e);
         }
     }
@@ -99,9 +114,12 @@ 
     {
         $fs = $this->getOperator();
 
-        try {
+        try
+        {
             return $fs->mimeType($pathname);
-        } catch (FilesystemException $e) {
+        }
+        catch (FilesystemException $e)
+        {
             throw new FileOperationException($e->getMessage(), (int)$e->getCode(), $e);
         }
     }
@@ -114,11 +132,14 @@ 
     {
         $fs = $this->getOperator();
 
-        try {
+        try
+        {
             return $this->fromFlysystemVisibility(
                 $fs->visibility($pathname)
             );
-        } catch (FilesystemException $e) {
+        }
+        catch (FilesystemException $e)
+        {
             throw new FileOperationException($e->getMessage(), (int)$e->getCode(), $e);
         }
     }

Upper-Lower-Casing +1 added lines, -1 removed lines

@@ -136,7 +136,7 @@
         #[ExpectedValues(valuesFromClass: \League\Flysystem\Visibility::class)]
         string $visibility
     ): string {
-        return $visibility === \League\Flysystem\Visibility::PUBLIC
+        return $visibility === \League\Flysystem\Visibility::public
             ? Visibility::VISIBILITY_PUBLIC
             : Visibility::VISIBILITY_PRIVATE;
     }

src/Storage/src/Bucket/WritableTrait.php

Spacing +23 added lines, -23 removed lines

@@ -29,7 +29,7 @@ 
      */
     public function create(string $pathname, array $config = []): FileInterface
     {
-        if ($this instanceof ReadableInterface && !$this->exists($pathname)) {
+        if ($this instanceof ReadableInterface && !$this->exists($pathname)){
             return $this->write($pathname, '', $config);
         }
 
@@ -45,8 +45,8 @@ 
 
         $fs = $this->getOperator();
 
-        try {
-            switch (true) {
+        try{
+            switch (true){
                 case \is_object($content):
                 case \is_string($content):
                     $fs->write($pathname, (string)$content, $config);
@@ -60,7 +60,7 @@ 
                     $message = 'Content must be a resource stream or stringable type, but %s passed';
                     throw new \InvalidArgumentException(\sprintf($message, \get_debug_type($content)));
             }
-        } catch (FilesystemException $e) {
+        }catch (FilesystemException $e){
             throw new FileOperationException($e->getMessage(), (int)$e->getCode(), $e);
         }
 
@@ -77,9 +77,9 @@ 
     ): FileInterface {
         $fs = $this->getOperator();
 
-        try {
+        try{
             $fs->setVisibility($pathname, $this->toFlysystemVisibility($visibility));
-        } catch (FilesystemException $e) {
+        }catch (FilesystemException $e){
             throw new FileOperationException($e->getMessage(), (int)$e->getCode(), $e);
         }
 
@@ -97,10 +97,10 @@ 
     ): FileInterface {
         $fs = $this->getOperator();
 
-        if ($storage === null || $storage === $this) {
-            try {
+        if ($storage === null || $storage === $this){
+            try{
                 $fs->copy($source, $destination, $config);
-            } catch (FilesystemException $e) {
+            }catch (FilesystemException $e){
                 throw new FileOperationException($e->getMessage(), (int)$e->getCode(), $e);
             }
 
@@ -121,10 +121,10 @@ 
     ): FileInterface {
         $fs = $this->getOperator();
 
-        if ($storage === null || $storage === $this) {
-            try {
+        if ($storage === null || $storage === $this){
+            try{
                 $fs->move($source, $destination, $config);
-            } catch (FilesystemException $e) {
+            }catch (FilesystemException $e){
                 throw new FileOperationException($e->getMessage(), (int)$e->getCode(), $e);
             }
 
@@ -145,13 +145,13 @@ 
     {
         $fs = $this->getOperator();
 
-        try {
+        try{
             $fs->delete($pathname);
 
-            if ($clean) {
+            if ($clean){
                 $this->deleteEmptyDirectories($this->getParentDirectory($pathname));
             }
-        } catch (FilesystemException $e) {
+        }catch (FilesystemException $e){
             throw new FileOperationException($e->getMessage(), (int)$e->getCode(), $e);
         }
     }
@@ -219,19 +219,19 @@ 
      */
     private function deleteEmptyDirectories(string $directory): void
     {
-        if (!$this->hasParentDirectory($directory)) {
+        if (!$this->hasParentDirectory($directory)){
             return;
         }
 
         $fs = $this->getOperator();
 
-        try {
-            if (!$this->hasFiles($directory)) {
+        try{
+            if (!$this->hasFiles($directory)){
                 $fs->deleteDirectory($directory);
 
                 $this->deleteEmptyDirectories($this->getParentDirectory($directory));
             }
-        } catch (FilesystemException $e) {
+        }catch (FilesystemException $e){
             throw new FileOperationException($e->getMessage(), (int)$e->getCode(), $e);
         }
     }
@@ -254,7 +254,7 @@ 
     {
         $fs = $this->getOperator();
 
-        foreach ($fs->listContents($directory) as $_) {
+        foreach ($fs->listContents($directory) as $_){
             return true;
         }
 
@@ -270,15 +270,15 @@ 
      */
     private function isStringable($value): bool
     {
-        if (\is_string($value)) {
+        if (\is_string($value)){
             return true;
         }
 
-        if (!\is_object($value)) {
+        if (!\is_object($value)){
             return false;
         }
 
-        if (\PHP_VERSION_ID >= 80000) {
+        if (\PHP_VERSION_ID >= 80000){
             return $value instanceof \Stringable;
         }
 

Braces +52 added lines, -23 removed lines

@@ -29,7 +29,8 @@ 
      */
     public function create(string $pathname, array $config = []): FileInterface
     {
-        if ($this instanceof ReadableInterface && !$this->exists($pathname)) {
+        if ($this instanceof ReadableInterface && !$this->exists($pathname))
+        {
             return $this->write($pathname, '', $config);
         }
 
@@ -45,8 +46,10 @@ 
 
         $fs = $this->getOperator();
 
-        try {
-            switch (true) {
+        try
+        {
+            switch (true)
+            {
                 case \is_object($content):
                 case \is_string($content):
                     $fs->write($pathname, (string)$content, $config);
@@ -60,7 +63,9 @@ 
                     $message = 'Content must be a resource stream or stringable type, but %s passed';
                     throw new \InvalidArgumentException(\sprintf($message, \get_debug_type($content)));
             }
-        } catch (FilesystemException $e) {
+        }
+        catch (FilesystemException $e)
+        {
             throw new FileOperationException($e->getMessage(), (int)$e->getCode(), $e);
         }
 
@@ -77,9 +82,12 @@ 
     ): FileInterface {
         $fs = $this->getOperator();
 
-        try {
+        try
+        {
             $fs->setVisibility($pathname, $this->toFlysystemVisibility($visibility));
-        } catch (FilesystemException $e) {
+        }
+        catch (FilesystemException $e)
+        {
             throw new FileOperationException($e->getMessage(), (int)$e->getCode(), $e);
         }
 
@@ -97,10 +105,14 @@ 
     ): FileInterface {
         $fs = $this->getOperator();
 
-        if ($storage === null || $storage === $this) {
-            try {
+        if ($storage === null || $storage === $this)
+        {
+            try
+            {
                 $fs->copy($source, $destination, $config);
-            } catch (FilesystemException $e) {
+            }
+            catch (FilesystemException $e)
+            {
                 throw new FileOperationException($e->getMessage(), (int)$e->getCode(), $e);
             }
 
@@ -121,10 +133,14 @@ 
     ): FileInterface {
         $fs = $this->getOperator();
 
-        if ($storage === null || $storage === $this) {
-            try {
+        if ($storage === null || $storage === $this)
+        {
+            try
+            {
                 $fs->move($source, $destination, $config);
-            } catch (FilesystemException $e) {
+            }
+            catch (FilesystemException $e)
+            {
                 throw new FileOperationException($e->getMessage(), (int)$e->getCode(), $e);
             }
 
@@ -145,13 +161,17 @@ 
     {
         $fs = $this->getOperator();
 
-        try {
+        try
+        {
             $fs->delete($pathname);
 
-            if ($clean) {
+            if ($clean)
+            {
                 $this->deleteEmptyDirectories($this->getParentDirectory($pathname));
             }
-        } catch (FilesystemException $e) {
+        }
+        catch (FilesystemException $e)
+        {
             throw new FileOperationException($e->getMessage(), (int)$e->getCode(), $e);
         }
     }
@@ -219,19 +239,24 @@ 
      */
     private function deleteEmptyDirectories(string $directory): void
     {
-        if (!$this->hasParentDirectory($directory)) {
+        if (!$this->hasParentDirectory($directory))
+        {
             return;
         }
 
         $fs = $this->getOperator();
 
-        try {
-            if (!$this->hasFiles($directory)) {
+        try
+        {
+            if (!$this->hasFiles($directory))
+            {
                 $fs->deleteDirectory($directory);
 
                 $this->deleteEmptyDirectories($this->getParentDirectory($directory));
             }
-        } catch (FilesystemException $e) {
+        }
+        catch (FilesystemException $e)
+        {
             throw new FileOperationException($e->getMessage(), (int)$e->getCode(), $e);
         }
     }
@@ -254,7 +279,8 @@ 
     {
         $fs = $this->getOperator();
 
-        foreach ($fs->listContents($directory) as $_) {
+        foreach ($fs->listContents($directory) as $_)
+        {
             return true;
         }
 
@@ -270,15 +296,18 @@ 
      */
     private function isStringable($value): bool
     {
-        if (\is_string($value)) {
+        if (\is_string($value))
+        {
             return true;
         }
 
-        if (!\is_object($value)) {
+        if (!\is_object($value))
+        {
             return false;
         }
 
-        if (\PHP_VERSION_ID >= 80000) {
+        if (\PHP_VERSION_ID >= 80000)
+        {
             return $value instanceof \Stringable;
         }
 

Upper-Lower-Casing +2 added lines, -2 removed lines

@@ -166,8 +166,8 @@
         string $visibility
     ): string {
         return ($visibility === Visibility::VISIBILITY_PUBLIC)
-            ? \League\Flysystem\Visibility::PUBLIC
-            : \League\Flysystem\Visibility::PRIVATE;
+            ? \League\Flysystem\Visibility::public
+            : \League\Flysystem\Visibility::private;
     }
 
     /**

src/Storage/src/Visibility.php

Upper-Lower-Casing +2 added lines, -2 removed lines

@@ -22,11 +22,11 @@
      * @var string
      * @psalm-var VisibilityType
      */
-    public const VISIBILITY_PUBLIC = \League\Flysystem\Visibility::PUBLIC;
+    public const VISIBILITY_PUBLIC = \League\Flysystem\Visibility::public;
 
     /**
      * @var string
      * @psalm-var VisibilityType
      */
-    public const VISIBILITY_PRIVATE = \League\Flysystem\Visibility::PRIVATE;
+    public const VISIBILITY_PRIVATE = \League\Flysystem\Visibility::private;
 }

src/Framework/Bootloader/Storage/StorageBootloader.php

Spacing +5 added lines, -5 removed lines

@@ -36,12 +36,12 @@ 
 
         $app->bindInjector(StorageConfig::class, ConfiguratorInterface::class);
 
-        $app->bindSingleton(StorageInterface::class, static function (StorageConfig $config, CdnInterface $cdn) {
+        $app->bindSingleton(StorageInterface::class, static function (StorageConfig $config, CdnInterface $cdn){
             $manager = new Storage($config->getDefaultBucket());
 
             $distributions = $config->getDistributions();
 
-            foreach ($config->getAdapters() as $name => $adapter) {
+            foreach ($config->getAdapters() as $name => $adapter){
                 $resolver = isset($distributions[$name])
                     ? $cdn->resolver($distributions[$name])
                     : null;
@@ -52,15 +52,15 @@ 
             return $manager;
         });
 
-        $app->bindSingleton(Storage::class, static function (StorageInterface $manager) {
+        $app->bindSingleton(Storage::class, static function (StorageInterface $manager){
             return $manager;
         });
 
-        $app->bindSingleton(BucketInterface::class, static function (StorageInterface $manager) {
+        $app->bindSingleton(BucketInterface::class, static function (StorageInterface $manager){
             return $manager->bucket();
         });
 
-        $app->bindSingleton(Bucket::class, static function (BucketInterface $storage) {
+        $app->bindSingleton(Bucket::class, static function (BucketInterface $storage){
             return $storage;
         });
     }

Braces +10 added lines, -5 removed lines

@@ -36,12 +36,14 @@ 
 
         $app->bindInjector(StorageConfig::class, ConfiguratorInterface::class);
 
-        $app->bindSingleton(StorageInterface::class, static function (StorageConfig $config, CdnInterface $cdn) {
+        $app->bindSingleton(StorageInterface::class, static function (StorageConfig $config, CdnInterface $cdn)
+        {
             $manager = new Storage($config->getDefaultBucket());
 
             $distributions = $config->getDistributions();
 
-            foreach ($config->getAdapters() as $name => $adapter) {
+            foreach ($config->getAdapters() as $name => $adapter)
+            {
                 $resolver = isset($distributions[$name])
                     ? $cdn->resolver($distributions[$name])
                     : null;
@@ -52,15 +54,18 @@ 
             return $manager;
         });
 
-        $app->bindSingleton(Storage::class, static function (StorageInterface $manager) {
+        $app->bindSingleton(Storage::class, static function (StorageInterface $manager)
+        {
             return $manager;
         });
 
-        $app->bindSingleton(BucketInterface::class, static function (StorageInterface $manager) {
+        $app->bindSingleton(BucketInterface::class, static function (StorageInterface $manager)
+        {
             return $manager->bucket();
         });
 
-        $app->bindSingleton(Bucket::class, static function (BucketInterface $storage) {
+        $app->bindSingleton(Bucket::class, static function (BucketInterface $storage)
+        {
             return $storage;
         });
     }

src/Framework/Bootloader/Storage/StorageConfig.php

Spacing +14 added lines, -14 removed lines

@@ -102,8 +102,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),
@@ -112,7 +112,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,
@@ -122,7 +122,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,
@@ -132,7 +132,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,
@@ -145,7 +145,7 @@ 
 
             $this->adapters[$name] = $adapter;
 
-            if (isset($bucket['distribution'])) {
+            if (isset($bucket['distribution'])){
                 $this->distributions[$name] = $bucket['distribution'];
             }
         }
@@ -159,7 +159,7 @@ 
      */
     private function createAdapter(string $serverName, array $bucket, array $server): FilesystemAdapter
     {
-        switch ($server['adapter']) {
+        switch ($server['adapter']){
             case 'local':
                 return $this->createLocalAdapter($serverName, $bucket, $server);
 
@@ -197,8 +197,8 @@ 
         $bucket = $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"'
                 );
@@ -214,7 +214,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"'
             );
@@ -238,7 +238,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,
@@ -273,7 +273,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,
@@ -283,9 +283,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

@@ -102,8 +102,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),
@@ -112,7 +114,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,
@@ -122,7 +125,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,
@@ -132,7 +136,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,
@@ -145,7 +150,8 @@ 
 
             $this->adapters[$name] = $adapter;
 
-            if (isset($bucket['distribution'])) {
+            if (isset($bucket['distribution']))
+            {
                 $this->distributions[$name] = $bucket['distribution'];
             }
         }
@@ -159,7 +165,8 @@ 
      */
     private function createAdapter(string $serverName, array $bucket, array $server): FilesystemAdapter
     {
-        switch ($server['adapter']) {
+        switch ($server['adapter'])
+        {
             case 'local':
                 return $this->createLocalAdapter($serverName, $bucket, $server);
 
@@ -197,8 +204,10 @@ 
         $bucket = $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"'
                 );
@@ -214,7 +223,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"'
             );
@@ -238,7 +248,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,
@@ -273,7 +284,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,
@@ -283,9 +295,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);
         }