Moving the file and folder movers inside their own namespace

AsgardCms · Oct 10, 2017 · bc7a09b · bc7a09b
1 parent 6bc5522
commit bc7a09b
Show file tree

Hide file tree

Showing 6 changed files with 11 additions and 12 deletions.
diff --git a/Modules/Media/Http/Controllers/Api/MoveMediaController.php b/Modules/Media/Http/Controllers/Api/MoveMediaController.php
@@ -7,8 +7,8 @@
 use Modules\Media\Http\Requests\MoveMediaRequest;
 use Modules\Media\Repositories\FileRepository;
 use Modules\Media\Repositories\FolderRepository;
-use Modules\Media\Services\FileMover;
-use Modules\Media\Services\FolderMover;
+use Modules\Media\Services\Movers\FileMover;
+use Modules\Media\Services\Movers\FolderMover;
 
 class MoveMediaController extends Controller
 {
@@ -49,7 +49,7 @@ public function __invoke(MoveMediaRequest $request)
         $failedMoves = 0;
         foreach ($request->get('files') as $file) {
             $file = $this->file->find($file['id']);
-
+            // $this->>mover->move($file, $destination)
             if ($file->is_folder === false) {
                 if ($this->fileMover->move($file, $destination) === false) {
                     $failedMoves++;

diff --git a/Modules/Media/Services/FileMover.php → Modules/Media/Services/Movers/FileMover.php b/Modules/Media/Services/FileMover.php → Modules/Media/Services/Movers/FileMover.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Modules\Media\Services;
+namespace Modules\Media\Services\Movers;
 
 use Illuminate\Contracts\Filesystem\Factory;
 use League\Flysystem\FileExistsException;
@@ -9,9 +9,8 @@
 use Modules\Media\Image\ThumbnailManager;
 use Modules\Media\Repositories\FileRepository;
 use Modules\Media\Repositories\FolderRepository;
-use Modules\Media\ValueObjects\MediaPath;
 
-class FileMover implements Mover
+final class FileMover implements MoverInterface
 {
     /**
      * All the different images types where thumbnails should be created

diff --git a/Modules/Media/Services/FolderMover.php → ...les/Media/Services/Movers/FolderMover.php b/Modules/Media/Services/FolderMover.php → ...les/Media/Services/Movers/FolderMover.php
@@ -1,14 +1,14 @@
 <?php
 
-namespace Modules\Media\Services;
+namespace Modules\Media\Services\Movers;
 
 use Illuminate\Contracts\Filesystem\Factory;
 use League\Flysystem\FileExistsException;
 use Modules\Media\Entities\File;
 use Modules\Media\Repositories\FileRepository;
 use Modules\Media\Repositories\FolderRepository;
 
-final class FolderMover implements Mover
+final class FolderMover implements MoverInterface
 {
     /**
      * @var Factory

diff --git a/Modules/Media/Services/Mover.php → .../Media/Services/Movers/MoverInterface.php b/Modules/Media/Services/Mover.php → .../Media/Services/Movers/MoverInterface.php
@@ -1,10 +1,10 @@
 <?php
 
-namespace Modules\Media\Services;
+namespace Modules\Media\Services\Movers;
 
 use Modules\Media\Entities\File;
 
-interface Mover
+interface MoverInterface
 {
     public function move(File $file, File $destination) : bool;
 }
diff --git a/Modules/Media/Tests/FileMoverTest.php b/Modules/Media/Tests/FileMoverTest.php
@@ -5,7 +5,7 @@
 use Modules\Media\Entities\File;
 use Modules\Media\Repositories\FileRepository;
 use Modules\Media\Repositories\FolderRepository;
-use Modules\Media\Services\FileMover;
+use Modules\Media\Services\Movers\FileMover;
 use Modules\Media\Services\FileService;
 
 final class FileMoverTest extends MediaTestCase

diff --git a/Modules/Media/Tests/FolderMoverTest.php b/Modules/Media/Tests/FolderMoverTest.php
@@ -5,7 +5,7 @@
 use Modules\Media\Entities\File;
 use Modules\Media\Repositories\FolderRepository;
 use Modules\Media\Services\FileService;
-use Modules\Media\Services\FolderMover;
+use Modules\Media\Services\Movers\FolderMover;
 
 final class FolderMoverTest extends MediaTestCase
 {