More consice naming.

thephpleague · Oct 19, 2023 · 532bb63 · 532bb63
1 parent 8cca689
commit 532bb63
Show file tree

Hide file tree

Showing 4 changed files with 13 additions and 19 deletions.
diff --git a/src/Config.php b/src/Config.php
@@ -8,8 +8,8 @@
 
 class Config
 {
-    public const OPTION_COPY_DESTINATION_SAME_AS_SOURCE = 'copy_destination_same_as_source';
-    public const OPTION_MOVE_DESTINATION_SAME_AS_SOURCE = 'move_destination_same_as_source';
+    public const OPTION_COPY_IDENTICAL_PATH = 'copy_destination_same_as_source';
+    public const OPTION_MOVE_IDENTICAL_PATH = 'move_destination_same_as_source';
     public const OPTION_VISIBILITY = 'visibility';
     public const OPTION_DIRECTORY_VISIBILITY = 'directory_visibility';
 

diff --git a/src/Filesystem.php b/src/Filesystem.php
@@ -124,14 +124,11 @@ public function move(string $source, string $destination, array $config = []): v
         $to = $this->pathNormalizer->normalizePath($destination);
 
         if ($from === $to) {
-            $resolutionStrategy = $config->get(
-                Config::OPTION_MOVE_DESTINATION_SAME_AS_SOURCE,
-                ResolveSameSourceAndDestinationConflict::TRY,
-            );
+            $resolutionStrategy = $config->get(Config::OPTION_MOVE_IDENTICAL_PATH, ResolveIdenticalPathConflict::TRY);
 
-            if ($resolutionStrategy === ResolveSameSourceAndDestinationConflict::FAIL) {
+            if ($resolutionStrategy === ResolveIdenticalPathConflict::FAIL) {
                 throw UnableToMoveFile::sourceAndDestinationAreTheSame($source, $destination);
-            } elseif ($resolutionStrategy === ResolveSameSourceAndDestinationConflict::IGNORE) {
+            } elseif ($resolutionStrategy === ResolveIdenticalPathConflict::IGNORE) {
                 return;
             }
         }
@@ -146,14 +143,11 @@ public function copy(string $source, string $destination, array $config = []): v
         $to = $this->pathNormalizer->normalizePath($destination);
 
         if ($from === $to) {
-            $resolutionStrategy = $config->get(
-                Config::OPTION_COPY_DESTINATION_SAME_AS_SOURCE,
-                ResolveSameSourceAndDestinationConflict::TRY,
-            );
+            $resolutionStrategy = $config->get(Config::OPTION_COPY_IDENTICAL_PATH, ResolveIdenticalPathConflict::TRY);
 
-            if ($resolutionStrategy === ResolveSameSourceAndDestinationConflict::FAIL) {
+            if ($resolutionStrategy === ResolveIdenticalPathConflict::FAIL) {
                 throw UnableToCopyFile::sourceAndDestinationAreTheSame($source, $destination);
-            } elseif ($resolutionStrategy === ResolveSameSourceAndDestinationConflict::IGNORE) {
+            } elseif ($resolutionStrategy === ResolveIdenticalPathConflict::IGNORE) {
                 return;
             }
         }

diff --git a/src/FilesystemTest.php b/src/FilesystemTest.php
@@ -621,8 +621,8 @@ public function ignoring_same_paths_for_move_and_copy(): void
         $filesystem = new Filesystem(
             new InMemoryFilesystemAdapter(),
             [
-                Config::OPTION_COPY_DESTINATION_SAME_AS_SOURCE => ResolveSameSourceAndDestinationConflict::IGNORE,
-                Config::OPTION_MOVE_DESTINATION_SAME_AS_SOURCE => ResolveSameSourceAndDestinationConflict::IGNORE,
+                Config::OPTION_COPY_IDENTICAL_PATH => ResolveIdenticalPathConflict::IGNORE,
+                Config::OPTION_MOVE_IDENTICAL_PATH => ResolveIdenticalPathConflict::IGNORE,
             ]
         );
 
@@ -638,7 +638,7 @@ public function failing_same_paths_for_move(): void
         $filesystem = new Filesystem(
             new InMemoryFilesystemAdapter(),
             [
-                Config::OPTION_MOVE_DESTINATION_SAME_AS_SOURCE => ResolveSameSourceAndDestinationConflict::FAIL,
+                Config::OPTION_MOVE_IDENTICAL_PATH => ResolveIdenticalPathConflict::FAIL,
             ]
         );
 
@@ -654,7 +654,7 @@ public function failing_same_paths_for_copy(): void
         $filesystem = new Filesystem(
             new InMemoryFilesystemAdapter(),
             [
-                Config::OPTION_COPY_DESTINATION_SAME_AS_SOURCE => ResolveSameSourceAndDestinationConflict::FAIL,
+                Config::OPTION_COPY_IDENTICAL_PATH => ResolveIdenticalPathConflict::FAIL,
             ]
         );
 

diff --git a/...solveSameSourceAndDestinationConflict.php → src/ResolveIdenticalPathConflict.php b/...solveSameSourceAndDestinationConflict.php → src/ResolveIdenticalPathConflict.php
@@ -3,7 +3,7 @@
 
 namespace League\Flysystem;
 
-class ResolveSameSourceAndDestinationConflict
+class ResolveIdenticalPathConflict
 {
     public const IGNORE = 'ignore';
     public const FAIL = 'fail';