spiral / framework

src/Translator/src/Catalogue.php

Spacing +6 added lines, -6 removed lines

@@ -57,7 +57,7 @@ 
      */
     public function has(string $domain, string $id): bool
     {
-        if (!isset($this->data[$domain])) {
+        if (!isset($this->data[$domain])){
             return false;
         }
 
@@ -69,7 +69,7 @@ 
      */
     public function get(string $domain, string $id): string
     {
-        if (!$this->has($domain, $id)) {
+        if (!$this->has($domain, $id)){
             throw new CatalogueException("Undefined string in domain '{$domain}'");
         }
 
@@ -99,15 +99,15 @@ 
      */
     public function mergeFrom(MessageCatalogue $catalogue, bool $follow = true): void
     {
-        foreach ($catalogue->all() as $domain => $messages) {
-            if (!isset($this->data[$domain])) {
+        foreach ($catalogue->all() as $domain => $messages){
+            if (!isset($this->data[$domain])){
                 $this->data[$domain] = [];
             }
 
-            if ($follow) {
+            if ($follow){
                 //MessageCatalogue string has higher priority that string stored in memory
                 $this->data[$domain] = array_merge($messages, $this->data[$domain]);
-            } else {
+            }else{
                 $this->data[$domain] = array_merge($this->data[$domain], $messages);
             }
         }

Braces +13 added lines, -6 removed lines

@@ -57,7 +57,8 @@ 
      */
     public function has(string $domain, string $id): bool
     {
-        if (!isset($this->data[$domain])) {
+        if (!isset($this->data[$domain]))
+        {
             return false;
         }
 
@@ -69,7 +70,8 @@ 
      */
     public function get(string $domain, string $id): string
     {
-        if (!$this->has($domain, $id)) {
+        if (!$this->has($domain, $id))
+        {
             throw new CatalogueException("Undefined string in domain '{$domain}'");
         }
 
@@ -99,15 +101,20 @@ 
      */
     public function mergeFrom(MessageCatalogue $catalogue, bool $follow = true): void
     {
-        foreach ($catalogue->all() as $domain => $messages) {
-            if (!isset($this->data[$domain])) {
+        foreach ($catalogue->all() as $domain => $messages)
+        {
+            if (!isset($this->data[$domain]))
+            {
                 $this->data[$domain] = [];
             }
 
-            if ($follow) {
+            if ($follow)
+            {
                 //MessageCatalogue string has higher priority that string stored in memory
                 $this->data[$domain] = array_merge($messages, $this->data[$domain]);
-            } else {
+            }
+            else
+            {
                 $this->data[$domain] = array_merge($this->data[$domain], $messages);
             }
         }

src/Storage/tests/TestCase.php

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']);
             }

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 BucketInterface
@@ -38,7 +38,7 @@ 
         );
 
         $this->second = Bucket::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']);
             }
         }
     }

src/Storage/tests/StorageTestCase.php

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);

Spacing +4 added lines, -4 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);
@@ -175,7 +175,7 @@ 
      */
     public function testLastModified(): void
     {
-        $now = (int) \floor(\microtime(true));
+        $now = (int)\floor(\microtime(true));
 
         $this->local->create('file.txt');
         $before = $this->local->getLastModified('file.txt');

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

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);

Spacing +4 added lines, -4 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);
@@ -216,7 +216,7 @@ 
      */
     public function testLastModified(): void
     {
-        $now = (int) \floor(\microtime(true));
+        $now = (int)\floor(\microtime(true));
 
         $file = $this->local->file('file.txt')
             ->create()

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

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;
     }

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(), $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(), $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(), $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(), $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(), $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(), $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(), $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(), $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(), $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(), $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(), $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(), $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(), $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(), $e->getCode(), $e);
         }
     }

src/Storage/src/Bucket/WritableTrait.php

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;
     }
 
     /**

Spacing +23 added lines, -23 removed lines

@@ -31,7 +31,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);
         }
 
@@ -47,8 +47,8 @@ 
 
         $fs = $this->getOperator();
 
-        try {
-            switch (true) {
+        try{
+            switch (true){
                 case \is_object($content):
                 case \is_string($content):
                     $fs->write($pathname, (string)$content, $config);
@@ -62,7 +62,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(), $e->getCode(), $e);
         }
 
@@ -79,9 +79,9 @@ 
     ): FileInterface {
         $fs = $this->getOperator();
 
-        try {
+        try{
             $fs->setVisibility($pathname, $this->toFlysystemVisibility($visibility));
-        } catch (FilesystemException $e) {
+        }catch (FilesystemException $e){
             throw new FileOperationException($e->getMessage(), $e->getCode(), $e);
         }
 
@@ -99,10 +99,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(), $e->getCode(), $e);
             }
 
@@ -123,10 +123,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(), $e->getCode(), $e);
             }
 
@@ -147,13 +147,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(), $e->getCode(), $e);
         }
     }
@@ -209,19 +209,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(), $e->getCode(), $e);
         }
     }
@@ -243,7 +243,7 @@ 
     {
         $fs = $this->getOperator();
 
-        foreach ($fs->listContents($directory) as $_) {
+        foreach ($fs->listContents($directory) as $_){
             return true;
         }
 
@@ -258,15 +258,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

@@ -31,7 +31,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);
         }
 
@@ -47,8 +48,10 @@ 
 
         $fs = $this->getOperator();
 
-        try {
-            switch (true) {
+        try
+        {
+            switch (true)
+            {
                 case \is_object($content):
                 case \is_string($content):
                     $fs->write($pathname, (string)$content, $config);
@@ -62,7 +65,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(), $e->getCode(), $e);
         }
 
@@ -79,9 +84,12 @@ 
     ): FileInterface {
         $fs = $this->getOperator();
 
-        try {
+        try
+        {
             $fs->setVisibility($pathname, $this->toFlysystemVisibility($visibility));
-        } catch (FilesystemException $e) {
+        }
+        catch (FilesystemException $e)
+        {
             throw new FileOperationException($e->getMessage(), $e->getCode(), $e);
         }
 
@@ -99,10 +107,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(), $e->getCode(), $e);
             }
 
@@ -123,10 +135,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(), $e->getCode(), $e);
             }
 
@@ -147,13 +163,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(), $e->getCode(), $e);
         }
     }
@@ -209,19 +229,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(), $e->getCode(), $e);
         }
     }
@@ -243,7 +268,8 @@ 
     {
         $fs = $this->getOperator();
 
-        foreach ($fs->listContents($directory) as $_) {
+        foreach ($fs->listContents($directory) as $_)
+        {
             return true;
         }
 
@@ -258,15 +284,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;
         }
 

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;
 }