From 52d6549531153161cd173eb0722ed1d5d5774ab7 Mon Sep 17 00:00:00 2001 From: Wim Vandersmissen Date: Mon, 7 Apr 2014 14:14:45 +0200 Subject: [PATCH 1/2] code reformatting/cleanup & fix parent required in foldertype --- .../ItemAction/MediaDeleteItemAction.php | 4 +- AdminList/ItemAction/MediaEditItemAction.php | 4 +- AdminList/MediaAdminListConfigurator.php | 37 ++-- Controller/AviaryController.php | 23 +- Controller/ChooserController.php | 73 ++++--- Controller/FolderController.php | 85 +++++--- Controller/MediaController.php | 194 +++++++++-------- DataFixtures/ORM/FolderFixtures.php | 14 +- Entity/Folder.php | 199 +++++++++--------- EventListener/DoctrineMediaListener.php | 2 +- Form/BulkUploadType.php | 25 ++- Form/File/FileType.php | 15 +- Form/FolderType.php | 85 +++++--- Form/RemoteAudio/RemoteAudioType.php | 28 ++- Form/RemoteSlide/RemoteSlideType.php | 28 ++- Form/RemoteVideo/RemoteVideoType.php | 28 ++- Form/Type/IdToMediaTransformer.php | 17 +- Form/Type/MediaType.php | 34 +-- Helper/Menu/MediaMenuAdaptor.php | 4 +- Repository/FolderRepository.php | 14 +- Repository/MediaRepository.php | 4 +- Resources/views/Folder/addsub-modal.html.twig | 4 +- 22 files changed, 510 insertions(+), 411 deletions(-) diff --git a/AdminList/ItemAction/MediaDeleteItemAction.php b/AdminList/ItemAction/MediaDeleteItemAction.php index b2db52ea..958844f4 100644 --- a/AdminList/ItemAction/MediaDeleteItemAction.php +++ b/AdminList/ItemAction/MediaDeleteItemAction.php @@ -27,8 +27,8 @@ function __construct($redirectUrl) public function getUrlFor($item) { return array( - 'path' => 'KunstmaanMediaBundle_media_delete', - 'params' => array('mediaId' => $item->getId(), 'redirectUrl' => $this->redirectUrl) + 'path' => 'KunstmaanMediaBundle_media_delete', + 'params' => array('mediaId' => $item->getId(), 'redirectUrl' => $this->redirectUrl) ); } diff --git a/AdminList/ItemAction/MediaEditItemAction.php b/AdminList/ItemAction/MediaEditItemAction.php index 08019458..94b912e0 100644 --- a/AdminList/ItemAction/MediaEditItemAction.php +++ b/AdminList/ItemAction/MediaEditItemAction.php @@ -14,8 +14,8 @@ class MediaEditItemAction implements ItemActionInterface public function getUrlFor($item) { return array( - 'path' => 'KunstmaanMediaBundle_media_show', - 'params' => array('mediaId' => $item->getId()) + 'path' => 'KunstmaanMediaBundle_media_show', + 'params' => array('mediaId' => $item->getId()) ); } diff --git a/AdminList/MediaAdminListConfigurator.php b/AdminList/MediaAdminListConfigurator.php index a661023a..36034df9 100644 --- a/AdminList/MediaAdminListConfigurator.php +++ b/AdminList/MediaAdminListConfigurator.php @@ -4,9 +4,9 @@ use Doctrine\ORM\EntityManager; use Doctrine\ORM\QueryBuilder; -use Kunstmaan\AdminListBundle\AdminList\FilterType\ORM; -use Kunstmaan\AdminListBundle\AdminList\Configurator\AbstractDoctrineORMAdminListConfigurator; use Kunstmaan\AdminBundle\Helper\Security\Acl\AclHelper; +use Kunstmaan\AdminListBundle\AdminList\Configurator\AbstractDoctrineORMAdminListConfigurator; +use Kunstmaan\AdminListBundle\AdminList\FilterType\ORM; use Kunstmaan\MediaBundle\AdminList\ItemAction\MediaDeleteItemAction; use Kunstmaan\MediaBundle\AdminList\ItemAction\MediaEditItemAction; use Kunstmaan\MediaBundle\AdminList\ItemAction\MediaSelectItemAction; @@ -40,12 +40,17 @@ class MediaAdminListConfigurator extends AbstractDoctrineORMAdminListConfigurato * @param Folder $folder The current folder * @param Request $request The request object */ - public function __construct(EntityManager $em, AclHelper $aclHelper = null, MediaManager $mediaManager, Folder $folder, Request $request) - { + public function __construct( + EntityManager $em, + AclHelper $aclHelper = null, + MediaManager $mediaManager, + Folder $folder, + Request $request + ) { parent::__construct($em, $aclHelper); $this->setAdminType(new MediaType($mediaManager, $em)); - $this->folder = $folder; + $this->folder = $folder; $this->request = $request; } @@ -68,7 +73,7 @@ public function buildFilters() $this->addFilter('name', new ORM\StringFilterType('name'), 'Name'); $this->addFilter('contentType', new ORM\StringFilterType('contentType'), 'Type'); $this->addFilter('updatedAt', new ORM\NumberFilterType('updatedAt'), 'Date'); - $this->addFilter('filesize', new ORM\NumberFilterType('filesize'), 'Filsize (in bytes)'); + $this->addFilter('filesize', new ORM\NumberFilterType('filesize'), 'Filesize (in bytes)'); } /** @@ -79,8 +84,8 @@ public function buildFilters() public function getIndexUrl() { return array( - 'path' => 'KunstmaanMediaBundle_folder_show', - 'params' => array('folderId' => $this->folder->getId()) + 'path' => 'KunstmaanMediaBundle_folder_show', + 'params' => array('folderId' => $this->folder->getId()) ); } @@ -153,9 +158,9 @@ public function getEntityName() public function adaptQueryBuilder(QueryBuilder $queryBuilder) { $queryBuilder->andWhere('b.folder = :folder') - ->setParameter('folder', $this->folder->getId()) - ->andWhere('b.deleted = 0') - ->orderBy('b.updatedAt', 'DESC'); + ->setParameter('folder', $this->folder->getId()) + ->andWhere('b.deleted = 0') + ->orderBy('b.updatedAt', 'DESC'); if ($this->request->get('_route') == 'KunstmaanMediaBundle_chooser_show_folder') { $type = $this->request->query->get('type'); @@ -163,23 +168,23 @@ public function adaptQueryBuilder(QueryBuilder $queryBuilder) switch ($type) { case 'file': $queryBuilder->andWhere('b.location = :location') - ->setParameter('location', 'local'); + ->setParameter('location', 'local'); break; case 'image': $queryBuilder->andWhere('b.contentType LIKE :ctype') - ->setParameter('ctype', '%image%'); + ->setParameter('ctype', '%image%'); break; case RemoteAudioHandler::TYPE: $queryBuilder->andWhere('b.contentType = :ctype') - ->setParameter('ctype', RemoteAudioHandler::CONTENT_TYPE); + ->setParameter('ctype', RemoteAudioHandler::CONTENT_TYPE); break; case RemoteSlideHandler::TYPE: $queryBuilder->andWhere('b.contentType = :ctype') - ->setParameter('ctype', RemoteSlideHandler::CONTENT_TYPE); + ->setParameter('ctype', RemoteSlideHandler::CONTENT_TYPE); break; case RemoteVideoHandler::TYPE: $queryBuilder->andWhere('b.contentType = :ctype') - ->setParameter('ctype', RemoteVideoHandler::CONTENT_TYPE); + ->setParameter('ctype', RemoteVideoHandler::CONTENT_TYPE); break; } } diff --git a/Controller/AviaryController.php b/Controller/AviaryController.php index 7e4a674f..f6d5e7e8 100644 --- a/Controller/AviaryController.php +++ b/Controller/AviaryController.php @@ -3,12 +3,13 @@ namespace Kunstmaan\MediaBundle\Controller; -use Symfony\Bundle\FrameworkBundle\Controller\Controller; use Kunstmaan\MediaBundle\Entity\Folder; -use Sensio\Bundle\FrameworkExtraBundle\Configuration\Route; -use Symfony\Component\HttpFoundation\RedirectResponse; use Kunstmaan\MediaBundle\Entity\Media; use Kunstmaan\MediaBundle\Helper\MediaManager; +use Sensio\Bundle\FrameworkExtraBundle\Configuration\Route; +use Symfony\Bundle\FrameworkBundle\Controller\Controller; +use Symfony\Component\HttpFoundation\RedirectResponse; +use Symfony\Component\HttpFoundation\Request; /** * controllerclass which Aviary can use to upload the edited image and add it to the database @@ -17,13 +18,14 @@ class AviaryController extends Controller { /** - * @param int $folderId The id of the Folder - * @param int $mediaId The id of the image + * @param Request $request + * @param int $folderId The id of the Folder + * @param int $mediaId The id of the image * * @Route("/aviary/{folderId}/{mediaId}", requirements={"folderId" = "\d+", "mediaId" = "\d+"}, name="KunstmaanMediaBundle_aviary") * @return RedirectResponse */ - public function indexAction($folderId, $mediaId) + public function indexAction(Request $request, $folderId, $mediaId) { $em = $this->getDoctrine()->getManager(); @@ -34,14 +36,17 @@ public function indexAction($folderId, $mediaId) /* @var MediaManager $mediaManager */ $mediaManager = $this->get('kunstmaan_media.media_manager'); - $handler = $mediaManager->getHandler($media); + $handler = $mediaManager->getHandler($media); $fileHelper = $handler->getFormHelper($media); - $fileHelper->getMediaFromUrl($this->getRequest()->get('url')); + $fileHelper->getMediaFromUrl($request->get('url')); $media = $fileHelper->getMedia(); $em->persist($media); $em->flush(); - return new RedirectResponse($this->generateUrl('KunstmaanMediaBundle_folder_show', array('folderId' => $folder->getId()))); + return new RedirectResponse($this->generateUrl( + 'KunstmaanMediaBundle_folder_show', + array('folderId' => $folder->getId()) + )); } } diff --git a/Controller/ChooserController.php b/Controller/ChooserController.php index 9aeeaf59..d620d579 100644 --- a/Controller/ChooserController.php +++ b/Controller/ChooserController.php @@ -10,6 +10,7 @@ use Sensio\Bundle\FrameworkExtraBundle\Configuration\Template; use Symfony\Bundle\FrameworkBundle\Controller\Controller; use Symfony\Component\HttpFoundation\RedirectResponse; +use Symfony\Component\HttpFoundation\Request; /** * ChooserController. @@ -20,16 +21,18 @@ class ChooserController extends Controller /** * @Route("/chooser", name="KunstmaanMediaBundle_chooser") * + * @param Request $request + * * @return RedirectResponse */ - public function chooserIndexAction() + public function chooserIndexAction(Request $request) { - $em = $this->getDoctrine()->getManager(); - $session = $this->getRequest()->getSession(); + $em = $this->getDoctrine()->getManager(); + $session = $request->getSession(); - $type = $this->getRequest()->get('type'); - $cKEditorFuncNum = $this->getRequest()->get('CKEditorFuncNum'); - $linkChooser = $this->getRequest()->get('linkChooser'); + $type = $request->get('type'); + $cKEditorFuncNum = $request->get('CKEditorFuncNum'); + $linkChooser = $request->get('linkChooser'); // Go to the last visited folder if ($session->get('last-media-folder')) { @@ -38,36 +41,36 @@ public function chooserIndexAction() // Redirect to the first top folder /* @var Folder $firstFolder */ $firstFolder = $em->getRepository('KunstmaanMediaBundle:Folder')->getFirstTopFolder(); - $folderId = $firstFolder->getId(); + $folderId = $firstFolder->getId(); } $params = array( - 'folderId' => $folderId, - 'type' => $type, - 'CKEditorFuncNum' => $cKEditorFuncNum, - 'linkChooser' => $linkChooser + 'folderId' => $folderId, + 'type' => $type, + 'CKEditorFuncNum' => $cKEditorFuncNum, + 'linkChooser' => $linkChooser ); return $this->redirect($this->generateUrl('KunstmaanMediaBundle_chooser_show_folder', $params)); } /** - * @param int $folderId The folder id + * @param Request $request + * @param int $folderId The folder id * * @Route("/chooser/{folderId}", requirements={"folderId" = "\d+"}, name="KunstmaanMediaBundle_chooser_show_folder") * @Template() * * @return array */ - public function chooserShowFolderAction($folderId) + public function chooserShowFolderAction(Request $request, $folderId) { - $em = $this->getDoctrine()->getManager(); - $request = $this->getRequest(); + $em = $this->getDoctrine()->getManager(); $session = $request->getSession(); - $type = $this->getRequest()->get('type'); - $cKEditorFuncNum = $this->getRequest()->get('CKEditorFuncNum'); - $linkChooser = $this->getRequest()->get('linkChooser'); + $type = $request->get('type'); + $cKEditorFuncNum = $request->get('CKEditorFuncNum'); + $linkChooser = $request->get('linkChooser'); // Remember the last visited folder in the session $session->set('last-media-folder', $folderId); @@ -97,7 +100,7 @@ public function chooserShowFolderAction($folderId) $mediaManager = $this->get('kunstmaan_media.media_manager'); $adminListConfigurator = new MediaAdminListConfigurator($em, null, $mediaManager, $folder, $request); - $adminList = $this->get('kunstmaan_adminlist.factory')->createList($adminListConfigurator); + $adminList = $this->get('kunstmaan_adminlist.factory')->createList($adminListConfigurator); $adminList->bindRequest($request); $linkChooserLink = null; @@ -105,7 +108,7 @@ public function chooserShowFolderAction($folderId) $params = array(); if (!empty($cKEditorFuncNum)) { $params['CKEditorFuncNum'] = $cKEditorFuncNum; - $routeName = 'KunstmaanNodeBundle_ckselecturl'; + $routeName = 'KunstmaanNodeBundle_ckselecturl'; } else { $routeName = 'KunstmaanNodeBundle_selecturl'; } @@ -113,19 +116,19 @@ public function chooserShowFolderAction($folderId) } return array( - 'cKEditorFuncNum' => $cKEditorFuncNum, - 'linkChooser' => $linkChooser, - 'linkChooserLink' => $linkChooserLink, - 'mediamanager' => $mediaHandler, - 'handler' => $handler, - 'type' => $type, - 'folder' => $folder, - 'folders' => $folders, - 'adminlist' => $adminList, - 'fileform' => $this->createTypeFormView($mediaHandler, "file"), - 'videoform' => $this->createTypeFormView($mediaHandler, "video"), - 'slideform' => $this->createTypeFormView($mediaHandler, "slide"), - 'audioform' => $this->createTypeFormView($mediaHandler, "audio") + 'cKEditorFuncNum' => $cKEditorFuncNum, + 'linkChooser' => $linkChooser, + 'linkChooserLink' => $linkChooserLink, + 'mediamanager' => $mediaHandler, + 'handler' => $handler, + 'type' => $type, + 'folder' => $folder, + 'folders' => $folders, + 'adminlist' => $adminList, + 'fileform' => $this->createTypeFormView($mediaHandler, "file"), + 'videoform' => $this->createTypeFormView($mediaHandler, "video"), + 'slideform' => $this->createTypeFormView($mediaHandler, "slide"), + 'audioform' => $this->createTypeFormView($mediaHandler, "audio") ); } @@ -138,8 +141,8 @@ public function chooserShowFolderAction($folderId) private function createTypeFormView(MediaManager $mediaManager, $type) { $handler = $mediaManager->getHandlerForType($type); - $media = new Media(); - $helper = $handler->getFormHelper($media); + $media = new Media(); + $helper = $handler->getFormHelper($media); return $this->createForm($handler->getFormType(), $helper)->createView(); } diff --git a/Controller/FolderController.php b/Controller/FolderController.php index 24c96d33..61b704be 100644 --- a/Controller/FolderController.php +++ b/Controller/FolderController.php @@ -5,11 +5,12 @@ use Kunstmaan\MediaBundle\AdminList\MediaAdminListConfigurator; use Kunstmaan\MediaBundle\Entity\Folder; use Kunstmaan\MediaBundle\Form\FolderType; +use Sensio\Bundle\FrameworkExtraBundle\Configuration\Method; use Sensio\Bundle\FrameworkExtraBundle\Configuration\Route; use Sensio\Bundle\FrameworkExtraBundle\Configuration\Template; -use Sensio\Bundle\FrameworkExtraBundle\Configuration\Method; use Symfony\Bundle\FrameworkBundle\Controller\Controller; use Symfony\Component\HttpFoundation\RedirectResponse; +use Symfony\Component\HttpFoundation\Request; use Symfony\Component\HttpFoundation\Response; /** @@ -18,17 +19,17 @@ class FolderController extends Controller { /** - * @param int $folderId The folder id + * @param Request $request + * @param int $folderId The folder id * * @Route("/{folderId}", requirements={"folderId" = "\d+"}, name="KunstmaanMediaBundle_folder_show") * @Template() * * @return array */ - public function showAction($folderId) + public function showAction(Request $request, $folderId) { - $em = $this->getDoctrine()->getManager(); - $request = $this->getRequest(); + $em = $this->getDoctrine()->getManager(); $session = $request->getSession(); // Check when user switches between thumb -and list view @@ -43,34 +44,37 @@ public function showAction($folderId) $mediaManager = $this->get('kunstmaan_media.media_manager'); /* @var Folder $folder */ - $folder = $em->getRepository('KunstmaanMediaBundle:Folder')->getFolder($folderId); + $folder = $em->getRepository('KunstmaanMediaBundle:Folder')->getFolder($folderId); $folders = $em->getRepository('KunstmaanMediaBundle:Folder')->getAllFolders(); $adminListConfigurator = new MediaAdminListConfigurator($em, null, $mediaManager, $folder, $request); - $adminList = $this->get('kunstmaan_adminlist.factory')->createList($adminListConfigurator); + $adminList = $this->get('kunstmaan_adminlist.factory')->createList($adminListConfigurator); $adminList->bindRequest($request); $sub = new Folder(); $sub->setParent($folder); - $subForm = $this->createForm(new FolderType($sub), $sub); + $subForm = $this->createForm(new FolderType($sub), $sub); $editForm = $this->createForm(new FolderType($folder), $folder); - if ('POST' == $request->getMethod()) { + if ($request->isMethod('POST')) { $editForm->submit($request); if ($editForm->isValid()) { $em->getRepository('KunstmaanMediaBundle:Folder')->save($folder); - $this->get('session')->getFlashBag()->add('success', 'Folder \''.$folder->getName().'\' has been updated!'); + $this->get('session')->getFlashBag()->add( + 'success', + 'Folder \'' . $folder->getName() . '\' has been updated!' + ); } } return array( - 'mediamanager' => $this->get('kunstmaan_media.media_manager'), - 'subform' => $subForm->createView(), - 'editform' => $editForm->createView(), - 'folder' => $folder, - 'folders' => $folders, - 'adminlist' => $adminList + 'mediamanager' => $this->get('kunstmaan_media.media_manager'), + 'subform' => $subForm->createView(), + 'editform' => $editForm->createView(), + 'folder' => $folder, + 'folders' => $folders, + 'adminlist' => $adminList ); } @@ -86,25 +90,32 @@ public function deleteAction($folderId) $em = $this->getDoctrine()->getManager(); /* @var Folder $folder */ - $folder = $em->getRepository('KunstmaanMediaBundle:Folder')->getFolder($folderId); - $folderName = $folder->getName(); + $folder = $em->getRepository('KunstmaanMediaBundle:Folder')->getFolder($folderId); + $folderName = $folder->getName(); $parentFolder = $folder->getParent(); if (empty($parentFolder)) { - $this->get('session')->getFlashBag()->add('failure', 'You can\'t delete the \''.$folderName.'\' Folder!'); + $this->get('session')->getFlashBag()->add( + 'failure', + 'You can\'t delete the \'' . $folderName . '\' folder!' + ); } else { $folder->setDeleted(true); $em->persist($folder); $em->flush(); - $this->get('session')->getFlashBag()->add('success', 'Folder \''.$folderName.'\' has been deleted!'); + $this->get('session')->getFlashBag()->add('success', 'Folder \'' . $folderName . '\' has been deleted!'); $folderId = $parentFolder->getId(); } - return new RedirectResponse($this->generateUrl('KunstmaanMediaBundle_folder_show', array('folderId' => $folderId))); + return new RedirectResponse($this->generateUrl( + 'KunstmaanMediaBundle_folder_show', + array('folderId' => $folderId) + )); } /** - * @param int $folderId + * @param Request $request + * @param int $folderId * * @Route("/subcreate/{folderId}", requirements={"folderId" = "\d+"}, name="KunstmaanMediaBundle_folder_sub_create") * @Method({"GET", "POST"}) @@ -112,35 +123,43 @@ public function deleteAction($folderId) * * @return Response */ - public function subCreateAction($folderId) + public function subCreateAction(Request $request, $folderId) { $em = $this->getDoctrine()->getManager(); - $request = $this->getRequest(); /* @var Folder $parent */ $parent = $em->getRepository('KunstmaanMediaBundle:Folder')->getFolder($folderId); $folder = new Folder(); $folder->setParent($parent); $form = $this->createForm(new FolderType(), $folder); - if ('POST' == $request->getMethod()) { - $form->bind($request); + if ($request->isMethod('POST')) { + $form->submit($request); if ($form->isValid()) { $em->getRepository('KunstmaanMediaBundle:Folder')->save($folder); - $this->get('session')->getFlashBag()->add('success', 'Folder \''.$folder->getName().'\' has been created!'); + $this->get('session')->getFlashBag()->add( + 'success', + 'Folder \'' . $folder->getName() . '\' has been created!' + ); - return new Response(''); + return new Response(''); } } $galleries = $em->getRepository('KunstmaanMediaBundle:Folder')->getAllFolders(); - return $this->render('KunstmaanMediaBundle:Folder:addsub-modal.html.twig', array( - 'subform' => $form->createView(), + return $this->render( + 'KunstmaanMediaBundle:Folder:addsub-modal.html.twig', + array( + 'subform' => $form->createView(), 'galleries' => $galleries, - 'folder' => $folder, - 'parent' => $parent - )); + 'folder' => $folder, + 'parent' => $parent + ) + ); } } \ No newline at end of file diff --git a/Controller/MediaController.php b/Controller/MediaController.php index 7963bcfa..f07ee398 100644 --- a/Controller/MediaController.php +++ b/Controller/MediaController.php @@ -5,13 +5,14 @@ use Kunstmaan\MediaBundle\Entity\Folder; use Kunstmaan\MediaBundle\Entity\Media; use Kunstmaan\MediaBundle\Helper\MediaManager; +use Sensio\Bundle\FrameworkExtraBundle\Configuration\Method; use Sensio\Bundle\FrameworkExtraBundle\Configuration\Route; use Sensio\Bundle\FrameworkExtraBundle\Configuration\Template; -use Sensio\Bundle\FrameworkExtraBundle\Configuration\Method; +use Symfony\Bundle\FrameworkBundle\Controller\Controller; use Symfony\Component\HttpFoundation\File\File; -use Symfony\Component\HttpFoundation\Response; use Symfony\Component\HttpFoundation\RedirectResponse; -use Symfony\Bundle\FrameworkBundle\Controller\Controller; +use Symfony\Component\HttpFoundation\Request; +use Symfony\Component\HttpFoundation\Response; /** * MediaController @@ -20,74 +21,83 @@ class MediaController extends Controller { /** - * @param int $mediaId + * @param Request $request + * @param int $mediaId * * @Route("/{mediaId}", requirements={"mediaId" = "\d+"}, name="KunstmaanMediaBundle_media_show") * * @return Response */ - public function showAction($mediaId) + public function showAction(Request $request, $mediaId) { $em = $this->getDoctrine()->getManager(); - $request = $this->getRequest(); /* @var Media $media */ - $media = $em->getRepository('KunstmaanMediaBundle:Media')->getMedia($mediaId); + $media = $em->getRepository('KunstmaanMediaBundle:Media')->getMedia($mediaId); $folder = $media->getFolder(); /* @var MediaManager $mediaManager */ $mediaManager = $this->get('kunstmaan_media.media_manager'); - $handler = $mediaManager->getHandler($media); - $helper = $handler->getFormHelper($media); + $handler = $mediaManager->getHandler($media); + $helper = $handler->getFormHelper($media); $form = $this->createForm($handler->getFormType(), $helper); - if ('POST' == $request->getMethod()) { - $form->bind($request); + if ($request->isMethod('POST')) { + $form->submit($request); if ($form->isValid()) { $media = $helper->getMedia(); $em->getRepository('KunstmaanMediaBundle:Media')->save($media); - return new RedirectResponse($this->generateUrl('KunstmaanMediaBundle_media_show', array('mediaId' => $media->getId()))); + return new RedirectResponse($this->generateUrl( + 'KunstmaanMediaBundle_media_show', + array('mediaId' => $media->getId()) + )); } } $showTemplate = $mediaManager->getHandler($media)->getShowTemplate($media); - return $this->render($showTemplate, array( - 'handler' => $handler, + return $this->render( + $showTemplate, + array( + 'handler' => $handler, 'mediamanager' => $this->get('kunstmaan_media.media_manager'), - 'editform' => $form->createView(), - 'media' => $media, - 'helper' => $helper, - 'folder' => $folder - )); + 'editform' => $form->createView(), + 'media' => $media, + 'helper' => $helper, + 'folder' => $folder + ) + ); } /** - * @param int $mediaId + * @param Request $request + * @param int $mediaId * * @Route("/delete/{mediaId}", requirements={"mediaId" = "\d+"}, name="KunstmaanMediaBundle_media_delete") * * @return RedirectResponse */ - public function deleteAction($mediaId) + public function deleteAction(Request $request, $mediaId) { $em = $this->getDoctrine()->getManager(); - $request = $this->getRequest(); /* @var Media $media */ - $media = $em->getRepository('KunstmaanMediaBundle:Media')->getMedia($mediaId); + $media = $em->getRepository('KunstmaanMediaBundle:Media')->getMedia($mediaId); $medianame = $media->getName(); - $folder = $media->getFolder(); + $folder = $media->getFolder(); $em->getRepository('KunstmaanMediaBundle:Media')->delete($media); - $this->get('session')->getFlashBag()->add('success', 'Entry \''.$medianame.'\' has been deleted!'); + $this->get('session')->getFlashBag()->add('success', 'Entry \'' . $medianame . '\' has been deleted!'); // If the redirect url is passed via the url we use it $redirectUrl = $request->query->get('redirectUrl'); if (empty($redirectUrl)) { - $redirectUrl = $this->generateUrl('KunstmaanMediaBundle_folder_show', array('folderId' => $folder->getId())); + $redirectUrl = $this->generateUrl( + 'KunstmaanMediaBundle_folder_show', + array('folderId' => $folder->getId()) + ); } return new RedirectResponse($redirectUrl); @@ -108,7 +118,7 @@ public function bulkUploadAction($folderId) /* @var Folder $folder */ $folder = $em->getRepository('KunstmaanMediaBundle:Folder')->getFolder($folderId); - return array('folder' => $folder); + return array('folder' => $folder); } /** @@ -123,6 +133,7 @@ public function bulkUploadSubmitAction($folderId) { $em = $this->getDoctrine()->getManager(); + // TODO : Rewrite the following with clean (and testable) code // Make sure file is not cached (as it happens for example on iOS devices) header("Expires: Mon, 26 Jul 1997 05:00:00 GMT"); header("Last-Modified: " . gmdate("D, d M Y H:i:s") . " GMT"); @@ -131,10 +142,10 @@ public function bulkUploadSubmitAction($folderId) header("Pragma: no-cache"); // Settings - $tempDir = ini_get('upload_tmp_dir') ? ini_get('upload_tmp_dir') : sys_get_temp_dir(); - $targetDir = rtrim($tempDir, '/') . DIRECTORY_SEPARATOR . "plupload"; + $tempDir = ini_get('upload_tmp_dir') ? ini_get('upload_tmp_dir') : sys_get_temp_dir(); + $targetDir = rtrim($tempDir, '/') . DIRECTORY_SEPARATOR . "plupload"; $cleanupTargetDir = true; // Remove old files - $maxFileAge = 5 * 60 * 60; // Temp file age in seconds + $maxFileAge = 5 * 60 * 60; // Temp file age in seconds // Create target dir if (!file_exists($targetDir)) { @@ -152,7 +163,7 @@ public function bulkUploadSubmitAction($folderId) $filePath = $targetDir . DIRECTORY_SEPARATOR . $fileName; // Chunking might be enabled - $chunk = isset($_REQUEST["chunk"]) ? intval($_REQUEST["chunk"]) : 0; + $chunk = isset($_REQUEST["chunk"]) ? intval($_REQUEST["chunk"]) : 0; $chunks = isset($_REQUEST["chunks"]) ? intval($_REQUEST["chunks"]) : 0; // Remove old temp files @@ -212,7 +223,7 @@ public function bulkUploadSubmitAction($folderId) /* @var Folder $folder */ $folder = $em->getRepository('KunstmaanMediaBundle:Folder')->getFolder($folderId); - $file = new File($filePath); + $file = new File($filePath); /* @var Media $media */ $media = $this->get('kunstmaan_media.media_manager')->getHandler($file)->createNew($file); @@ -224,14 +235,15 @@ public function bulkUploadSubmitAction($folderId) } /** - * @param int $folderId + * @param Request $request + * @param int $folderId * * @Route("drop/{folderId}", requirements={"folderId" = "\d+"}, name="KunstmaanMediaBundle_media_drop_upload") * @Method({"GET", "POST"}) * * @return array|RedirectResponse */ - public function dropAction($folderId) + public function dropAction(Request $request, $folderId) { $em = $this->getDoctrine()->getManager(); @@ -239,27 +251,28 @@ public function dropAction($folderId) $folder = $em->getRepository('KunstmaanMediaBundle:Folder')->getFolder($folderId); $drop = null; - if (array_key_exists('files', $_FILES) && $_FILES['files']['error'] == 0 ) { - $drop = $this->getRequest()->files->get('files'); + if (array_key_exists('files', $_FILES) && $_FILES['files']['error'] == 0) { + $drop = $request->files->get('files'); } else { - $drop = $this->getRequest()->get('text'); + $drop = $request->get('text'); } $media = $this->get('kunstmaan_media.media_manager')->createNew($drop); if ($media) { $media->setFolder($folder); $em->getRepository('KunstmaanMediaBundle:Media')->save($media); - return new Response(json_encode(array('status'=>'File was uploaded successfuly!'))); + return new Response(json_encode(array('status' => 'File was uploaded successfuly!'))); } - $this->getRequest()->getSession()->getFlashBag()->add('notice', 'Could not recognize what you dropped!'); + $request->getSession()->getFlashBag()->add('notice', 'Could not recognize what you dropped!'); - return new Response(json_encode(array('status'=>'Could not recognize anything!'))); + return new Response(json_encode(array('status' => 'Could not recognize anything!'))); } /** - * @param int $folderId The folder id - * @param string $type The type + * @param Request $request + * @param int $folderId The folder id + * @param string $type The type * * @Route("create/{folderId}/{type}", requirements={"folderId" = "\d+", "type" = ".+"}, name="KunstmaanMediaBundle_media_create") * @Method({"GET", "POST"}) @@ -267,80 +280,91 @@ public function dropAction($folderId) * * @return array|RedirectResponse */ - public function createAction($folderId, $type) + public function createAction(Request $request, $folderId, $type) { - return $this->createAndRedirect($folderId, $type, "KunstmaanMediaBundle_folder_show"); + return $this->createAndRedirect($request, $folderId, $type, 'KunstmaanMediaBundle_folder_show'); } /** - * @param int $folderId The folder id - * @param string $type The type - * - * @Route("create/modal/{folderId}/{type}", requirements={"folderId" = "\d+", "type" = ".+"}, name="KunstmaanMediaBundle_media_modal_create") - * @Method({"GET", "POST"}) - * @Template() - * - * @return array|RedirectResponse - */ - public function createModalAction($folderId, $type) - { - $cKEditorFuncNum = $this->getRequest()->get('CKEditorFuncNum'); - $linkChooser = $this->getRequest()->get('linkChooser'); - - $extraParams = array(); - if (!empty($cKEditorFuncNum)) { - $extraParams['CKEditorFuncNum'] = $cKEditorFuncNum; - } - if (!empty($linkChooser)) { - $extraParams['linkChooser'] = $linkChooser; - } - - return $this->createAndRedirect($folderId, $type, "KunstmaanMediaBundle_chooser_show_folder", $extraParams); - } - - /** - * @param int $folderId The folder Id - * @param string $type The type - * @param string $redirectUrl The url where we want to redirect to on success - * @param array $extraParams The extra parameters that will be passed wen redirecting + * @param Request $request + * @param int $folderId The folder Id + * @param string $type The type + * @param string $redirectUrl The url where we want to redirect to on success + * @param array $extraParams The extra parameters that will be passed wen redirecting * * @return array */ - private function createAndRedirect($folderId, $type, $redirectUrl, $extraParams = array()) + private function createAndRedirect(Request $request, $folderId, $type, $redirectUrl, $extraParams = array()) { $em = $this->getDoctrine()->getManager(); - $request = $this->getRequest(); /* @var Folder $folder */ $folder = $em->getRepository('KunstmaanMediaBundle:Folder')->getFolder($folderId); /* @var MediaManager $mediaManager */ $mediaManager = $this->get('kunstmaan_media.media_manager'); - $handler = $mediaManager->getHandlerForType($type); - $media = new Media(); - $helper = $handler->getFormHelper($media); + $handler = $mediaManager->getHandlerForType($type); + $media = new Media(); + $helper = $handler->getFormHelper($media); $form = $this->createForm($handler->getFormType(), $helper); - if ('POST' == $request->getMethod()) { - $form->bind($request); + if ($request->isMethod('POST')) { + $form->submit($request); if ($form->isValid()) { $media = $helper->getMedia(); $media->setFolder($folder); $em->getRepository('KunstmaanMediaBundle:Media')->save($media); - $this->get('session')->getFlashBag()->add('success', 'Media \''.$media->getName().'\' has been created!'); + $this->get('session')->getFlashBag()->add( + 'success', + 'Media \'' . $media->getName() . '\' has been created!' + ); $params = array('folderId' => $folder->getId()); $params = array_merge($params, $extraParams); + return new RedirectResponse($this->generateUrl($redirectUrl, $params)); } } return array( - 'type' => $type, - 'form' => $form->createView(), - 'folder' => $folder + 'type' => $type, + 'form' => $form->createView(), + 'folder' => $folder + ); + } + + /** + * @param Request $request + * @param int $folderId The folder id + * @param string $type The type + * + * @Route("create/modal/{folderId}/{type}", requirements={"folderId" = "\d+", "type" = ".+"}, name="KunstmaanMediaBundle_media_modal_create") + * @Method({"GET", "POST"}) + * @Template() + * + * @return array|RedirectResponse + */ + public function createModalAction(Request $request, $folderId, $type) + { + $cKEditorFuncNum = $request->get('CKEditorFuncNum'); + $linkChooser = $request->get('linkChooser'); + + $extraParams = array(); + if (!empty($cKEditorFuncNum)) { + $extraParams['CKEditorFuncNum'] = $cKEditorFuncNum; + } + if (!empty($linkChooser)) { + $extraParams['linkChooser'] = $linkChooser; + } + + return $this->createAndRedirect( + $request, + $folderId, + $type, + 'KunstmaanMediaBundle_chooser_show_folder', + $extraParams ); } diff --git a/DataFixtures/ORM/FolderFixtures.php b/DataFixtures/ORM/FolderFixtures.php index b85601ed..3e72fd70 100644 --- a/DataFixtures/ORM/FolderFixtures.php +++ b/DataFixtures/ORM/FolderFixtures.php @@ -24,20 +24,20 @@ public function load(ObjectManager $manager) $gal = new Folder($manager); $gal->setName('Media'); $gal->setTranslatableLocale('en'); - $gal->setRel("media"); + $gal->setRel('media'); $manager->persist($gal); $manager->flush(); $this->addReference('media-folder-en', $gal); $gal->setTranslatableLocale('nl'); $manager->refresh($gal); - $gal->setName("Media"); + $gal->setName('Media'); $manager->persist($gal); $manager->flush(); $gal->setTranslatableLocale('fr'); $manager->refresh($gal); - $gal->setName("Media"); + $gal->setName('Media'); $manager->persist($gal); $manager->flush(); @@ -45,7 +45,7 @@ public function load(ObjectManager $manager) $subgal->setParent($gal); $subgal->setName('Images'); $subgal->setTranslatableLocale('en'); - $subgal->setRel("image"); + $subgal->setRel('image'); $manager->persist($subgal); $manager->flush(); $this->addReference('images-folder-en', $subgal); @@ -66,7 +66,7 @@ public function load(ObjectManager $manager) $subgal->setParent($gal); $subgal->setName('Videos'); $subgal->setTranslatableLocale('en'); - $subgal->setRel("video"); + $subgal->setRel('video'); $manager->persist($subgal); $manager->flush(); $this->addReference('videos-folder-en', $subgal); @@ -87,7 +87,7 @@ public function load(ObjectManager $manager) $subgal->setParent($gal); $subgal->setName('Slides'); $subgal->setTranslatableLocale('en'); - $subgal->setRel("slideshow"); + $subgal->setRel('slideshow'); $manager->persist($subgal); $manager->flush(); $this->addReference('slides-folder-en', $subgal); @@ -108,7 +108,7 @@ public function load(ObjectManager $manager) $subgal->setParent($gal); $subgal->setName('Files'); $subgal->setTranslatableLocale('en'); - $subgal->setRel("files"); + $subgal->setRel('files'); $manager->persist($subgal); $manager->flush(); $this->addReference('files-folder-en', $subgal); diff --git a/Entity/Folder.php b/Entity/Folder.php index 06989b43..f6212418 100644 --- a/Entity/Folder.php +++ b/Entity/Folder.php @@ -2,11 +2,10 @@ namespace Kunstmaan\MediaBundle\Entity; -use Kunstmaan\AdminBundle\Entity\AbstractEntity; - use Doctrine\Common\Collections\ArrayCollection; use Doctrine\ORM\Mapping as ORM; use Gedmo\Mapping\Annotation as Gedmo; +use Kunstmaan\AdminBundle\Entity\AbstractEntity; use Symfony\Component\Validator\Constraints as Assert; /** @@ -107,26 +106,6 @@ public function __construct() $this->deleted = false; } - /** - * @param string $name - * - * @return Folder - */ - public function setName($name) - { - $this->name = $name; - - return $this; - } - - /** - * @return string - */ - public function getName() - { - return $this->name; - } - /** * @param string $locale * @@ -139,18 +118,6 @@ public function setTranslatableLocale($locale) return $this; } - /** - * @param string $rel - * - * @return Folder - */ - public function setRel($rel) - { - $this->rel = $rel; - - return $this; - } - /** * @return string */ @@ -160,15 +127,13 @@ public function getRel() } /** - * Set createdAd - * - * @param \DateTime $createdAt + * @param string $rel * * @return Folder */ - public function setCreatedAt($createdAt) + public function setRel($rel) { - $this->createdAt = $createdAt; + $this->rel = $rel; return $this; } @@ -184,15 +149,15 @@ public function getCreatedAt() } /** - * Set updatedAt + * Set createdAd * - * @param \DateTime $updatedAt + * @param \DateTime $createdAt * * @return Folder */ - public function setUpdatedAt($updatedAt) + public function setCreatedAt($createdAt) { - $this->updatedAt = $updatedAt; + $this->createdAt = $createdAt; return $this; } @@ -208,29 +173,19 @@ public function getUpdatedAt() } /** - * Set parent + * Set updatedAt * - * @param Folder $parent + * @param \DateTime $updatedAt * * @return Folder */ - public function setParent(Folder $parent) + public function setUpdatedAt($updatedAt) { - $this->parent = $parent; + $this->updatedAt = $updatedAt; return $this; } - /** - * Get parent - * - * @return Folder - */ - public function getParent() - { - return $this->parent; - } - /** * @return Folder[]: */ @@ -247,60 +202,44 @@ public function getParents() } /** - * Add a child - * - * @param Folder $child + * Get parent * * @return Folder */ - public function addChild(Folder $child) + public function getParent() { - $this->children[] = $child; - $child->setParent($this); - - return $this; + return $this->parent; } /** - * @param bool $includeDeleted + * Set parent * - * @return Folder[] + * @param Folder $parent + * + * @return Folder */ - public function getChildren($includeDeleted = false) + public function setParent(Folder $parent) { - if ($includeDeleted) { - return $this->children; - } - - return $this->children->filter( function (Folder $entry) { - if ($entry->isDeleted()) { - return false; - } + $this->parent = $parent; - return true; - }); + return $this; } /** - * @param array $children + * Add a child + * + * @param Folder $child * * @return Folder */ - public function setChildren($children) + public function addChild(Folder $child) { - $this->children = $children; + $this->children[] = $child; + $child->setParent($this); return $this; } - /** - * @return bool - */ - public function isDeleted() - { - return $this->deleted; - } - /** * @param bool $deleted * @@ -340,13 +279,15 @@ public function getMedia($includeDeleted = false) return $this->media; } - return $this->media->filter( function (Media $entry) { - if ($entry->isDeleted()) { - return false; - } + return $this->media->filter( + function (Media $entry) { + if ($entry->isDeleted()) { + return false; + } - return true; - }); + return true; + } + ); } /** @@ -366,17 +307,47 @@ public function hasActive($id) } /** - * @param string $internalName + * @param bool $includeDeleted + * + * @return Folder[] + */ + public function getChildren($includeDeleted = false) + { + if ($includeDeleted) { + return $this->children; + } + + return $this->children->filter( + function (Folder $entry) { + if ($entry->isDeleted()) { + return false; + } + + return true; + } + ); + } + + /** + * @param array $children * * @return Folder */ - public function setInternalName($internalName) + public function setChildren($children) { - $this->internalName = $internalName; + $this->children = $children; return $this; } + /** + * @return bool + */ + public function isDeleted() + { + return $this->deleted; + } + /** * @return string */ @@ -385,6 +356,18 @@ public function getInternalName() return $this->internalName; } + /** + * @param string $internalName + * + * @return Folder + */ + public function setInternalName($internalName) + { + $this->internalName = $internalName; + + return $this; + } + /** * @return string */ @@ -393,6 +376,26 @@ public function __toString() return $this->getName(); } + /** + * @return string + */ + public function getName() + { + return $this->name; + } + + /** + * @param string $name + * + * @return Folder + */ + public function setName($name) + { + $this->name = $name; + + return $this; + } + /** * @ORM\PreUpdate */ diff --git a/EventListener/DoctrineMediaListener.php b/EventListener/DoctrineMediaListener.php index cb8b7a2a..f91301c3 100644 --- a/EventListener/DoctrineMediaListener.php +++ b/EventListener/DoctrineMediaListener.php @@ -15,7 +15,7 @@ class DoctrineMediaListener { /** - * @var MediaManager + * @var MediaManager $mediaManager */ private $mediaManager; diff --git a/Form/BulkUploadType.php b/Form/BulkUploadType.php index a06d5174..d9fa3d88 100644 --- a/Form/BulkUploadType.php +++ b/Form/BulkUploadType.php @@ -2,9 +2,8 @@ namespace Kunstmaan\MediaBundle\Form; -use Symfony\Component\Form\FormBuilderInterface; - use Symfony\Component\Form\AbstractType; +use Symfony\Component\Form\FormBuilderInterface; /** * BulkUploadType @@ -19,6 +18,7 @@ class BulkUploadType extends AbstractType /** * contructor + * * @param string $accept */ public function __construct($accept = null) @@ -31,6 +31,7 @@ public function __construct($accept = null) * * This method is called for each type in the hierarchy starting form the * top most type. Type extensions can further modify the form. + * * @param FormBuilderInterface $builder The form builder * @param array $options The options * @@ -39,14 +40,16 @@ public function __construct($accept = null) public function buildForm(FormBuilderInterface $builder, array $options) { $builder->add( - 'files', 'file', array( - "required" => false, - "attr" => array( - "accept" => $this->accept, - "multiple" => "multiple", - ), - 'data_class' => null - ) + 'files', + 'file', + array( + 'required' => false, + 'attr' => array( + 'accept' => $this->accept, + 'multiple' => 'multiple', + ), + 'data_class' => null + ) ); } @@ -57,6 +60,6 @@ public function buildForm(FormBuilderInterface $builder, array $options) */ public function getName() { - return "kunstmaan_mediabundle_bulkupload"; + return 'kunstmaan_mediabundle_bulkupload'; } } \ No newline at end of file diff --git a/Form/File/FileType.php b/Form/File/FileType.php index b5ef7b68..c3edc98c 100644 --- a/Form/File/FileType.php +++ b/Form/File/FileType.php @@ -2,11 +2,9 @@ namespace Kunstmaan\MediaBundle\Form\File; -use Symfony\Component\OptionsResolver\OptionsResolverInterface; - -use Symfony\Component\Form\FormBuilderInterface; - use Symfony\Component\Form\AbstractType; +use Symfony\Component\Form\FormBuilderInterface; +use Symfony\Component\OptionsResolver\OptionsResolverInterface; /** * FileType @@ -19,6 +17,7 @@ class FileType extends AbstractType * * This method is called for each type in the hierarchy starting form the * top most type. Type extensions can further modify the form. + * * @param FormBuilderInterface $builder The form builder * @param array $options The options * @@ -47,8 +46,10 @@ public function getName() */ public function setDefaultOptions(OptionsResolverInterface $resolver) { - $resolver->setDefaults(array( - 'data_class' => 'Kunstmaan\MediaBundle\Helper\File\FileHelper', - )); + $resolver->setDefaults( + array( + 'data_class' => 'Kunstmaan\MediaBundle\Helper\File\FileHelper', + ) + ); } } \ No newline at end of file diff --git a/Form/FolderType.php b/Form/FolderType.php index 543e7612..c2f27d46 100644 --- a/Form/FolderType.php +++ b/Form/FolderType.php @@ -2,13 +2,10 @@ namespace Kunstmaan\MediaBundle\Form; -use Symfony\Component\OptionsResolver\OptionsResolverInterface; - use Kunstmaan\MediaBundle\Entity\Folder; - -use Symfony\Component\Form\FormBuilderInterface; - use Symfony\Component\Form\AbstractType; +use Symfony\Component\Form\FormBuilderInterface; +use Symfony\Component\OptionsResolver\OptionsResolverInterface; /** * FolderType @@ -33,6 +30,7 @@ public function __construct(Folder $folder = null) * * This method is called for each type in the hierarchy starting form the * top most type. Type extensions can further modify the form. + * * @param FormBuilderInterface $builder The form builder * @param array $options The options * @@ -43,36 +41,41 @@ public function __construct(Folder $folder = null) public function buildForm(FormBuilderInterface $builder, array $options) { $folder = $this->folder; - $type = $this; + $type = $this; $builder - ->add('name') - ->add('rel', 'choice', array( - 'choices' => array('media' => 'media', 'image' => 'image', 'slideshow' => 'slideshow', 'video' => 'video'), - )) - ->add('parent', 'entity', array( 'class' => 'Kunstmaan\MediaBundle\Entity\Folder', 'required' => false, - 'query_builder' => function(\Doctrine\ORM\EntityRepository $er) use($folder, $type) { - $qb = $er->createQueryBuilder('folder'); - - if ($folder != null && $folder->getId() != null) { - $ids = "folder.id != ". $folder->getId(); - $ids .= $type->addChildren($folder); - $qb->andwhere($ids); - } - $qb->andWhere('folder.deleted != true'); + ->add('name') + ->add( + 'rel', + 'choice', + array( + 'choices' => array( + 'media' => 'media', + 'image' => 'image', + 'slideshow' => 'slideshow', + 'video' => 'video' + ), + ) + ) + ->add( + 'parent', + 'entity', + array( + 'class' => 'Kunstmaan\MediaBundle\Entity\Folder', + 'required' => true, + 'query_builder' => function (\Doctrine\ORM\EntityRepository $er) use ($folder, $type) { + $qb = $er->createQueryBuilder('folder'); - return $qb; - } - )); - } + if ($folder != null && $folder->getId() != null) { + $ids = "folder.id != " . $folder->getId(); + $ids .= $type->addChildren($folder); + $qb->andwhere($ids); + } + $qb->andWhere('folder.deleted != true'); - /** - * Returns the name of this type. - * - * @return string The name of this type - */ - public function getName() - { - return 'kunstmaan_mediabundle_FolderType'; + return $qb; + } + ) + ); } /** @@ -91,6 +94,16 @@ public function addChildren(Folder $folder) return $ids; } + /** + * Returns the name of this type. + * + * @return string The name of this type + */ + public function getName() + { + return 'kunstmaan_mediabundle_FolderType'; + } + /** * Sets the default options for this type. * @@ -98,8 +111,10 @@ public function addChildren(Folder $folder) */ public function setDefaultOptions(OptionsResolverInterface $resolver) { - $resolver->setDefaults(array( - 'data_class' => 'Kunstmaan\MediaBundle\Entity\Folder', - )); + $resolver->setDefaults( + array( + 'data_class' => 'Kunstmaan\MediaBundle\Entity\Folder', + ) + ); } } \ No newline at end of file diff --git a/Form/RemoteAudio/RemoteAudioType.php b/Form/RemoteAudio/RemoteAudioType.php index 5dd2ba84..0d6b0bbe 100644 --- a/Form/RemoteAudio/RemoteAudioType.php +++ b/Form/RemoteAudio/RemoteAudioType.php @@ -2,11 +2,9 @@ namespace Kunstmaan\MediaBundle\Form\RemoteAudio; -use Symfony\Component\OptionsResolver\OptionsResolverInterface; - -use Symfony\Component\Form\FormBuilderInterface; - use Symfony\Component\Form\AbstractType; +use Symfony\Component\Form\FormBuilderInterface; +use Symfony\Component\OptionsResolver\OptionsResolverInterface; /** * RemoteAudioType @@ -19,6 +17,7 @@ class RemoteAudioType extends AbstractType * * This method is called for each type in the hierarchy starting form the * top most type. Type extensions can further modify the form. + * * @param FormBuilderInterface $builder The form builder * @param array $options The options * @@ -27,10 +26,15 @@ class RemoteAudioType extends AbstractType public function buildForm(FormBuilderInterface $builder, array $options) { $builder - ->add('name', 'text') - ->add('code', 'text') - ->add('type', 'choice', array( - 'choices' => array('soundcloud' => 'soundcloud'))); + ->add('name', 'text') + ->add('code', 'text') + ->add( + 'type', + 'choice', + array( + 'choices' => array('soundcloud' => 'soundcloud') + ) + ); } /** @@ -50,8 +54,10 @@ public function getName() */ public function setDefaultOptions(OptionsResolverInterface $resolver) { - $resolver->setDefaults(array( - 'data_class' => 'Kunstmaan\MediaBundle\Helper\RemoteAudio\RemoteAudioHelper', - )); + $resolver->setDefaults( + array( + 'data_class' => 'Kunstmaan\MediaBundle\Helper\RemoteAudio\RemoteAudioHelper', + ) + ); } } \ No newline at end of file diff --git a/Form/RemoteSlide/RemoteSlideType.php b/Form/RemoteSlide/RemoteSlideType.php index 47ba826b..2386dd43 100644 --- a/Form/RemoteSlide/RemoteSlideType.php +++ b/Form/RemoteSlide/RemoteSlideType.php @@ -2,11 +2,9 @@ namespace Kunstmaan\MediaBundle\Form\RemoteSlide; -use Symfony\Component\OptionsResolver\OptionsResolverInterface; - -use Symfony\Component\Form\FormBuilderInterface; - use Symfony\Component\Form\AbstractType; +use Symfony\Component\Form\FormBuilderInterface; +use Symfony\Component\OptionsResolver\OptionsResolverInterface; /** * RemoteSlideType @@ -19,6 +17,7 @@ class RemoteSlideType extends AbstractType * * This method is called for each type in the hierarchy starting form the * top most type. Type extensions can further modify the form. + * * @param FormBuilderInterface $builder The form builder * @param array $options The options * @@ -27,10 +26,15 @@ class RemoteSlideType extends AbstractType public function buildForm(FormBuilderInterface $builder, array $options) { $builder - ->add('name', 'text') - ->add('code', 'text') - ->add('type', 'choice', array( - 'choices' => array('slideshare' => 'slideshare'))); + ->add('name', 'text') + ->add('code', 'text') + ->add( + 'type', + 'choice', + array( + 'choices' => array('slideshare' => 'slideshare') + ) + ); } /** @@ -50,8 +54,10 @@ public function getName() */ public function setDefaultOptions(OptionsResolverInterface $resolver) { - $resolver->setDefaults(array( - 'data_class' => 'Kunstmaan\MediaBundle\Helper\RemoteSlide\RemoteSlideHelper', - )); + $resolver->setDefaults( + array( + 'data_class' => 'Kunstmaan\MediaBundle\Helper\RemoteSlide\RemoteSlideHelper', + ) + ); } } \ No newline at end of file diff --git a/Form/RemoteVideo/RemoteVideoType.php b/Form/RemoteVideo/RemoteVideoType.php index 6fdf8393..dccb1e0a 100644 --- a/Form/RemoteVideo/RemoteVideoType.php +++ b/Form/RemoteVideo/RemoteVideoType.php @@ -2,11 +2,9 @@ namespace Kunstmaan\MediaBundle\Form\RemoteVideo; -use Symfony\Component\OptionsResolver\OptionsResolverInterface; - -use Symfony\Component\Form\FormBuilderInterface; - use Symfony\Component\Form\AbstractType; +use Symfony\Component\Form\FormBuilderInterface; +use Symfony\Component\OptionsResolver\OptionsResolverInterface; /** * RemoteVideoType @@ -19,6 +17,7 @@ class RemoteVideoType extends AbstractType * * This method is called for each type in the hierarchy starting form the * top most type. Type extensions can further modify the form. + * * @param FormBuilderInterface $builder The form builder * @param array $options The options * @@ -27,10 +26,15 @@ class RemoteVideoType extends AbstractType public function buildForm(FormBuilderInterface $builder, array $options) { $builder - ->add('name', 'text') - ->add('code', 'text') - ->add('type', 'choice', array( - 'choices' => array('youtube' => 'youtube', 'vimeo' => 'vimeo', 'dailymotion' => 'dailymotion'))); + ->add('name', 'text') + ->add('code', 'text') + ->add( + 'type', + 'choice', + array( + 'choices' => array('youtube' => 'youtube', 'vimeo' => 'vimeo', 'dailymotion' => 'dailymotion') + ) + ); } /** @@ -50,8 +54,10 @@ public function getName() */ public function setDefaultOptions(OptionsResolverInterface $resolver) { - $resolver->setDefaults(array( - 'data_class' => 'Kunstmaan\MediaBundle\Helper\RemoteVideo\RemoteVideoHelper', - )); + $resolver->setDefaults( + array( + 'data_class' => 'Kunstmaan\MediaBundle\Helper\RemoteVideo\RemoteVideoHelper', + ) + ); } } \ No newline at end of file diff --git a/Form/Type/IdToMediaTransformer.php b/Form/Type/IdToMediaTransformer.php index 3bdffd8d..9af1da69 100644 --- a/Form/Type/IdToMediaTransformer.php +++ b/Form/Type/IdToMediaTransformer.php @@ -2,13 +2,12 @@ namespace Kunstmaan\MediaBundle\Form\Type; +use Doctrine\Common\Collections\Collection; use Doctrine\Common\Persistence\ObjectManager; - +use Kunstmaan\MediaBundle\Entity\Media; use Symfony\Component\Form\DataTransformerInterface; -use Symfony\Component\Form\Exception\UnexpectedTypeException; use Symfony\Component\Form\Exception\TransformationFailedException; -use Doctrine\Common\Collections\Collection; -use Kunstmaan\MediaBundle\Entity\Media; +use Symfony\Component\Form\Exception\UnexpectedTypeException; /** * IdToMediaTransformer @@ -32,8 +31,8 @@ class IdToMediaTransformer implements DataTransformerInterface */ public function __construct(ObjectManager $objectManager, CurrentValueContainer $currentValueContainer) { - $this->objectManager = $objectManager; - $this->currentValueContainer = $currentValueContainer; + $this->objectManager = $objectManager; + $this->currentValueContainer = $currentValueContainer; } /** @@ -62,8 +61,8 @@ public function transform($entity) return array( - "ent"=>$entity, - "id" => $entity->getId() + "ent" => $entity, + "id" => $entity->getId() ); } @@ -77,7 +76,7 @@ public function transform($entity) */ public function reverseTransform($key) { - if ('' === $key || null === $key ) { + if ('' === $key || null === $key) { return null; } diff --git a/Form/Type/MediaType.php b/Form/Type/MediaType.php index 421b7284..fac1b45b 100644 --- a/Form/Type/MediaType.php +++ b/Form/Type/MediaType.php @@ -2,13 +2,13 @@ namespace Kunstmaan\MediaBundle\Form\Type; -use Symfony\Component\Form\FormView; -use Symfony\Component\Form\FormInterface; -use Symfony\Component\OptionsResolver\OptionsResolverInterface; -use Symfony\Component\Form\FormBuilderInterface; -use Symfony\Component\Form\AbstractType; use Doctrine\Common\Persistence\ObjectManager; use Kunstmaan\MediaBundle\Helper\MediaManager; +use Symfony\Component\Form\AbstractType; +use Symfony\Component\Form\FormBuilderInterface; +use Symfony\Component\Form\FormInterface; +use Symfony\Component\Form\FormView; +use Symfony\Component\OptionsResolver\OptionsResolverInterface; /** * MediaType @@ -32,7 +32,7 @@ class MediaType extends AbstractType */ public function __construct($mediaManager, $objectManager) { - $this->mediaManager = $mediaManager; + $this->mediaManager = $mediaManager; $this->objectManager = $objectManager; } @@ -41,6 +41,7 @@ public function __construct($mediaManager, $objectManager) * * This method is called for each type in the hierarchy starting form the * top most type. Type extensions can further modify the form. + * * @param FormBuilderInterface $builder The form builder * @param array $options The options * @@ -48,7 +49,10 @@ public function __construct($mediaManager, $objectManager) */ public function buildForm(FormBuilderInterface $builder, array $options) { - $builder->addViewTransformer(new IdToMediaTransformer($this->objectManager, $options['current_value_container']), true); + $builder->addViewTransformer( + new IdToMediaTransformer($this->objectManager, $options['current_value_container']), + true + ); $builder->setAttribute('chooser', $options['chooser']); $builder->setAttribute('mediatype', $options['mediatype']); } @@ -69,12 +73,14 @@ public function getParent() public function setDefaultOptions(OptionsResolverInterface $resolver) { parent::setDefaultOptions($resolver); - $resolver->setDefaults(array( - 'compound' => false, - 'chooser' => 'KunstmaanMediaBundle_chooser', - 'mediatype' => null, + $resolver->setDefaults( + array( + 'compound' => false, + 'chooser' => 'KunstmaanMediaBundle_chooser', + 'mediatype' => null, 'current_value_container' => new CurrentValueContainer(), - )); + ) + ); } /** @@ -92,8 +98,8 @@ public function getName() */ public function buildView(FormView $view, FormInterface $form, array $options) { - $view->vars['chooser'] = $form->getConfig()->getAttribute('chooser'); - $view->vars['mediatype'] = $form->getConfig()->getAttribute('mediatype'); + $view->vars['chooser'] = $form->getConfig()->getAttribute('chooser'); + $view->vars['mediatype'] = $form->getConfig()->getAttribute('mediatype'); $view->vars['mediamanager'] = $this->mediaManager; } } diff --git a/Helper/Menu/MediaMenuAdaptor.php b/Helper/Menu/MediaMenuAdaptor.php index 544845ed..7e1ef5db 100644 --- a/Helper/Menu/MediaMenuAdaptor.php +++ b/Helper/Menu/MediaMenuAdaptor.php @@ -90,8 +90,8 @@ public function adaptChildren(MenuBuilder $menu, array &$children, MenuItem $par if ($currentFolder->getId() == $folder->getId()) { $menuitem->setActive(true); } else { - foreach ($parents as $parent) { - if ($parent->getId() == $folder->getId()) { + foreach ($parents as $parentFolder) { + if ($parentFolder->getId() == $folder->getId()) { $menuitem->setActive(true); break; } diff --git a/Repository/FolderRepository.php b/Repository/FolderRepository.php index 56cdd5eb..e6ae3e52 100644 --- a/Repository/FolderRepository.php +++ b/Repository/FolderRepository.php @@ -72,7 +72,11 @@ public function deleteChildren(Folder $folder) */ public function getAllFolders($limit = null) { - $qb = $this->createQueryBuilder('folder')->select('folder')->where('folder.parent is null AND folder.deleted != true')->orderby('folder.name'); + $qb = $this->createQueryBuilder('folder') + ->select('folder') + ->where('folder.parent is null AND folder.deleted != true') + ->orderBy('folder.name'); + if (false === is_null($limit)) { $qb->setMaxResults($limit); } @@ -88,9 +92,7 @@ public function getAllFolders($limit = null) */ public function getFolder($folderId) { - $em = $this->getEntityManager(); - - $folder = $em->getRepository('KunstmaanMediaBundle:Folder')->find($folderId); + $folder = $this->find($folderId); if (!$folder) { throw new EntityNotFoundException('The id given for the folder is not valid.'); } @@ -100,9 +102,7 @@ public function getFolder($folderId) public function getFirstTopFolder() { - $em = $this->getEntityManager(); - - $folder = $em->getRepository('KunstmaanMediaBundle:Folder')->findOneBy(array('parent' => NULL)); + $folder = $this->findOneBy(array('parent' => null)); if (!$folder) { throw new EntityNotFoundException('No first top folder found (where parent is NULL)'); } diff --git a/Repository/MediaRepository.php b/Repository/MediaRepository.php index cb0dc519..e00120ac 100644 --- a/Repository/MediaRepository.php +++ b/Repository/MediaRepository.php @@ -42,9 +42,7 @@ public function delete(Media $media) */ public function getMedia($mediaId) { - $em = $this->getEntityManager(); - - $media = $em->getRepository('KunstmaanMediaBundle:Media')->find($mediaId); + $media = $this->find($mediaId); if (!$media) { throw new EntityNotFoundException('The id given for the media is not valid.'); } diff --git a/Resources/views/Folder/addsub-modal.html.twig b/Resources/views/Folder/addsub-modal.html.twig index 25049edb..1558afd9 100644 --- a/Resources/views/Folder/addsub-modal.html.twig +++ b/Resources/views/Folder/addsub-modal.html.twig @@ -1,6 +1,6 @@ {% form_theme subform 'KunstmaanAdminBundle:Form:fields.html.twig' %} -
+

{{ 'media.folder.addsub.modal.title' | trans }}

@@ -19,7 +19,7 @@