From 118901742910d89d28ee93dcf796bd60596062c6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Guillaume=20Perr=C3=A9al?= <guillaume.perreal@irstea.fr> Date: Mon, 26 Jan 2015 15:06:33 +0100 Subject: [PATCH] Irstea\FileUploadBundle\Service\FileManagerInterface => Irstea\FileUploadBundle\Model\FileManagerInterface. --- Controller/UploadController.php | 2 +- Entity/Repository/UploadedFileRepository.php | 2 +- Form/DataTranformer/UploadedFileTransformer.php | 2 +- Form/Type/FileUploadType.php | 2 +- {Service => Model}/FileManagerInterface.php | 17 +++++++---------- 5 files changed, 11 insertions(+), 14 deletions(-) rename {Service => Model}/FileManagerInterface.php (55%) diff --git a/Controller/UploadController.php b/Controller/UploadController.php index 61070625..18589565 100644 --- a/Controller/UploadController.php +++ b/Controller/UploadController.php @@ -9,7 +9,7 @@ namespace Irstea\FileUploadBundle\Controller; use Irstea\FileUploadBundle\Entity\UploadedFile; use Irstea\FileUploadBundle\Http\UploadedFileResponse; -use Irstea\FileUploadBundle\Service\FileManagerInterface; +use Irstea\FileUploadBundle\Model\FileManagerInterface; use Sensio\Bundle\FrameworkExtraBundle\Configuration\Method; use Sensio\Bundle\FrameworkExtraBundle\Configuration\Route; use Symfony\Bundle\FrameworkBundle\Controller\Controller; diff --git a/Entity/Repository/UploadedFileRepository.php b/Entity/Repository/UploadedFileRepository.php index a4e8db8e..9335ec40 100644 --- a/Entity/Repository/UploadedFileRepository.php +++ b/Entity/Repository/UploadedFileRepository.php @@ -12,7 +12,7 @@ use Gaufrette\Filesystem; use Irstea\FileUploadBundle\Entity\UploadedFile; use Irstea\FileUploadBundle\Event\FileUploadCompleteEvent; use Irstea\FileUploadBundle\FileUploadEvents; -use Irstea\FileUploadBundle\Service\FileManagerInterface; +use Irstea\FileUploadBundle\Model\FileManagerInterface; use Psr\Log\LogLevel; use Symfony\Component\EventDispatcher\EventDispatcher; use Symfony\Component\EventDispatcher\EventDispatcherInterface; diff --git a/Form/DataTranformer/UploadedFileTransformer.php b/Form/DataTranformer/UploadedFileTransformer.php index 845dd4cd..c97958c0 100644 --- a/Form/DataTranformer/UploadedFileTransformer.php +++ b/Form/DataTranformer/UploadedFileTransformer.php @@ -8,7 +8,7 @@ namespace Irstea\FileUploadBundle\Form\DataTranformer; use Irstea\FileUploadBundle\Entity\UploadedFile; -use Irstea\FileUploadBundle\Service\FileManagerInterface; +use Irstea\FileUploadBundle\Model\FileManagerInterface; use Symfony\Component\Form\DataTransformerInterface; use Symfony\Component\Form\Exception\TransformationFailedException; diff --git a/Form/Type/FileUploadType.php b/Form/Type/FileUploadType.php index e570f5ad..82fd1ae4 100644 --- a/Form/Type/FileUploadType.php +++ b/Form/Type/FileUploadType.php @@ -9,7 +9,7 @@ namespace Irstea\FileUploadBundle\Form\Type; use Irstea\FileUploadBundle\Controller\UploadController; use Irstea\FileUploadBundle\Form\DataTranformer\UploadedFileTransformer; -use Irstea\FileUploadBundle\Service\FileManagerInterface; +use Irstea\FileUploadBundle\Model\FileManagerInterface; use Symfony\Bridge\Doctrine\Form\DataTransformer\CollectionToArrayTransformer; use Symfony\Component\Form\AbstractType; use Symfony\Component\Form\Extension\Core\EventListener\MergeCollectionListener; diff --git a/Service/FileManagerInterface.php b/Model/FileManagerInterface.php similarity index 55% rename from Service/FileManagerInterface.php rename to Model/FileManagerInterface.php index b73817d6..bba54a89 100644 --- a/Service/FileManagerInterface.php +++ b/Model/FileManagerInterface.php @@ -5,10 +5,7 @@ * All rights reserved. */ -namespace Irstea\FileUploadBundle\Service; - -use Irstea\FileUploadBundle\Entity\UploadedFile; -use Symfony\Component\HttpFoundation\Response; +namespace Irstea\FileUploadBundle\Model; /** * Description of FileManager @@ -18,7 +15,7 @@ interface FileManagerInterface /** * * @param string $id - * @return UploadedFile + * @return UploadedFileInterface */ public function get($id); @@ -27,17 +24,17 @@ interface FileManagerInterface * @param int $size * @param string $mimeType * @param int $lastModified - * @return UploadedFile + * @return UploadedFileInterface */ public function create($name, $size, $mimeType, $lastModified); /** - * @param UploadedFile $file + * @param UploadedFileInterface $file */ - public function delete(UploadedFile $file); + public function delete(UploadedFileInterface $file); /** - * @param UploadedFile $file + * @param UploadedFileInterface $file */ - public function completed(UploadedFile $file); + public function completed(UploadedFileInterface $file); } -- GitLab