@@ -190,7 +190,8 @@ |
||
| 190 | 190 | |
| 191 | 191 | $actual = ''; |
| 192 | 192 | $stream = $source->getStream(); |
| 193 | - while (!\feof($stream)) { |
|
| 193 | + while (!\feof($stream)) |
|
| 194 | + { |
|
| 194 | 195 | $actual .= \fread($stream, 256); |
| 195 | 196 | } |
| 196 | 197 | \fclose($stream); |
@@ -81,8 +81,8 @@ discard block |
||
| 81 | 81 | public function testVisibility(): void |
| 82 | 82 | { |
| 83 | 83 | $this->markTestSkipped( |
| 84 | - 'This test [' . __FUNCTION__ . '] returns incorrect visibility ' . |
|
| 85 | - 'of files on Windows OS. ' . |
|
| 84 | + 'This test ['.__FUNCTION__.'] returns incorrect visibility '. |
|
| 85 | + 'of files on Windows OS. '. |
|
| 86 | 86 | 'It is required to understand the situation' |
| 87 | 87 | ); |
| 88 | 88 | |
@@ -190,7 +190,7 @@ discard block |
||
| 190 | 190 | |
| 191 | 191 | $actual = ''; |
| 192 | 192 | $stream = $source->getStream(); |
| 193 | - while (!\feof($stream)) { |
|
| 193 | + while (!\feof($stream)){ |
|
| 194 | 194 | $actual .= \fread($stream, 256); |
| 195 | 195 | } |
| 196 | 196 | \fclose($stream); |
@@ -216,7 +216,7 @@ discard block |
||
| 216 | 216 | */ |
| 217 | 217 | public function testLastModified(): void |
| 218 | 218 | { |
| 219 | - $now = (int) \floor(\microtime(true)); |
|
| 219 | + $now = (int)\floor(\microtime(true)); |
|
| 220 | 220 | |
| 221 | 221 | $file = $this->local->file('file.txt') |
| 222 | 222 | ->create() |
@@ -56,13 +56,13 @@ |
||
| 56 | 56 | $stmt->name = $parameter->getName(); |
| 57 | 57 | |
| 58 | 58 | $type = $parameter->getType(); |
| 59 | - if ($type instanceof \ReflectionNamedType) { |
|
| 59 | + if ($type instanceof \ReflectionNamedType){ |
|
| 60 | 60 | $stmt->type = Type::create($type->getName()); |
| 61 | 61 | $stmt->builtIn = $type->isBuiltin(); |
| 62 | 62 | $stmt->nullable = $type->allowsNull(); |
| 63 | 63 | } |
| 64 | 64 | |
| 65 | - if ($parameter->isDefaultValueAvailable()) { |
|
| 65 | + if ($parameter->isDefaultValueAvailable()){ |
|
| 66 | 66 | $stmt->hasDefault = true; |
| 67 | 67 | $stmt->default = $parameter->getDefaultValue(); |
| 68 | 68 | } |
@@ -56,13 +56,15 @@ |
||
| 56 | 56 | $stmt->name = $parameter->getName(); |
| 57 | 57 | |
| 58 | 58 | $type = $parameter->getType(); |
| 59 | - if ($type instanceof \ReflectionNamedType) { |
|
| 59 | + if ($type instanceof \ReflectionNamedType) |
|
| 60 | + { |
|
| 60 | 61 | $stmt->type = Type::create($type->getName()); |
| 61 | 62 | $stmt->builtIn = $type->isBuiltin(); |
| 62 | 63 | $stmt->nullable = $type->allowsNull(); |
| 63 | 64 | } |
| 64 | 65 | |
| 65 | - if ($parameter->isDefaultValueAvailable()) { |
|
| 66 | + if ($parameter->isDefaultValueAvailable()) |
|
| 67 | + { |
|
| 66 | 68 | $stmt->hasDefault = true; |
| 67 | 69 | $stmt->default = $parameter->getDefaultValue(); |
| 68 | 70 | } |
@@ -13,7 +13,8 @@ discard block |
||
| 13 | 13 | |
| 14 | 14 | use Doctrine\Common\Annotations\Annotation\NamedArgumentConstructor; |
| 15 | 15 | |
| 16 | - if (!\interface_exists(NamedArgumentConstructorAnnotation::class)) { |
|
| 16 | + if (!\interface_exists(NamedArgumentConstructorAnnotation::class)) |
|
| 17 | + { |
|
| 17 | 18 | /** |
| 18 | 19 | * Marker interface for PHP7/PHP8 compatible support for named |
| 19 | 20 | * arguments (and constructor property promotion). |
@@ -31,7 +32,8 @@ discard block |
||
| 31 | 32 | |
| 32 | 33 | namespace Doctrine\Common\Annotations\Annotation { |
| 33 | 34 | |
| 34 | - if (!\class_exists(NamedArgumentConstructor::class, false)) { |
|
| 35 | + if (!\class_exists(NamedArgumentConstructor::class, false)) |
|
| 36 | + { |
|
| 35 | 37 | /** |
| 36 | 38 | * Annotation that indicates that the annotated class should be |
| 37 | 39 | * constructed with a named argument call. |
@@ -51,7 +53,8 @@ discard block |
||
| 51 | 53 | |
| 52 | 54 | use JetBrains\PhpStorm\ExpectedValues; |
| 53 | 55 | |
| 54 | - if (!\class_exists(Attribute::class, false)) { |
|
| 56 | + if (!\class_exists(Attribute::class, false)) |
|
| 57 | + { |
|
| 55 | 58 | #[Attribute(Attribute::TARGET_CLASS)] |
| 56 | 59 | final class Attribute |
| 57 | 60 | { |
@@ -13,7 +13,7 @@ discard block |
||
| 13 | 13 | |
| 14 | 14 | use Doctrine\Common\Annotations\Annotation\NamedArgumentConstructor; |
| 15 | 15 | |
| 16 | - if (!\interface_exists(NamedArgumentConstructorAnnotation::class)) { |
|
| 16 | + if (!\interface_exists(NamedArgumentConstructorAnnotation::class)){ |
|
| 17 | 17 | /** |
| 18 | 18 | * Marker interface for PHP7/PHP8 compatible support for named |
| 19 | 19 | * arguments (and constructor property promotion). |
@@ -31,7 +31,7 @@ discard block |
||
| 31 | 31 | |
| 32 | 32 | namespace Doctrine\Common\Annotations\Annotation { |
| 33 | 33 | |
| 34 | - if (!\class_exists(NamedArgumentConstructor::class, false)) { |
|
| 34 | + if (!\class_exists(NamedArgumentConstructor::class, false)){ |
|
| 35 | 35 | /** |
| 36 | 36 | * Annotation that indicates that the annotated class should be |
| 37 | 37 | * constructed with a named argument call. |
@@ -51,7 +51,7 @@ discard block |
||
| 51 | 51 | |
| 52 | 52 | use JetBrains\PhpStorm\ExpectedValues; |
| 53 | 53 | |
| 54 | - if (!\class_exists(Attribute::class, false)) { |
|
| 54 | + if (!\class_exists(Attribute::class, false)){ |
|
| 55 | 55 | #[Attribute(Attribute::TARGET_CLASS)] |
| 56 | 56 | final class Attribute |
| 57 | 57 | { |
@@ -77,7 +77,7 @@ discard block |
||
| 77 | 77 | { |
| 78 | 78 | $name = $name ?? $this->default; |
| 79 | 79 | |
| 80 | - if (!isset($this->buckets[$name])) { |
|
| 80 | + if (!isset($this->buckets[$name])){ |
|
| 81 | 81 | throw new InvalidArgumentException(\sprintf(self::ERROR_NOT_FOUND, $name)); |
| 82 | 82 | } |
| 83 | 83 | |
@@ -99,7 +99,7 @@ discard block |
||
| 99 | 99 | */ |
| 100 | 100 | public function add(string $name, BucketInterface $storage, bool $overwrite = false): void |
| 101 | 101 | { |
| 102 | - if ($overwrite === false && isset($this->buckets[$name])) { |
|
| 102 | + if ($overwrite === false && isset($this->buckets[$name])){ |
|
| 103 | 103 | throw new \InvalidArgumentException(\sprintf(self::ERROR_REDEFINITION, $name)); |
| 104 | 104 | } |
| 105 | 105 | |
@@ -133,22 +133,22 @@ discard block |
||
| 133 | 133 | $uri = $this->uriToString($uri); |
| 134 | 134 | $result = \parse_url($uri); |
| 135 | 135 | |
| 136 | - if ($result === false) { |
|
| 136 | + if ($result === false){ |
|
| 137 | 137 | $message = 'URI argument must be a valid URI in "[STORAGE]://[PATH_TO_FILE]" format, but `%s` given'; |
| 138 | 138 | throw new InvalidArgumentException(\sprintf($message, $uri)); |
| 139 | 139 | } |
| 140 | 140 | |
| 141 | - if (!isset($result['scheme'])) { |
|
| 141 | + if (!isset($result['scheme'])){ |
|
| 142 | 142 | $result['scheme'] = $withScheme ? $this->default : null; |
| 143 | 143 | } |
| 144 | 144 | |
| 145 | - if (!isset($result['host'])) { |
|
| 145 | + if (!isset($result['host'])){ |
|
| 146 | 146 | $result['host'] = ''; |
| 147 | 147 | } |
| 148 | 148 | |
| 149 | 149 | return [ |
| 150 | 150 | $result['scheme'] ?? null, |
| 151 | - $result['host'] . \rtrim($result['path'] ?? '', '/'), |
|
| 151 | + $result['host'].\rtrim($result['path'] ?? '', '/'), |
|
| 152 | 152 | ]; |
| 153 | 153 | } |
| 154 | 154 | |
@@ -159,7 +159,7 @@ discard block |
||
| 159 | 159 | */ |
| 160 | 160 | private function uriToString($uri): string |
| 161 | 161 | { |
| 162 | - switch (true) { |
|
| 162 | + switch (true){ |
|
| 163 | 163 | case $uri instanceof UriInterface: |
| 164 | 164 | case $uri instanceof \Stringable: |
| 165 | 165 | case \is_object($uri) && \method_exists($uri, '__toString'): |
@@ -77,7 +77,8 @@ discard block |
||
| 77 | 77 | { |
| 78 | 78 | $name = $name ?? $this->default; |
| 79 | 79 | |
| 80 | - if (!isset($this->buckets[$name])) { |
|
| 80 | + if (!isset($this->buckets[$name])) |
|
| 81 | + { |
|
| 81 | 82 | throw new InvalidArgumentException(\sprintf(self::ERROR_NOT_FOUND, $name)); |
| 82 | 83 | } |
| 83 | 84 | |
@@ -99,7 +100,8 @@ discard block |
||
| 99 | 100 | */ |
| 100 | 101 | public function add(string $name, BucketInterface $storage, bool $overwrite = false): void |
| 101 | 102 | { |
| 102 | - if ($overwrite === false && isset($this->buckets[$name])) { |
|
| 103 | + if ($overwrite === false && isset($this->buckets[$name])) |
|
| 104 | + { |
|
| 103 | 105 | throw new \InvalidArgumentException(\sprintf(self::ERROR_REDEFINITION, $name)); |
| 104 | 106 | } |
| 105 | 107 | |
@@ -133,16 +135,19 @@ discard block |
||
| 133 | 135 | $uri = $this->uriToString($uri); |
| 134 | 136 | $result = \parse_url($uri); |
| 135 | 137 | |
| 136 | - if ($result === false) { |
|
| 138 | + if ($result === false) |
|
| 139 | + { |
|
| 137 | 140 | $message = 'URI argument must be a valid URI in "[STORAGE]://[PATH_TO_FILE]" format, but `%s` given'; |
| 138 | 141 | throw new InvalidArgumentException(\sprintf($message, $uri)); |
| 139 | 142 | } |
| 140 | 143 | |
| 141 | - if (!isset($result['scheme'])) { |
|
| 144 | + if (!isset($result['scheme'])) |
|
| 145 | + { |
|
| 142 | 146 | $result['scheme'] = $withScheme ? $this->default : null; |
| 143 | 147 | } |
| 144 | 148 | |
| 145 | - if (!isset($result['host'])) { |
|
| 149 | + if (!isset($result['host'])) |
|
| 150 | + { |
|
| 146 | 151 | $result['host'] = ''; |
| 147 | 152 | } |
| 148 | 153 | |
@@ -159,7 +164,8 @@ discard block |
||
| 159 | 164 | */ |
| 160 | 165 | private function uriToString($uri): string |
| 161 | 166 | { |
| 162 | - switch (true) { |
|
| 167 | + switch (true) |
|
| 168 | + { |
|
| 163 | 169 | case $uri instanceof UriInterface: |
| 164 | 170 | case $uri instanceof \Stringable: |
| 165 | 171 | case \is_object($uri) && \method_exists($uri, '__toString'): |
@@ -64,7 +64,7 @@ |
||
| 64 | 64 | { |
| 65 | 65 | $name = $this->storage->getName(); |
| 66 | 66 | |
| 67 | - if ($name === null) { |
|
| 67 | + if ($name === null){ |
|
| 68 | 68 | return $this->getPathname(); |
| 69 | 69 | } |
| 70 | 70 | |
@@ -64,7 +64,8 @@ |
||
| 64 | 64 | { |
| 65 | 65 | $name = $this->storage->getName(); |
| 66 | 66 | |
| 67 | - if ($name === null) { |
|
| 67 | + if ($name === null) |
|
| 68 | + { |
|
| 68 | 69 | return $this->getPathname(); |
| 69 | 70 | } |
| 70 | 71 | |
@@ -136,7 +136,7 @@ |
||
| 136 | 136 | #[ExpectedValues(valuesFromClass: \League\Flysystem\Visibility::class)] |
| 137 | 137 | string $visibility |
| 138 | 138 | ): string { |
| 139 | - return $visibility === \League\Flysystem\Visibility::PUBLIC |
|
| 139 | + return $visibility === \League\Flysystem\Visibility::public |
|
| 140 | 140 | ? Visibility::VISIBILITY_PUBLIC |
| 141 | 141 | : Visibility::VISIBILITY_PRIVATE; |
| 142 | 142 | } |
@@ -29,9 +29,9 @@ discard block |
||
| 29 | 29 | { |
| 30 | 30 | $fs = $this->getOperator(); |
| 31 | 31 | |
| 32 | - try { |
|
| 32 | + try{ |
|
| 33 | 33 | return $fs->fileExists($pathname); |
| 34 | - } catch (FilesystemException $e) { |
|
| 34 | + }catch (FilesystemException $e){ |
|
| 35 | 35 | throw new FileOperationException($e->getMessage(), $e->getCode(), $e); |
| 36 | 36 | } |
| 37 | 37 | } |
@@ -43,9 +43,9 @@ discard block |
||
| 43 | 43 | { |
| 44 | 44 | $fs = $this->getOperator(); |
| 45 | 45 | |
| 46 | - try { |
|
| 46 | + try{ |
|
| 47 | 47 | return $fs->read($pathname); |
| 48 | - } catch (FilesystemException $e) { |
|
| 48 | + }catch (FilesystemException $e){ |
|
| 49 | 49 | throw new FileOperationException($e->getMessage(), $e->getCode(), $e); |
| 50 | 50 | } |
| 51 | 51 | } |
@@ -57,9 +57,9 @@ discard block |
||
| 57 | 57 | { |
| 58 | 58 | $fs = $this->getOperator(); |
| 59 | 59 | |
| 60 | - try { |
|
| 60 | + try{ |
|
| 61 | 61 | return $fs->readStream($pathname); |
| 62 | - } catch (FilesystemException $e) { |
|
| 62 | + }catch (FilesystemException $e){ |
|
| 63 | 63 | throw new FileOperationException($e->getMessage(), $e->getCode(), $e); |
| 64 | 64 | } |
| 65 | 65 | } |
@@ -71,9 +71,9 @@ discard block |
||
| 71 | 71 | { |
| 72 | 72 | $fs = $this->getOperator(); |
| 73 | 73 | |
| 74 | - try { |
|
| 74 | + try{ |
|
| 75 | 75 | return $fs->lastModified($pathname); |
| 76 | - } catch (FilesystemException $e) { |
|
| 76 | + }catch (FilesystemException $e){ |
|
| 77 | 77 | throw new FileOperationException($e->getMessage(), $e->getCode(), $e); |
| 78 | 78 | } |
| 79 | 79 | } |
@@ -85,9 +85,9 @@ discard block |
||
| 85 | 85 | { |
| 86 | 86 | $fs = $this->getOperator(); |
| 87 | 87 | |
| 88 | - try { |
|
| 88 | + try{ |
|
| 89 | 89 | return $fs->fileSize($pathname); |
| 90 | - } catch (FilesystemException $e) { |
|
| 90 | + }catch (FilesystemException $e){ |
|
| 91 | 91 | throw new FileOperationException($e->getMessage(), $e->getCode(), $e); |
| 92 | 92 | } |
| 93 | 93 | } |
@@ -99,9 +99,9 @@ discard block |
||
| 99 | 99 | { |
| 100 | 100 | $fs = $this->getOperator(); |
| 101 | 101 | |
| 102 | - try { |
|
| 102 | + try{ |
|
| 103 | 103 | return $fs->mimeType($pathname); |
| 104 | - } catch (FilesystemException $e) { |
|
| 104 | + }catch (FilesystemException $e){ |
|
| 105 | 105 | throw new FileOperationException($e->getMessage(), $e->getCode(), $e); |
| 106 | 106 | } |
| 107 | 107 | } |
@@ -114,11 +114,11 @@ discard block |
||
| 114 | 114 | { |
| 115 | 115 | $fs = $this->getOperator(); |
| 116 | 116 | |
| 117 | - try { |
|
| 117 | + try{ |
|
| 118 | 118 | return $this->fromFlysystemVisibility( |
| 119 | 119 | $fs->visibility($pathname) |
| 120 | 120 | ); |
| 121 | - } catch (FilesystemException $e) { |
|
| 121 | + }catch (FilesystemException $e){ |
|
| 122 | 122 | throw new FileOperationException($e->getMessage(), $e->getCode(), $e); |
| 123 | 123 | } |
| 124 | 124 | } |
@@ -29,9 +29,12 @@ discard block |
||
| 29 | 29 | { |
| 30 | 30 | $fs = $this->getOperator(); |
| 31 | 31 | |
| 32 | - try { |
|
| 32 | + try |
|
| 33 | + { |
|
| 33 | 34 | return $fs->fileExists($pathname); |
| 34 | - } catch (FilesystemException $e) { |
|
| 35 | + } |
|
| 36 | + catch (FilesystemException $e) |
|
| 37 | + { |
|
| 35 | 38 | throw new FileOperationException($e->getMessage(), $e->getCode(), $e); |
| 36 | 39 | } |
| 37 | 40 | } |
@@ -43,9 +46,12 @@ discard block |
||
| 43 | 46 | { |
| 44 | 47 | $fs = $this->getOperator(); |
| 45 | 48 | |
| 46 | - try { |
|
| 49 | + try |
|
| 50 | + { |
|
| 47 | 51 | return $fs->read($pathname); |
| 48 | - } catch (FilesystemException $e) { |
|
| 52 | + } |
|
| 53 | + catch (FilesystemException $e) |
|
| 54 | + { |
|
| 49 | 55 | throw new FileOperationException($e->getMessage(), $e->getCode(), $e); |
| 50 | 56 | } |
| 51 | 57 | } |
@@ -57,9 +63,12 @@ discard block |
||
| 57 | 63 | { |
| 58 | 64 | $fs = $this->getOperator(); |
| 59 | 65 | |
| 60 | - try { |
|
| 66 | + try |
|
| 67 | + { |
|
| 61 | 68 | return $fs->readStream($pathname); |
| 62 | - } catch (FilesystemException $e) { |
|
| 69 | + } |
|
| 70 | + catch (FilesystemException $e) |
|
| 71 | + { |
|
| 63 | 72 | throw new FileOperationException($e->getMessage(), $e->getCode(), $e); |
| 64 | 73 | } |
| 65 | 74 | } |
@@ -71,9 +80,12 @@ discard block |
||
| 71 | 80 | { |
| 72 | 81 | $fs = $this->getOperator(); |
| 73 | 82 | |
| 74 | - try { |
|
| 83 | + try |
|
| 84 | + { |
|
| 75 | 85 | return $fs->lastModified($pathname); |
| 76 | - } catch (FilesystemException $e) { |
|
| 86 | + } |
|
| 87 | + catch (FilesystemException $e) |
|
| 88 | + { |
|
| 77 | 89 | throw new FileOperationException($e->getMessage(), $e->getCode(), $e); |
| 78 | 90 | } |
| 79 | 91 | } |
@@ -85,9 +97,12 @@ discard block |
||
| 85 | 97 | { |
| 86 | 98 | $fs = $this->getOperator(); |
| 87 | 99 | |
| 88 | - try { |
|
| 100 | + try |
|
| 101 | + { |
|
| 89 | 102 | return $fs->fileSize($pathname); |
| 90 | - } catch (FilesystemException $e) { |
|
| 103 | + } |
|
| 104 | + catch (FilesystemException $e) |
|
| 105 | + { |
|
| 91 | 106 | throw new FileOperationException($e->getMessage(), $e->getCode(), $e); |
| 92 | 107 | } |
| 93 | 108 | } |
@@ -99,9 +114,12 @@ discard block |
||
| 99 | 114 | { |
| 100 | 115 | $fs = $this->getOperator(); |
| 101 | 116 | |
| 102 | - try { |
|
| 117 | + try |
|
| 118 | + { |
|
| 103 | 119 | return $fs->mimeType($pathname); |
| 104 | - } catch (FilesystemException $e) { |
|
| 120 | + } |
|
| 121 | + catch (FilesystemException $e) |
|
| 122 | + { |
|
| 105 | 123 | throw new FileOperationException($e->getMessage(), $e->getCode(), $e); |
| 106 | 124 | } |
| 107 | 125 | } |
@@ -114,11 +132,14 @@ discard block |
||
| 114 | 132 | { |
| 115 | 133 | $fs = $this->getOperator(); |
| 116 | 134 | |
| 117 | - try { |
|
| 135 | + try |
|
| 136 | + { |
|
| 118 | 137 | return $this->fromFlysystemVisibility( |
| 119 | 138 | $fs->visibility($pathname) |
| 120 | 139 | ); |
| 121 | - } catch (FilesystemException $e) { |
|
| 140 | + } |
|
| 141 | + catch (FilesystemException $e) |
|
| 142 | + { |
|
| 122 | 143 | throw new FileOperationException($e->getMessage(), $e->getCode(), $e); |
| 123 | 144 | } |
| 124 | 145 | } |
@@ -166,8 +166,8 @@ |
||
| 166 | 166 | string $visibility |
| 167 | 167 | ): string { |
| 168 | 168 | return ($visibility === Visibility::VISIBILITY_PUBLIC) |
| 169 | - ? \League\Flysystem\Visibility::PUBLIC |
|
| 170 | - : \League\Flysystem\Visibility::PRIVATE; |
|
| 169 | + ? \League\Flysystem\Visibility::public |
|
| 170 | + : \League\Flysystem\Visibility::private; |
|
| 171 | 171 | } |
| 172 | 172 | |
| 173 | 173 | /** |
@@ -29,7 +29,7 @@ discard block |
||
| 29 | 29 | */ |
| 30 | 30 | public function create(string $pathname, array $config = []): FileInterface |
| 31 | 31 | { |
| 32 | - if ($this instanceof ReadableInterface && !$this->exists($pathname)) { |
|
| 32 | + if ($this instanceof ReadableInterface && !$this->exists($pathname)){ |
|
| 33 | 33 | return $this->write($pathname, '', $config); |
| 34 | 34 | } |
| 35 | 35 | |
@@ -45,8 +45,8 @@ discard block |
||
| 45 | 45 | |
| 46 | 46 | $fs = $this->getOperator(); |
| 47 | 47 | |
| 48 | - try { |
|
| 49 | - switch (true) { |
|
| 48 | + try{ |
|
| 49 | + switch (true){ |
|
| 50 | 50 | case \is_object($content): |
| 51 | 51 | case \is_string($content): |
| 52 | 52 | $fs->write($pathname, (string)$content, $config); |
@@ -60,7 +60,7 @@ discard block |
||
| 60 | 60 | $message = 'Content must be a resource stream or stringable type, but %s passed'; |
| 61 | 61 | throw new \InvalidArgumentException(\sprintf($message, \get_debug_type($content))); |
| 62 | 62 | } |
| 63 | - } catch (FilesystemException $e) { |
|
| 63 | + }catch (FilesystemException $e){ |
|
| 64 | 64 | throw new FileOperationException($e->getMessage(), $e->getCode(), $e); |
| 65 | 65 | } |
| 66 | 66 | |
@@ -77,9 +77,9 @@ discard block |
||
| 77 | 77 | ): FileInterface { |
| 78 | 78 | $fs = $this->getOperator(); |
| 79 | 79 | |
| 80 | - try { |
|
| 80 | + try{ |
|
| 81 | 81 | $fs->setVisibility($pathname, $this->toFlysystemVisibility($visibility)); |
| 82 | - } catch (FilesystemException $e) { |
|
| 82 | + }catch (FilesystemException $e){ |
|
| 83 | 83 | throw new FileOperationException($e->getMessage(), $e->getCode(), $e); |
| 84 | 84 | } |
| 85 | 85 | |
@@ -97,10 +97,10 @@ discard block |
||
| 97 | 97 | ): FileInterface { |
| 98 | 98 | $fs = $this->getOperator(); |
| 99 | 99 | |
| 100 | - if ($storage === null || $storage === $this) { |
|
| 101 | - try { |
|
| 100 | + if ($storage === null || $storage === $this){ |
|
| 101 | + try{ |
|
| 102 | 102 | $fs->copy($source, $destination, $config); |
| 103 | - } catch (FilesystemException $e) { |
|
| 103 | + }catch (FilesystemException $e){ |
|
| 104 | 104 | throw new FileOperationException($e->getMessage(), $e->getCode(), $e); |
| 105 | 105 | } |
| 106 | 106 | |
@@ -121,10 +121,10 @@ discard block |
||
| 121 | 121 | ): FileInterface { |
| 122 | 122 | $fs = $this->getOperator(); |
| 123 | 123 | |
| 124 | - if ($storage === null || $storage === $this) { |
|
| 125 | - try { |
|
| 124 | + if ($storage === null || $storage === $this){ |
|
| 125 | + try{ |
|
| 126 | 126 | $fs->move($source, $destination, $config); |
| 127 | - } catch (FilesystemException $e) { |
|
| 127 | + }catch (FilesystemException $e){ |
|
| 128 | 128 | throw new FileOperationException($e->getMessage(), $e->getCode(), $e); |
| 129 | 129 | } |
| 130 | 130 | |
@@ -145,13 +145,13 @@ discard block |
||
| 145 | 145 | { |
| 146 | 146 | $fs = $this->getOperator(); |
| 147 | 147 | |
| 148 | - try { |
|
| 148 | + try{ |
|
| 149 | 149 | $fs->delete($pathname); |
| 150 | 150 | |
| 151 | - if ($clean) { |
|
| 151 | + if ($clean){ |
|
| 152 | 152 | $this->deleteEmptyDirectories($this->getParentDirectory($pathname)); |
| 153 | 153 | } |
| 154 | - } catch (FilesystemException $e) { |
|
| 154 | + }catch (FilesystemException $e){ |
|
| 155 | 155 | throw new FileOperationException($e->getMessage(), $e->getCode(), $e); |
| 156 | 156 | } |
| 157 | 157 | } |
@@ -207,19 +207,19 @@ discard block |
||
| 207 | 207 | */ |
| 208 | 208 | private function deleteEmptyDirectories(string $directory): void |
| 209 | 209 | { |
| 210 | - if (!$this->hasParentDirectory($directory)) { |
|
| 210 | + if (!$this->hasParentDirectory($directory)){ |
|
| 211 | 211 | return; |
| 212 | 212 | } |
| 213 | 213 | |
| 214 | 214 | $fs = $this->getOperator(); |
| 215 | 215 | |
| 216 | - try { |
|
| 217 | - if (!$this->hasFiles($directory)) { |
|
| 216 | + try{ |
|
| 217 | + if (!$this->hasFiles($directory)){ |
|
| 218 | 218 | $fs->deleteDirectory($directory); |
| 219 | 219 | |
| 220 | 220 | $this->deleteEmptyDirectories($this->getParentDirectory($directory)); |
| 221 | 221 | } |
| 222 | - } catch (FilesystemException $e) { |
|
| 222 | + }catch (FilesystemException $e){ |
|
| 223 | 223 | throw new FileOperationException($e->getMessage(), $e->getCode(), $e); |
| 224 | 224 | } |
| 225 | 225 | } |
@@ -241,7 +241,7 @@ discard block |
||
| 241 | 241 | { |
| 242 | 242 | $fs = $this->getOperator(); |
| 243 | 243 | |
| 244 | - foreach ($fs->listContents($directory) as $_) { |
|
| 244 | + foreach ($fs->listContents($directory) as $_){ |
|
| 245 | 245 | return true; |
| 246 | 246 | } |
| 247 | 247 | |
@@ -256,15 +256,15 @@ discard block |
||
| 256 | 256 | */ |
| 257 | 257 | private function isStringable($value): bool |
| 258 | 258 | { |
| 259 | - if (\is_string($value)) { |
|
| 259 | + if (\is_string($value)){ |
|
| 260 | 260 | return true; |
| 261 | 261 | } |
| 262 | 262 | |
| 263 | - if (!\is_object($value)) { |
|
| 263 | + if (!\is_object($value)){ |
|
| 264 | 264 | return false; |
| 265 | 265 | } |
| 266 | 266 | |
| 267 | - if (\PHP_VERSION_ID >= 80000) { |
|
| 267 | + if (\PHP_VERSION_ID >= 80000){ |
|
| 268 | 268 | return $value instanceof \Stringable; |
| 269 | 269 | } |
| 270 | 270 | |
@@ -29,7 +29,8 @@ discard block |
||
| 29 | 29 | */ |
| 30 | 30 | public function create(string $pathname, array $config = []): FileInterface |
| 31 | 31 | { |
| 32 | - if ($this instanceof ReadableInterface && !$this->exists($pathname)) { |
|
| 32 | + if ($this instanceof ReadableInterface && !$this->exists($pathname)) |
|
| 33 | + { |
|
| 33 | 34 | return $this->write($pathname, '', $config); |
| 34 | 35 | } |
| 35 | 36 | |
@@ -45,8 +46,10 @@ discard block |
||
| 45 | 46 | |
| 46 | 47 | $fs = $this->getOperator(); |
| 47 | 48 | |
| 48 | - try { |
|
| 49 | - switch (true) { |
|
| 49 | + try |
|
| 50 | + { |
|
| 51 | + switch (true) |
|
| 52 | + { |
|
| 50 | 53 | case \is_object($content): |
| 51 | 54 | case \is_string($content): |
| 52 | 55 | $fs->write($pathname, (string)$content, $config); |
@@ -60,7 +63,9 @@ discard block |
||
| 60 | 63 | $message = 'Content must be a resource stream or stringable type, but %s passed'; |
| 61 | 64 | throw new \InvalidArgumentException(\sprintf($message, \get_debug_type($content))); |
| 62 | 65 | } |
| 63 | - } catch (FilesystemException $e) { |
|
| 66 | + } |
|
| 67 | + catch (FilesystemException $e) |
|
| 68 | + { |
|
| 64 | 69 | throw new FileOperationException($e->getMessage(), $e->getCode(), $e); |
| 65 | 70 | } |
| 66 | 71 | |
@@ -77,9 +82,12 @@ discard block |
||
| 77 | 82 | ): FileInterface { |
| 78 | 83 | $fs = $this->getOperator(); |
| 79 | 84 | |
| 80 | - try { |
|
| 85 | + try |
|
| 86 | + { |
|
| 81 | 87 | $fs->setVisibility($pathname, $this->toFlysystemVisibility($visibility)); |
| 82 | - } catch (FilesystemException $e) { |
|
| 88 | + } |
|
| 89 | + catch (FilesystemException $e) |
|
| 90 | + { |
|
| 83 | 91 | throw new FileOperationException($e->getMessage(), $e->getCode(), $e); |
| 84 | 92 | } |
| 85 | 93 | |
@@ -97,10 +105,14 @@ discard block |
||
| 97 | 105 | ): FileInterface { |
| 98 | 106 | $fs = $this->getOperator(); |
| 99 | 107 | |
| 100 | - if ($storage === null || $storage === $this) { |
|
| 101 | - try { |
|
| 108 | + if ($storage === null || $storage === $this) |
|
| 109 | + { |
|
| 110 | + try |
|
| 111 | + { |
|
| 102 | 112 | $fs->copy($source, $destination, $config); |
| 103 | - } catch (FilesystemException $e) { |
|
| 113 | + } |
|
| 114 | + catch (FilesystemException $e) |
|
| 115 | + { |
|
| 104 | 116 | throw new FileOperationException($e->getMessage(), $e->getCode(), $e); |
| 105 | 117 | } |
| 106 | 118 | |
@@ -121,10 +133,14 @@ discard block |
||
| 121 | 133 | ): FileInterface { |
| 122 | 134 | $fs = $this->getOperator(); |
| 123 | 135 | |
| 124 | - if ($storage === null || $storage === $this) { |
|
| 125 | - try { |
|
| 136 | + if ($storage === null || $storage === $this) |
|
| 137 | + { |
|
| 138 | + try |
|
| 139 | + { |
|
| 126 | 140 | $fs->move($source, $destination, $config); |
| 127 | - } catch (FilesystemException $e) { |
|
| 141 | + } |
|
| 142 | + catch (FilesystemException $e) |
|
| 143 | + { |
|
| 128 | 144 | throw new FileOperationException($e->getMessage(), $e->getCode(), $e); |
| 129 | 145 | } |
| 130 | 146 | |
@@ -145,13 +161,17 @@ discard block |
||
| 145 | 161 | { |
| 146 | 162 | $fs = $this->getOperator(); |
| 147 | 163 | |
| 148 | - try { |
|
| 164 | + try |
|
| 165 | + { |
|
| 149 | 166 | $fs->delete($pathname); |
| 150 | 167 | |
| 151 | - if ($clean) { |
|
| 168 | + if ($clean) |
|
| 169 | + { |
|
| 152 | 170 | $this->deleteEmptyDirectories($this->getParentDirectory($pathname)); |
| 153 | 171 | } |
| 154 | - } catch (FilesystemException $e) { |
|
| 172 | + } |
|
| 173 | + catch (FilesystemException $e) |
|
| 174 | + { |
|
| 155 | 175 | throw new FileOperationException($e->getMessage(), $e->getCode(), $e); |
| 156 | 176 | } |
| 157 | 177 | } |
@@ -207,19 +227,24 @@ discard block |
||
| 207 | 227 | */ |
| 208 | 228 | private function deleteEmptyDirectories(string $directory): void |
| 209 | 229 | { |
| 210 | - if (!$this->hasParentDirectory($directory)) { |
|
| 230 | + if (!$this->hasParentDirectory($directory)) |
|
| 231 | + { |
|
| 211 | 232 | return; |
| 212 | 233 | } |
| 213 | 234 | |
| 214 | 235 | $fs = $this->getOperator(); |
| 215 | 236 | |
| 216 | - try { |
|
| 217 | - if (!$this->hasFiles($directory)) { |
|
| 237 | + try |
|
| 238 | + { |
|
| 239 | + if (!$this->hasFiles($directory)) |
|
| 240 | + { |
|
| 218 | 241 | $fs->deleteDirectory($directory); |
| 219 | 242 | |
| 220 | 243 | $this->deleteEmptyDirectories($this->getParentDirectory($directory)); |
| 221 | 244 | } |
| 222 | - } catch (FilesystemException $e) { |
|
| 245 | + } |
|
| 246 | + catch (FilesystemException $e) |
|
| 247 | + { |
|
| 223 | 248 | throw new FileOperationException($e->getMessage(), $e->getCode(), $e); |
| 224 | 249 | } |
| 225 | 250 | } |
@@ -241,7 +266,8 @@ discard block |
||
| 241 | 266 | { |
| 242 | 267 | $fs = $this->getOperator(); |
| 243 | 268 | |
| 244 | - foreach ($fs->listContents($directory) as $_) { |
|
| 269 | + foreach ($fs->listContents($directory) as $_) |
|
| 270 | + { |
|
| 245 | 271 | return true; |
| 246 | 272 | } |
| 247 | 273 | |
@@ -256,15 +282,18 @@ discard block |
||
| 256 | 282 | */ |
| 257 | 283 | private function isStringable($value): bool |
| 258 | 284 | { |
| 259 | - if (\is_string($value)) { |
|
| 285 | + if (\is_string($value)) |
|
| 286 | + { |
|
| 260 | 287 | return true; |
| 261 | 288 | } |
| 262 | 289 | |
| 263 | - if (!\is_object($value)) { |
|
| 290 | + if (!\is_object($value)) |
|
| 291 | + { |
|
| 264 | 292 | return false; |
| 265 | 293 | } |
| 266 | 294 | |
| 267 | - if (\PHP_VERSION_ID >= 80000) { |
|
| 295 | + if (\PHP_VERSION_ID >= 80000) |
|
| 296 | + { |
|
| 268 | 297 | return $value instanceof \Stringable; |
| 269 | 298 | } |
| 270 | 299 | |
@@ -22,11 +22,11 @@ |
||
| 22 | 22 | * @var string |
| 23 | 23 | * @psalm-var VisibilityType |
| 24 | 24 | */ |
| 25 | - public const VISIBILITY_PUBLIC = \League\Flysystem\Visibility::PUBLIC; |
|
| 25 | + public const VISIBILITY_PUBLIC = \League\Flysystem\Visibility::public; |
|
| 26 | 26 | |
| 27 | 27 | /** |
| 28 | 28 | * @var string |
| 29 | 29 | * @psalm-var VisibilityType |
| 30 | 30 | */ |
| 31 | - public const VISIBILITY_PRIVATE = \League\Flysystem\Visibility::PRIVATE; |
|
| 31 | + public const VISIBILITY_PRIVATE = \League\Flysystem\Visibility::private; |
|
| 32 | 32 | } |
@@ -44,11 +44,11 @@ discard block |
||
| 44 | 44 | */ |
| 45 | 45 | private function registerResolver(Container $app): void |
| 46 | 46 | { |
| 47 | - $app->bindSingleton(UriResolverInterface::class, static function (DistributionInterface $manager) { |
|
| 47 | + $app->bindSingleton(UriResolverInterface::class, static function (DistributionInterface $manager){ |
|
| 48 | 48 | return $manager->resolver(); |
| 49 | 49 | }); |
| 50 | 50 | |
| 51 | - $app->bindSingleton(UriResolver::class, static function (Container $app) { |
|
| 51 | + $app->bindSingleton(UriResolver::class, static function (Container $app){ |
|
| 52 | 52 | return $app->get(UriResolverInterface::class); |
| 53 | 53 | }); |
| 54 | 54 | } |
@@ -58,21 +58,21 @@ discard block |
||
| 58 | 58 | */ |
| 59 | 59 | private function registerManager(Container $app): void |
| 60 | 60 | { |
| 61 | - $app->bindSingleton(DistributionInterface::class, static function (DistributionConfig $config) { |
|
| 61 | + $app->bindSingleton(DistributionInterface::class, static function (DistributionConfig $config){ |
|
| 62 | 62 | $manager = new Manager($config->getDefaultDriver()); |
| 63 | 63 | |
| 64 | - foreach ($config->getResolvers() as $name => $resolver) { |
|
| 64 | + foreach ($config->getResolvers() as $name => $resolver){ |
|
| 65 | 65 | $manager->add($name, $resolver); |
| 66 | 66 | } |
| 67 | 67 | |
| 68 | 68 | return $manager; |
| 69 | 69 | }); |
| 70 | 70 | |
| 71 | - $app->bindSingleton(MutableDistributionInterface::class, static function (Container $app) { |
|
| 71 | + $app->bindSingleton(MutableDistributionInterface::class, static function (Container $app){ |
|
| 72 | 72 | return $app->get(DistributionInterface::class); |
| 73 | 73 | }); |
| 74 | 74 | |
| 75 | - $app->bindSingleton(Manager::class, static function (Container $app) { |
|
| 75 | + $app->bindSingleton(Manager::class, static function (Container $app){ |
|
| 76 | 76 | return $app->get(DistributionInterface::class); |
| 77 | 77 | }); |
| 78 | 78 | } |
@@ -44,11 +44,13 @@ discard block |
||
| 44 | 44 | */ |
| 45 | 45 | private function registerResolver(Container $app): void |
| 46 | 46 | { |
| 47 | - $app->bindSingleton(UriResolverInterface::class, static function (DistributionInterface $manager) { |
|
| 47 | + $app->bindSingleton(UriResolverInterface::class, static function (DistributionInterface $manager) |
|
| 48 | + { |
|
| 48 | 49 | return $manager->resolver(); |
| 49 | 50 | }); |
| 50 | 51 | |
| 51 | - $app->bindSingleton(UriResolver::class, static function (Container $app) { |
|
| 52 | + $app->bindSingleton(UriResolver::class, static function (Container $app) |
|
| 53 | + { |
|
| 52 | 54 | return $app->get(UriResolverInterface::class); |
| 53 | 55 | }); |
| 54 | 56 | } |
@@ -58,21 +60,25 @@ discard block |
||
| 58 | 60 | */ |
| 59 | 61 | private function registerManager(Container $app): void |
| 60 | 62 | { |
| 61 | - $app->bindSingleton(DistributionInterface::class, static function (DistributionConfig $config) { |
|
| 63 | + $app->bindSingleton(DistributionInterface::class, static function (DistributionConfig $config) |
|
| 64 | + { |
|
| 62 | 65 | $manager = new Manager($config->getDefaultDriver()); |
| 63 | 66 | |
| 64 | - foreach ($config->getResolvers() as $name => $resolver) { |
|
| 67 | + foreach ($config->getResolvers() as $name => $resolver) |
|
| 68 | + { |
|
| 65 | 69 | $manager->add($name, $resolver); |
| 66 | 70 | } |
| 67 | 71 | |
| 68 | 72 | return $manager; |
| 69 | 73 | }); |
| 70 | 74 | |
| 71 | - $app->bindSingleton(MutableDistributionInterface::class, static function (Container $app) { |
|
| 75 | + $app->bindSingleton(MutableDistributionInterface::class, static function (Container $app) |
|
| 76 | + { |
|
| 72 | 77 | return $app->get(DistributionInterface::class); |
| 73 | 78 | }); |
| 74 | 79 | |
| 75 | - $app->bindSingleton(Manager::class, static function (Container $app) { |
|
| 80 | + $app->bindSingleton(Manager::class, static function (Container $app) |
|
| 81 | + { |
|
| 76 | 82 | return $app->get(DistributionInterface::class); |
| 77 | 83 | }); |
| 78 | 84 | } |