spiral / framework

src/Storage/src/Manager.php

Spacing +7 added lines, -7 removed lines

@@ -77,7 +77,7 @@ 
     {
         $name = $name ?? $this->default;
 
-        if (!isset($this->storages[$name])) {
+        if (!isset($this->storages[$name])){
             throw new InvalidArgumentException(\sprintf(self::ERROR_NOT_FOUND, $name));
         }
 
@@ -89,7 +89,7 @@ 
      */
     public function add(string $name, StorageInterface $storage, bool $overwrite = false): void
     {
-        if ($overwrite === false && isset($this->storages[$name])) {
+        if ($overwrite === false && isset($this->storages[$name])){
             throw new \InvalidArgumentException(\sprintf(self::ERROR_REDEFINITION, $name));
         }
 
@@ -123,22 +123,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'] ?? '', '/'),
         ];
     }
 
@@ -149,7 +149,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->storages[$name])) {
+        if (!isset($this->storages[$name]))
+        {
             throw new InvalidArgumentException(\sprintf(self::ERROR_NOT_FOUND, $name));
         }
 
@@ -89,7 +90,8 @@ 
      */
     public function add(string $name, StorageInterface $storage, bool $overwrite = false): void
     {
-        if ($overwrite === false && isset($this->storages[$name])) {
+        if ($overwrite === false && isset($this->storages[$name]))
+        {
             throw new \InvalidArgumentException(\sprintf(self::ERROR_REDEFINITION, $name));
         }
 
@@ -123,16 +125,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'] = '';
         }
 
@@ -149,7 +154,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/UriResolvableTrait.php

Spacing +1 added lines, -1 removed lines

@@ -31,7 +31,7 @@
     {
         $resolver = $this->getResolver();
 
-        if ($resolver === null) {
+        if ($resolver === null){
             throw new \LogicException('Can not generate public url: File not accessible by HTTP');
         }
 

Braces +2 added lines, -1 removed lines

@@ -31,7 +31,8 @@
     {
         $resolver = $this->getResolver();
 
-        if ($resolver === null) {
+        if ($resolver === null)
+        {
             throw new \LogicException('Can not generate public url: File not accessible by HTTP');
         }
 

src/Storage/src/File/WritableTrait.php

Spacing +1 added lines, -1 removed lines

@@ -36,7 +36,7 @@
      */
     public function create(array $config = []): FileInterface
     {
-        if (!$this->exists()) {
+        if (!$this->exists()){
             return $this->write('', $config);
         }
 

Braces +2 added lines, -1 removed lines

@@ -36,7 +36,8 @@
      */
     public function create(array $config = []): FileInterface
     {
-        if (!$this->exists()) {
+        if (!$this->exists())
+        {
             return $this->write('', $config);
         }
 

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

Spacing +22 added lines, -22 removed lines

@@ -41,8 +41,8 @@ 
 
         $fs = $this->getOperator();
 
-        try {
-            switch (true) {
+        try{
+            switch (true){
                 case \is_object($content):
                 case \is_string($content):
                     $fs->write($pathname, (string)$content, $config);
@@ -56,7 +56,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);
         }
 
@@ -73,9 +73,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);
         }
 
@@ -93,10 +93,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);
             }
 
@@ -117,10 +117,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);
             }
 
@@ -141,13 +141,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);
         }
     }
@@ -215,19 +215,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);
         }
     }
@@ -250,7 +250,7 @@ 
     {
         $fs = $this->getOperator();
 
-        foreach ($fs->listContents($directory) as $_) {
+        foreach ($fs->listContents($directory) as $_){
             return true;
         }
 
@@ -266,15 +266,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 +50 added lines, -22 removed lines

@@ -41,8 +41,10 @@ 
 
         $fs = $this->getOperator();
 
-        try {
-            switch (true) {
+        try
+        {
+            switch (true)
+            {
                 case \is_object($content):
                 case \is_string($content):
                     $fs->write($pathname, (string)$content, $config);
@@ -56,7 +58,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);
         }
 
@@ -73,9 +77,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);
         }
 
@@ -93,10 +100,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);
             }
 
@@ -117,10 +128,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);
             }
 
@@ -141,13 +156,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);
         }
     }
@@ -215,19 +234,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);
         }
     }
@@ -250,7 +274,8 @@ 
     {
         $fs = $this->getOperator();
 
-        foreach ($fs->listContents($directory) as $_) {
+        foreach ($fs->listContents($directory) as $_)
+        {
             return true;
         }
 
@@ -266,15 +291,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/tests/TestCase.php

Spacing +8 added lines, -8 removed lines

@@ -14,7 +14,7 @@ 
     /**
      * @var string
      */
-    protected const LOCAL_STORAGE_DIRECTORY = __DIR__ . '/storage';
+    protected const LOCAL_STORAGE_DIRECTORY = __DIR__.'/storage';
 
     /**
      * @var StorageInterface
@@ -38,7 +38,7 @@ 
         );
 
         $this->second = Storage::fromAdapter(
-            new LocalFilesystemAdapter(self::LOCAL_STORAGE_DIRECTORY . '/second')
+            new LocalFilesystemAdapter(self::LOCAL_STORAGE_DIRECTORY.'/second')
         );
     }
 
@@ -63,22 +63,22 @@ 
         );
 
         /** @var \SplFileInfo $file */
-        foreach($iterator as $file) {
-            if ($file->getFilename() === '.gitignore') {
+        foreach ($iterator as $file){
+            if ($file->getFilename() === '.gitignore'){
                 continue;
             }
 
             \error_clear_last();
 
-            if ($file->isDir()) {
+            if ($file->isDir()){
                 @\rmdir($file->getPathname());
-            } else {
+            }else{
                 @\unlink($file->getPathname());
             }
 
-            if ($error = \error_get_last()) {
+            if ($error = \error_get_last()){
                 $prefix = 'An error occurred while clear temporary local storage directory: ';
-                $this->addWarning($prefix . $error['message']);
+                $this->addWarning($prefix.$error['message']);
             }
         }
     }

Braces +11 added lines, -5 removed lines

@@ -63,20 +63,26 @@
         );
 
         /** @var \SplFileInfo $file */
-        foreach($iterator as $file) {
-            if ($file->getFilename() === '.gitignore') {
+        foreach($iterator as $file)
+        {
+            if ($file->getFilename() === '.gitignore')
+            {
                 continue;
             }
 
             \error_clear_last();
 
-            if ($file->isDir()) {
+            if ($file->isDir())
+            {
                 @\rmdir($file->getPathname());
-            } else {
+            }
+            else
+            {
                 @\unlink($file->getPathname());
             }
 
-            if ($error = \error_get_last()) {
+            if ($error = \error_get_last())
+            {
                 $prefix = 'An error occurred while clear temporary local storage directory: ';
                 $this->addWarning($prefix . $error['message']);
             }

src/Storage/tests/StorageTestCase.php

Spacing +3 added lines, -3 removed lines

@@ -57,8 +57,8 @@ 
     public function testVisibility(): void
     {
         $this->markTestSkipped(
-            'This test [' . __FUNCTION__ . '] returns incorrect visibility ' .
-                'of files on Windows OS. ' .
+            'This test ['.__FUNCTION__.'] returns incorrect visibility '.
+                'of files on Windows OS. '.
             'It is required to understand the situation'
         );
 
@@ -151,7 +151,7 @@ 
 
         $actual = '';
         $stream = $this->local->getStream('file.txt');
-        while (!\feof($stream)) {
+        while (!\feof($stream)){
             $actual .= \fread($stream, 256);
         }
         \fclose($stream);

Braces +2 added lines, -1 removed lines

@@ -151,7 +151,8 @@
 
         $actual = '';
         $stream = $this->local->getStream('file.txt');
-        while (!\feof($stream)) {
+        while (!\feof($stream))
+        {
             $actual .= \fread($stream, 256);
         }
         \fclose($stream);

src/Storage/tests/ManagerTestCase.php

Spacing +4 added lines, -4 removed lines

@@ -92,7 +92,7 @@ 
     {
         $this->expectException(InvalidArgumentException::class);
         $this->expectExceptionMessage(
-            'URI argument must be a valid URI in ' .
+            'URI argument must be a valid URI in '.
             '"[STORAGE]://[PATH_TO_FILE]" format, but `test://` given'
         );
 
@@ -157,8 +157,8 @@ 
     public function testVisibility(): void
     {
         $this->markTestSkipped(
-            'This test [' . __FUNCTION__ . '] returns incorrect visibility ' .
-                'of files on Windows OS. ' .
+            'This test ['.__FUNCTION__.'] returns incorrect visibility '.
+                'of files on Windows OS. '.
             'It is required to understand the situation'
         );
 
@@ -257,7 +257,7 @@ 
 
         $actual = '';
         $stream = $this->manager->getStream('file.txt');
-        while (!\feof($stream)) {
+        while (!\feof($stream)){
             $actual .= \fread($stream, 256);
         }
         \fclose($stream);

Braces +2 added lines, -1 removed lines

@@ -257,7 +257,8 @@
 
         $actual = '';
         $stream = $this->manager->getStream('file.txt');
-        while (!\feof($stream)) {
+        while (!\feof($stream))
+        {
             $actual .= \fread($stream, 256);
         }
         \fclose($stream);

src/Storage/tests/FileTestCase.php

Spacing +3 added lines, -3 removed lines

@@ -81,8 +81,8 @@ 
     public function testVisibility(): void
     {
         $this->markTestSkipped(
-            'This test [' . __FUNCTION__ . '] returns incorrect visibility ' .
-                'of files on Windows OS. ' .
+            'This test ['.__FUNCTION__.'] returns incorrect visibility '.
+                'of files on Windows OS. '.
             'It is required to understand the situation'
         );
 
@@ -190,7 +190,7 @@ 
 
         $actual = '';
         $stream = $source->getStream();
-        while (!\feof($stream)) {
+        while (!\feof($stream)){
             $actual .= \fread($stream, 256);
         }
         \fclose($stream);

Braces +2 added lines, -1 removed lines

@@ -190,7 +190,8 @@
 
         $actual = '';
         $stream = $source->getStream();
-        while (!\feof($stream)) {
+        while (!\feof($stream))
+        {
             $actual .= \fread($stream, 256);
         }
         \fclose($stream);