spiral / framework

src/Framework/Bootloader/Storage/StorageConfig.php

Spacing +16 added lines, -16 removed lines

@@ -103,8 +103,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),
@@ -113,7 +113,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,
@@ -123,7 +123,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,
@@ -133,7 +133,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,
@@ -146,7 +146,7 @@ 
 
             $this->adapters[$name] = $adapter;
 
-            if (isset($bucket['distribution'])) {
+            if (isset($bucket['distribution'])){
                 $this->distributions[$name] = $bucket['distribution'];
             }
         }
@@ -160,7 +160,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);
 
@@ -184,9 +184,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?'
             );
         }
@@ -206,8 +206,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"'
                 );
@@ -223,7 +223,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"'
             );
@@ -247,7 +247,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,
@@ -282,7 +282,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,
@@ -292,9 +292,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 +31 added lines, -15 removed lines

@@ -103,8 +103,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),
@@ -113,7 +115,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,
@@ -123,7 +126,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,
@@ -133,7 +137,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,
@@ -146,7 +151,8 @@ 
 
             $this->adapters[$name] = $adapter;
 
-            if (isset($bucket['distribution'])) {
+            if (isset($bucket['distribution']))
+            {
                 $this->distributions[$name] = $bucket['distribution'];
             }
         }
@@ -160,7 +166,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);
 
@@ -184,7 +191,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?'
@@ -206,8 +214,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"'
                 );
@@ -223,7 +233,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"'
             );
@@ -247,7 +258,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,
@@ -282,7 +294,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,
@@ -292,9 +305,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/Framework/Bootloader/Storage/StorageBootloader.php

Spacing +8 added lines, -8 removed lines

@@ -39,18 +39,18 @@ 
 
         $app->bindInjector(StorageConfig::class, ConfiguratorInterface::class);
 
-        $app->bindSingleton(StorageInterface::class, static function (StorageConfig $config, Container $app) {
+        $app->bindSingleton(StorageInterface::class, static function (StorageConfig $config, Container $app){
             $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 = $app->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);
@@ -67,15 +67,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 +17 added lines, -8 removed lines

@@ -39,18 +39,24 @@ 
 
         $app->bindInjector(StorageConfig::class, ConfiguratorInterface::class);
 
-        $app->bindSingleton(StorageInterface::class, static function (StorageConfig $config, Container $app) {
+        $app->bindSingleton(StorageInterface::class, static function (StorageConfig $config, Container $app)
+        {
             $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 = $app->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);
@@ -67,15 +73,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;
         });
     }