From b7f4f209fc7bc7ce775b7ff1baadc9cc57a7bb78 Mon Sep 17 00:00:00 2001 From: Andrey Date: Tue, 7 May 2013 15:44:28 +0200 Subject: [PATCH 01/67] Implement Doctrine feeds instead of Phrasea ones in the /list/ route --- .../Phrasea/Controller/Admin/Publications.php | 4 +- lib/Doctrine/Entities/Feed.php | 333 ++++++++++++++++++ .../Repositories/SessionRepository.php | 28 ++ .../web/admin/publications/list.html.twig | 22 +- 4 files changed, 374 insertions(+), 13 deletions(-) create mode 100644 lib/Doctrine/Entities/Feed.php diff --git a/lib/Alchemy/Phrasea/Controller/Admin/Publications.php b/lib/Alchemy/Phrasea/Controller/Admin/Publications.php index 5ad1cfdead..9acec00f3d 100644 --- a/lib/Alchemy/Phrasea/Controller/Admin/Publications.php +++ b/lib/Alchemy/Phrasea/Controller/Admin/Publications.php @@ -36,8 +36,8 @@ class Publications implements ControllerProviderInterface $controllers->get('/list/', function(PhraseaApplication $app) { - $feeds = \Feed_Collection::load_all( - $app, $app['authentication']->getUser() + $feeds = $app["EM"]->getRepository("Entities\Feed")->getAllForUser( + $app['authentication']->getUser() ); return $app['twig'] diff --git a/lib/Doctrine/Entities/Feed.php b/lib/Doctrine/Entities/Feed.php new file mode 100644 index 0000000000..4caf597836 --- /dev/null +++ b/lib/Doctrine/Entities/Feed.php @@ -0,0 +1,333 @@ +publishers = new \Doctrine\Common\Collections\ArrayCollection(); + $this->entries = new \Doctrine\Common\Collections\ArrayCollection(); + } + + /** + * Get id + * + * @return integer + */ + public function getId() + { + return $this->id; + } + + /** + * Set public + * + * @param boolean $public + * @return Feed + */ + public function setPublic($public) + { + $this->public = $public; + + return $this; + } + + /** + * Get public + * + * @return boolean + */ + public function getPublic() + { + return $this->public; + } + + /** + * Set icon_url + * + * @param string $iconUrl + * @return Feed + */ + public function setIconUrl($iconUrl) + { + $this->icon_url = $iconUrl; + + return $this; + } + + /** + * Get icon_url + * + * @return string + */ + public function getIconUrl() + { + return $this->icon_url; + } + + /** + * Set base_id + * + * @param integer $baseId + * @return Feed + */ + public function setBaseId($baseId) + { + $this->base_id = $baseId; + + return $this; + } + + /** + * Get base_id + * + * @return integer + */ + public function getBaseId() + { + return $this->base_id; + } + + /** + * Set title + * + * @param string $title + * @return Feed + */ + public function setTitle($title) + { + $this->title = $title; + + return $this; + } + + /** + * Get title + * + * @return string + */ + public function getTitle() + { + return $this->title; + } + + /** + * Set description + * + * @param string $description + * @return Feed + */ + public function setDescription($description) + { + $this->description = $description; + + return $this; + } + + /** + * Get description + * + * @return string + */ + public function getDescription() + { + return $this->description; + } + + /** + * Set created + * + * @param \DateTime $created + * @return Feed + */ + public function setCreated($created) + { + $this->created = $created; + + return $this; + } + + /** + * Get created + * + * @return \DateTime + */ + public function getCreated() + { + return $this->created; + } + + /** + * Set updated + * + * @param \DateTime $updated + * @return Feed + */ + public function setUpdated($updated) + { + $this->updated = $updated; + + return $this; + } + + /** + * Get updated + * + * @return \DateTime + */ + public function getUpdated() + { + return $this->updated; + } + + /** + * Add publishers + * + * @param \Entities\FeedPublisher $publishers + * @return Feed + */ + public function addPublisher(\Entities\FeedPublisher $publishers) + { + $this->publishers[] = $publishers; + + return $this; + } + + /** + * Remove publishers + * + * @param \Entities\FeedPublisher $publishers + */ + public function removePublisher(\Entities\FeedPublisher $publishers) + { + $this->publishers->removeElement($publishers); + } + + /** + * Get publishers + * + * @return \Doctrine\Common\Collections\Collection + */ + public function getPublishers() + { + return $this->publishers; + } + + /** + * Add entries + * + * @param \Entities\FeedEntry $entries + * @return Feed + */ + public function addEntrie(\Entities\FeedEntry $entries) + { + $this->entries[] = $entries; + + return $this; + } + + /** + * Remove entries + * + * @param \Entities\FeedEntry $entries + */ + public function removeEntrie(\Entities\FeedEntry $entries) + { + $this->entries->removeElement($entries); + } + + /** + * Get entries + * + * @return \Doctrine\Common\Collections\Collection + */ + public function getEntries() + { + return $this->entries; + } + + public function getOwner() + { + foreach ($this->getPublishers() as $publisher) { + if ($publisher->isOwner()) { + return $publisher; + } + } + } + + public function isOwner(\User_Adapter $user) + { + $owner = $this->getOwner(); + if ($owner !== null && $user->get_id() === $owner->getId()) { + return true; + } + + return false; + } + + public function getCollection(Application $app) + { + if ($this->getBaseId() !== null) + return \collection::get_from_base_id($app, $this->getBaseId()); + } +} \ No newline at end of file diff --git a/lib/Doctrine/Repositories/SessionRepository.php b/lib/Doctrine/Repositories/SessionRepository.php index 747d99d7f3..b78db0574a 100644 --- a/lib/Doctrine/Repositories/SessionRepository.php +++ b/lib/Doctrine/Repositories/SessionRepository.php @@ -2,6 +2,7 @@ namespace Repositories; +use Alchemy\Phrasea\Application; use Doctrine\ORM\EntityRepository; /** @@ -12,4 +13,31 @@ use Doctrine\ORM\EntityRepository; */ class SessionRepository extends EntityRepository { + + /** + * + * @param Application $app + * @param User_Adapter $user + * @return \Doctrine\Common\Collections\Collection + */ + public function getAllForUser(\User_Adapter $user) + { + $base_ids = array_keys($user->ACL()->get_granted_base()); + + + $dql = 'SELECT f FROM Entities\Feed f + WHERE f.base_id IS NULL '; + + if (count($base_ids) > 0) { + $dql .= ' OR f.base_id + IN (' . implode(', ', $base_ids) . ') '; + } + + $dql .= ' OR f.public = true + ORDER BY f.created DESC'; + + $query = $this->_em->createQuery($dql); + $feeds = $query->getResult(); + return $feeds; + } } diff --git a/templates/web/admin/publications/list.html.twig b/templates/web/admin/publications/list.html.twig index 875c289cb1..19c89f0b6d 100644 --- a/templates/web/admin/publications/list.html.twig +++ b/templates/web/admin/publications/list.html.twig @@ -59,35 +59,35 @@ - {% for feed in feeds.get_feeds %} + {% for feed in feeds %}
- - + +
- {{ feed.get_title() }} + {{ feed.getTitle() }} - {{ app['date-formatter'].getDate(feed.get_created_on()) }} + {{ app['date-formatter'].getDate(feed.getCreated()) }} - {% if feed.get_collection() != null %} - {{ feed.get_collection().get_databox().get_label(app['locale.I18n']) }} / - {{ feed.get_collection().get_name() }} + {% if feed.getCollection() != null %} + {{ feed.getCollection().get_databox().get_label(app['locale.I18n']) }} / + {{ feed.getCollection().get_name() }} {% endif %} - {% if feed.is_public() %} + {% if feed.getPublic() %} {% endif %} - {% if feed.is_owner(app['authentication'].getUser()) %} -
+ {% if feed.isOwner(app['authentication'].getUser()) %} +
{% endif %} From 9c49589d9c1e87026801e25af2804f07ccb7c069 Mon Sep 17 00:00:00 2001 From: Andrey Date: Tue, 14 May 2013 16:28:08 +0200 Subject: [PATCH 02/67] Implement admin controllers --- .../Phrasea/Controller/Admin/Publications.php | 80 +++-- lib/Doctrine/Entities/Feed.php | 206 +++++++----- lib/Doctrine/Entities/FeedEntry.php | 306 ++++++++++++++++++ lib/Doctrine/Entities/FeedItem.php | 198 ++++++++++++ lib/Doctrine/Entities/FeedPublisher.php | 147 +++++++++ .../Repositories/OrderElementRepository.php | 11 + .../Repositories/SessionRepository.php | 18 +- .../web/admin/publications/fiche.html.twig | 34 +- .../web/admin/publications/list.html.twig | 2 +- 9 files changed, 873 insertions(+), 129 deletions(-) create mode 100644 lib/Doctrine/Entities/FeedEntry.php create mode 100644 lib/Doctrine/Entities/FeedItem.php create mode 100644 lib/Doctrine/Entities/FeedPublisher.php diff --git a/lib/Alchemy/Phrasea/Controller/Admin/Publications.php b/lib/Alchemy/Phrasea/Controller/Admin/Publications.php index 9acec00f3d..b0d8bec98e 100644 --- a/lib/Alchemy/Phrasea/Controller/Admin/Publications.php +++ b/lib/Alchemy/Phrasea/Controller/Admin/Publications.php @@ -12,6 +12,7 @@ namespace Alchemy\Phrasea\Controller\Admin; use Alchemy\Phrasea\Application as PhraseaApplication; +use Repositories; use Silex\Application; use Silex\ControllerProviderInterface; use Symfony\Component\HttpFoundation\Request; @@ -46,21 +47,28 @@ class Publications implements ControllerProviderInterface $controllers->post('/create/', function(PhraseaApplication $app, Request $request) { - $feed = \Feed_Adapter::create( - $app, $app['authentication']->getUser(), $request->request->get('title'), $request->request->get('subtitle') - ); + $publisher = new \Entities\FeedPublisher($app['authentication']->getUser(), true); + + $feed = new \Entities\Feed($publisher, $request->request->get('title'), $request->request->get('subtitle')); if ($request->request->get('public') == '1') { - $feed->set_public(true); + $feed->setPublic(true); } elseif ($request->request->get('base_id')) { - $feed->set_collection(\collection::get_from_base_id($app, $request->request->get('base_id'))); + $feed->setCollection(\collection::get_from_base_id($app, $request->request->get('base_id'))); } + $publisher->setFeed($feed); + + $app["EM"]->persist($feed); + $app["EM"]->persist($publisher); + + $app["EM"]->flush(); + return $app->redirectPath('admin_feeds_list'); })->bind('admin_feeds_create'); $controllers->get('/feed/{id}/', function(PhraseaApplication $app, Request $request, $id) { - $feed = new \Feed_Adapter($app, $id); + $feed = $app["EM"]->getRepository("Entities\Feed")->find($id); return $app['twig'] ->render('admin/publications/fiche.html.twig', array('feed' => $feed, 'error' => $app['request']->query->get('error'))); @@ -70,24 +78,26 @@ class Publications implements ControllerProviderInterface $controllers->post('/feed/{id}/update/', function(PhraseaApplication $app, Request $request, $id) { - $feed = new \Feed_Adapter($app, $id); + $feed = $app["EM"]->getRepository("Entities\Feed")->find($id); try { $collection = \collection::get_from_base_id($app, $request->request->get('base_id')); } catch (\Exception $e) { $collection = null; } + $feed->setTitle($request->request->get('title')); + $feed->setDescription($request->request->get('subtitle')); + $feed->setCollection($collection); + $feed->setPublic($request->request->get('public')); - $feed->set_title($request->request->get('title')); - $feed->set_subtitle($request->request->get('subtitle')); - $feed->set_collection($collection); - $feed->set_public($request->request->get('public')); + $app["EM"]->persist($feed); + $app["EM"]->flush(); return $app->redirectPath('admin_feeds_list'); })->before(function(Request $request) use ($app) { - $feed = new \Feed_Adapter($app, $request->attributes->get('id')); + $feed = $app["EM"]->getRepository("Entities\Feed")->find($request->attributes->get('id')); - if (!$feed->is_owner($app['authentication']->getUser())) { + if (!$feed->getOwner($app['authentication']->getUser())) { return $app->redirectPath('admin_feeds_feed', array('id' => $request->attributes->get('id'), 'error' => _('You are not the owner of this feed, you can not edit it'))); } }) @@ -99,12 +109,11 @@ class Publications implements ControllerProviderInterface 'success' => false, 'message' => '', ); - - $feed = new \Feed_Adapter($app, $id); + $feed = $app["EM"]->getRepository("Entities\Feed")->find($id); $request = $app["request"]; - if (!$feed->is_owner($app['authentication']->getUser())) { + if (!$feed->getOwner($app['authentication']->getUser())) { $datas['message'] = 'You are not allowed to do that'; return $app->json($datas); @@ -146,7 +155,7 @@ class Publications implements ControllerProviderInterface throw new \Exception_InternalServerError('Error while resizing'); } - $feed->set_icon($tmpname); + //$feed->set_icon($tmpname); unset($media); @@ -167,8 +176,17 @@ class Publications implements ControllerProviderInterface try { $request = $app['request']; $user = \User_Adapter::getInstance($request->request->get('usr_id'), $app); - $feed = new \Feed_Adapter($app, $id); - $feed->add_publisher($user); + $feed = $app["EM"]->getRepository("Entities\Feed")->find($id); + + $publisher = new \Entities\FeedPublisher($user, false); + $publisher->setFeed($feed); + + $feed->addPublisher($publisher); + + $app["EM"]->persist($feed); + $app["EM"]->persist($publisher); + + $app["EM"]->flush(); } catch (\Exception $e) { $error = $e->getMessage(); } @@ -182,11 +200,16 @@ class Publications implements ControllerProviderInterface try { $request = $app['request']; - $feed = new \Feed_Adapter($app, $id); - $publisher = new \Feed_Publisher_Adapter($app, $request->request->get('publisher_id')); - $user = $publisher->get_user(); - if ($feed->is_publisher($user) === true && $feed->is_owner($user) === false) - $publisher->delete(); + $feed = $app["EM"]->getRepository("Entities\Feed")->find($id); + + $publisher = $app["EM"]->getRepository("Entities\FeedPublisher")->find($request->request->get('publisher_id')); + $user = $publisher->getUser($app); + if ($feed->isPublisher($user) === true && $feed->isOwner($user) === false) { + $feed->removePublisher($publisher); + + $app["EM"]->remove($publisher); + $app["EM"]->flush(); + } } catch (\Exception $e) { $error = $e->getMessage(); } @@ -197,8 +220,13 @@ class Publications implements ControllerProviderInterface ->assert('id', '\d+'); $controllers->post('/feed/{id}/delete/', function(PhraseaApplication $app, $id) { - $feed = new \Feed_Adapter($app, $id); - $feed->delete(); + $feed = $app["EM"]->getRepository("Entities\Feed")->find($id); + $publishers = $feed->getPublishers(); + foreach ($publishers as $publisher) { + $app["EM"]->remove($publisher); + } + $app["EM"]->remove($feed); + $app["EM"]->flush(); return $app->redirectPath('admin_feeds_list'); }) diff --git a/lib/Doctrine/Entities/Feed.php b/lib/Doctrine/Entities/Feed.php index 4caf597836..f44aaf0b24 100644 --- a/lib/Doctrine/Entities/Feed.php +++ b/lib/Doctrine/Entities/Feed.php @@ -18,12 +18,12 @@ class Feed /** * @var boolean */ - private $public; + private $public = false; /** * @var string */ - private $icon_url; + private $icon_url = false; /** * @var integer @@ -38,17 +38,17 @@ class Feed /** * @var string */ - private $description; + private $subtitle; /** * @var \DateTime */ - private $created; + private $created_on; /** * @var \DateTime */ - private $updated; + private $updated_on; /** * @var \Doctrine\Common\Collections\Collection @@ -122,7 +122,11 @@ class Feed */ public function getIconUrl() { - return $this->icon_url; + if (!$this->icon_url) { + return '/skins/icons/rss32.gif'; + } + + return '/www/custom/feed_' . $this->getId() . '.jpg'; } /** @@ -171,75 +175,6 @@ class Feed return $this->title; } - /** - * Set description - * - * @param string $description - * @return Feed - */ - public function setDescription($description) - { - $this->description = $description; - - return $this; - } - - /** - * Get description - * - * @return string - */ - public function getDescription() - { - return $this->description; - } - - /** - * Set created - * - * @param \DateTime $created - * @return Feed - */ - public function setCreated($created) - { - $this->created = $created; - - return $this; - } - - /** - * Get created - * - * @return \DateTime - */ - public function getCreated() - { - return $this->created; - } - - /** - * Set updated - * - * @param \DateTime $updated - * @return Feed - */ - public function setUpdated($updated) - { - $this->updated = $updated; - - return $this; - } - - /** - * Get updated - * - * @return \DateTime - */ - public function getUpdated() - { - return $this->updated; - } - /** * Add publishers * @@ -279,7 +214,7 @@ class Feed * @param \Entities\FeedEntry $entries * @return Feed */ - public function addEntrie(\Entities\FeedEntry $entries) + public function addEntry(\Entities\FeedEntry $entries) { $this->entries[] = $entries; @@ -291,7 +226,7 @@ class Feed * * @param \Entities\FeedEntry $entries */ - public function removeEntrie(\Entities\FeedEntry $entries) + public function removeEntry(\Entities\FeedEntry $entries) { $this->entries->removeElement($entries); } @@ -309,7 +244,7 @@ class Feed public function getOwner() { foreach ($this->getPublishers() as $publisher) { - if ($publisher->isOwner()) { + if ($publisher->getOwner()) { return $publisher; } } @@ -318,7 +253,7 @@ class Feed public function isOwner(\User_Adapter $user) { $owner = $this->getOwner(); - if ($owner !== null && $user->get_id() === $owner->getId()) { + if ($owner !== null && $user->get_id() === $owner->getUsrId()) { return true; } @@ -327,7 +262,116 @@ class Feed public function getCollection(Application $app) { - if ($this->getBaseId() !== null) + if ($this->getBaseId() !== null) { return \collection::get_from_base_id($app, $this->getBaseId()); + } } -} \ No newline at end of file + + public function setCollection(\collection $collection = null) + { + if ($collection === null) { + $this->base_id = null; + return; + } + $this->base_id = $collection->get_base_id(); + } + + /** + * Set created_on + * + * @param \DateTime $createdOn + * @return Feed + */ + public function setCreatedOn($createdOn) + { + $this->created_on = $createdOn; + + return $this; + } + + /** + * Get created_on + * + * @return \DateTime + */ + public function getCreatedOn() + { + return $this->created_on; + } + + /** + * Set updated_on + * + * @param \DateTime $updatedOn + * @return Feed + */ + public function setUpdatedOn($updatedOn) + { + $this->updated_on = $updatedOn; + + return $this; + } + + /** + * Get updated_on + * + * @return \DateTime + */ + public function getUpdatedOn() + { + return $this->updated_on; + } + + public function isPublisher(\User_Adapter $user) + { + foreach ($this->getPublishers() as $publisher) { + if ($publisher->getUsrId() == $user->get_id()) { + return true; + } + } + + return false; + } + + /** + * Set subtitle + * + * @param string $subtitle + * @return Feed + */ + public function setSubtitle($subtitle) + { + $this->subtitle = $subtitle; + + return $this; + } + + /** + * Get subtitle + * + * @return string + */ + public function getSubtitle() + { + return $this->subtitle; + } + + public function isAggregated() + { + return false; + } + + public function getCountTotalEntries() + { + return (count($this->entries)); + } + + public function hasAccess(User_Adapter $user) + { + if ($this->get_collection() instanceof collection) { + return $user->ACL()->has_access_to_base($this->collection->get_base_id()); + } + + return true; + } +} diff --git a/lib/Doctrine/Entities/FeedEntry.php b/lib/Doctrine/Entities/FeedEntry.php new file mode 100644 index 0000000000..f5f4e9288f --- /dev/null +++ b/lib/Doctrine/Entities/FeedEntry.php @@ -0,0 +1,306 @@ +items = new \Doctrine\Common\Collections\ArrayCollection(); + } + + /** + * Get id + * + * @return integer + */ + public function getId() + { + return $this->id; + } + + /** + * Set title + * + * @param string $title + * @return FeedEntry + */ + public function setTitle($title) + { + $this->title = $title; + + return $this; + } + + /** + * Get title + * + * @return string + */ + public function getTitle() + { + return $this->title; + } + + /** + * Set subtitle + * + * @param string $subtitle + * @return FeedEntry + */ + public function setSubtitle($subtitle) + { + $this->subtitle = $subtitle; + + return $this; + } + + /** + * Get subtitle + * + * @return string + */ + public function getSubtitle() + { + return $this->subtitle; + } + + /** + * Set author_name + * + * @param string $authorName + * @return FeedEntry + */ + public function setAuthorName($authorName) + { + $this->author_name = $authorName; + + return $this; + } + + /** + * Get author_name + * + * @return string + */ + public function getAuthorName() + { + return $this->author_name; + } + + /** + * Set author_email + * + * @param string $authorEmail + * @return FeedEntry + */ + public function setAuthorEmail($authorEmail) + { + $this->author_email = $authorEmail; + + return $this; + } + + /** + * Get author_email + * + * @return string + */ + public function getAuthorEmail() + { + return $this->author_email; + } + + /** + * Set created + * + * @param \DateTime $created + * @return FeedEntry + */ + public function setCreatedOn($createdOn) + { + $this->created_on = $createdOn; + + return $this; + } + + /** + * Get created + * + * @return \DateTime + */ + public function getCreatedOn() + { + return $this->createdOn; + } + + /** + * Set updated + * + * @param \DateTime $updated + * @return FeedEntry + */ + public function setUpdatedOn($updatedOn) + { + $this->updated_on = $updatedOn; + + return $this; + } + + /** + * Get updated + * + * @return \DateTime + */ + public function getUpdatedOn() + { + return $this->updatedOn; + } + + /** + * Add items + * + * @param \Entities\FeedItem $items + * @return FeedEntry + */ + public function addItem(\Entities\FeedItem $items) + { + $this->items[] = $items; + + return $this; + } + + /** + * Remove items + * + * @param \Entities\FeedItem $items + */ + public function removeItem(\Entities\FeedItem $items) + { + $this->items->removeElement($items); + } + + /** + * Get items + * + * @return \Doctrine\Common\Collections\Collection + */ + public function getItems() + { + return $this->items; + } + + /** + * Set publisher + * + * @param \Entities\FeedPublisher $publisher + * @return FeedEntry + */ + public function setPublisher(\Entities\FeedPublisher $publisher = null) + { + $this->publisher = $publisher; + + return $this; + } + + /** + * Get publisher + * + * @return \Entities\FeedPublisher + */ + public function getPublisher() + { + return $this->publisher; + } + + /** + * Set feed + * + * @param \Entities\Feed $feed + * @return FeedEntry + */ + public function setFeed(\Entities\Feed $feed = null) + { + $this->feed = $feed; + + return $this; + } + + /** + * Get feed + * + * @return \Entities\Feed + */ + public function getFeed() + { + return $this->feed; + } + + public function isPublisher(\User_Adapter $user) + { + if ($this->publisher) { + if ($this->publisher->getUsrId() === $user->get_id()) + return true; + } + + return false; + } +} diff --git a/lib/Doctrine/Entities/FeedItem.php b/lib/Doctrine/Entities/FeedItem.php new file mode 100644 index 0000000000..4d33318551 --- /dev/null +++ b/lib/Doctrine/Entities/FeedItem.php @@ -0,0 +1,198 @@ +id; + } + + /** + * Set record_id + * + * @param integer $recordId + * @return FeedItem + */ + public function setRecordId($recordId) + { + $this->record_id = $recordId; + + return $this; + } + + /** + * Get record_id + * + * @return integer + */ + public function getRecordId() + { + return $this->record_id; + } + + /** + * Set sbas_id + * + * @param integer $sbasId + * @return FeedItem + */ + public function setSbasId($sbasId) + { + $this->sbas_id = $sbasId; + + return $this; + } + + /** + * Get sbas_id + * + * @return integer + */ + public function getSbasId() + { + return $this->sbas_id; + } + + /** + * Set entry + * + * @param \Entities\FeedEntry $entry + * @return FeedItem + */ + public function setEntry(\Entities\FeedEntry $entry = null) + { + $this->entry = $entry; + + return $this; + } + + /** + * Get entry + * + * @return \Entities\FeedEntry + */ + public function getEntry() + { + return $this->entry; + } + /** + * @var int + */ + private $ord; + + + /** + * Set ord + * + * @param \int $ord + * @return FeedItem + */ + public function setOrd(\int $ord) + { + $this->ord = $ord; + + return $this; + } + + /** + * Get ord + * + * @return \int + */ + public function getOrd() + { + return $this->ord; + } + + /** + * Set created_on + * + * @param \DateTime $createdOn + * @return FeedItem + */ + public function setCreatedOn($createdOn) + { + $this->created_on = $createdOn; + + return $this; + } + + /** + * Get created_on + * + * @return \DateTime + */ + public function getCreatedOn() + { + return $this->created_on; + } + + /** + * Set updated_on + * + * @param \DateTime $updatedOn + * @return FeedItem + */ + public function setUpdatedOn($updatedOn) + { + $this->updated_on = $updatedOn; + + return $this; + } + + /** + * Get updated_on + * + * @return \DateTime + */ + public function getUpdatedOn() + { + return $this->updated_on; + } +} \ No newline at end of file diff --git a/lib/Doctrine/Entities/FeedPublisher.php b/lib/Doctrine/Entities/FeedPublisher.php new file mode 100644 index 0000000000..0bb630813a --- /dev/null +++ b/lib/Doctrine/Entities/FeedPublisher.php @@ -0,0 +1,147 @@ +id; + } + + /** + * Set usr_id + * + * @param integer $usrId + * @return FeedPublisher + */ + public function setUsrId($usrId) + { + $this->usr_id = $usrId; + + return $this; + } + + /** + * Get usr_id + * + * @return integer + */ + public function getUsrId() + { + return $this->usr_id; + } + + /** + * Set owner + * + * @param boolean $owner + * @return FeedPublisher + */ + public function setOwner($owner) + { + $this->owner = $owner; + + return $this; + } + + /** + * Get owner + * + * @return boolean + */ + public function getOwner() + { + return $this->owner; + } + + /** + * Set feed + * + * @param \Entities\Feed $feed + * @return FeedPublisher + */ + public function setFeed(\Entities\Feed $feed = null) + { + $this->feed = $feed; + + return $this; + } + + /** + * Get feed + * + * @return \Entities\Feed + */ + public function getFeed() + { + return $this->feed; + } + + public function getUser(Application $app) + { + $user = \User_Adapter::getInstance($this->getUsrId(), $app); + + return $user; + } + + /** + * Set created_on + * + * @param \DateTime $createdOn + * @return FeedPublisher + */ + public function setCreatedOn($createdOn) + { + $this->created_on = $createdOn; + + return $this; + } + + /** + * Get created_on + * + * @return \DateTime + */ + public function getCreatedOn() + { + return $this->created_on; + } +} \ No newline at end of file diff --git a/lib/Doctrine/Repositories/OrderElementRepository.php b/lib/Doctrine/Repositories/OrderElementRepository.php index 26b72d24c5..88c305fbea 100644 --- a/lib/Doctrine/Repositories/OrderElementRepository.php +++ b/lib/Doctrine/Repositories/OrderElementRepository.php @@ -12,4 +12,15 @@ use Doctrine\ORM\EntityRepository; */ class OrderElementRepository extends EntityRepository { + public function find($id) + { + $dql = 'SELECT f FROM Entities\FeedPublisher f + WHERE f.id = :id '; + + $query = $this->_em->createQuery($dql); + $query->setParameter('id', $id); + $feed = $query->getResult(); + + return $feed[0]; + } } diff --git a/lib/Doctrine/Repositories/SessionRepository.php b/lib/Doctrine/Repositories/SessionRepository.php index b78db0574a..3a927bb8e9 100644 --- a/lib/Doctrine/Repositories/SessionRepository.php +++ b/lib/Doctrine/Repositories/SessionRepository.php @@ -2,7 +2,6 @@ namespace Repositories; -use Alchemy\Phrasea\Application; use Doctrine\ORM\EntityRepository; /** @@ -16,7 +15,6 @@ class SessionRepository extends EntityRepository /** * - * @param Application $app * @param User_Adapter $user * @return \Doctrine\Common\Collections\Collection */ @@ -24,7 +22,6 @@ class SessionRepository extends EntityRepository { $base_ids = array_keys($user->ACL()->get_granted_base()); - $dql = 'SELECT f FROM Entities\Feed f WHERE f.base_id IS NULL '; @@ -34,10 +31,23 @@ class SessionRepository extends EntityRepository } $dql .= ' OR f.public = true - ORDER BY f.created DESC'; + ORDER BY f.created_on DESC'; $query = $this->_em->createQuery($dql); $feeds = $query->getResult(); + return $feeds; } + + public function find($id) + { + $dql = 'SELECT f FROM Entities\Feed f + WHERE f.id = :id '; + + $query = $this->_em->createQuery($dql); + $query->setParameter('id', $id); + $feed = $query->getResult(); + + return $feed[0]; + } } diff --git a/templates/web/admin/publications/fiche.html.twig b/templates/web/admin/publications/fiche.html.twig index 7a3862c980..e83e21c902 100644 --- a/templates/web/admin/publications/fiche.html.twig +++ b/templates/web/admin/publications/fiche.html.twig @@ -6,16 +6,16 @@ {% if error %}
{{ error }}
{% endif %} - {% if feed.is_owner(app['authentication'].getUser()) %} + {% if feed.isOwner(app['authentication'].getUser()) %}

{% trans 'Edition' %}

- +
- +
@@ -79,28 +79,28 @@ }); -
+
- +
- +
- {% for databox in app['authentication'].getUser().ACL().get_granted_sbas('bas_chupub') %} {% for collection in databox.get_collections() %} - + {% endfor %} {% endfor %} @@ -110,7 +110,7 @@
@@ -133,23 +133,23 @@ - {% for publisher in feed.get_publishers() %} + {% for publisher in feed.getPublishers() %} - {{ publisher.get_user().get_id() }} + {{ publisher.getUsrId() }} - {{ publisher.get_user().get_display_name() }} + {{ publisher.getUser(app).get_display_name() }} - {{ publisher.get_user().get_email() }} + {{ publisher.getUser(app).get_email() }} - {% if publisher.is_owner() == true %} + {% if publisher.getOwner() == true %} X {% else %} - - + + {% endif %} @@ -159,7 +159,7 @@
-
+
diff --git a/templates/web/admin/publications/list.html.twig b/templates/web/admin/publications/list.html.twig index 19c89f0b6d..f5cfde8d94 100644 --- a/templates/web/admin/publications/list.html.twig +++ b/templates/web/admin/publications/list.html.twig @@ -72,7 +72,7 @@ {{ feed.getTitle() }} - {{ app['date-formatter'].getDate(feed.getCreated()) }} + {{ app['date-formatter'].getDate(feed.getCreatedOn()) }} {% if feed.getCollection() != null %} From c2f7a5685e806b83803c5ebf6d9565728cedef4c Mon Sep 17 00:00:00 2001 From: Andrey Date: Thu, 30 May 2013 18:55:53 +0200 Subject: [PATCH 03/67] Add token entities and repositories --- lib/Doctrine/Entities/AggregateToken.php | 83 ++++++++++++++ lib/Doctrine/Entities/FeedToken.php | 108 ++++++++++++++++++ .../Repositories/AggregateTokenRepository.php | 29 +++++ .../Repositories/FeedTokenRepository.php | 31 +++++ 4 files changed, 251 insertions(+) create mode 100644 lib/Doctrine/Entities/AggregateToken.php create mode 100644 lib/Doctrine/Entities/FeedToken.php create mode 100644 lib/Doctrine/Repositories/AggregateTokenRepository.php create mode 100644 lib/Doctrine/Repositories/FeedTokenRepository.php diff --git a/lib/Doctrine/Entities/AggregateToken.php b/lib/Doctrine/Entities/AggregateToken.php new file mode 100644 index 0000000000..85f9493da0 --- /dev/null +++ b/lib/Doctrine/Entities/AggregateToken.php @@ -0,0 +1,83 @@ +id; + } + + /** + * Set usr_id + * + * @param integer $usrId + * @return AggregateToken + */ + public function setUsrId($usrId) + { + $this->usr_id = $usrId; + + return $this; + } + + /** + * Get usr_id + * + * @return integer + */ + public function getUsrId() + { + return $this->usr_id; + } + + /** + * Set value + * + * @param string $value + * @return AggregateToken + */ + public function setValue($value) + { + $this->value = $value; + + return $this; + } + + /** + * Get value + * + * @return string + */ + public function getValue() + { + return $this->value; + } +} \ No newline at end of file diff --git a/lib/Doctrine/Entities/FeedToken.php b/lib/Doctrine/Entities/FeedToken.php new file mode 100644 index 0000000000..9b1f35c72e --- /dev/null +++ b/lib/Doctrine/Entities/FeedToken.php @@ -0,0 +1,108 @@ +id; + } + + /** + * Set usr_id + * + * @param integer $usrId + * @return FeedToken + */ + public function setUsrId($usrId) + { + $this->usr_id = $usrId; + + return $this; + } + + /** + * Get usr_id + * + * @return integer + */ + public function getUsrId() + { + return $this->usr_id; + } + + /** + * Set feed + * + * @param \Entities\Feed $feed + * @return FeedToken + */ + public function setFeed(\Entities\Feed $feed = null) + { + $this->feed = $feed; + + return $this; + } + + /** + * Get feed + * + * @return \Entities\Feed + */ + public function getFeed() + { + return $this->feed; + } + /** + * @var string + */ + private $value; + + + /** + * Set value + * + * @param string $value + * @return FeedToken + */ + public function setValue($value) + { + $this->value = $value; + + return $this; + } + + /** + * Get value + * + * @return string + */ + public function getValue() + { + return $this->value; + } +} \ No newline at end of file diff --git a/lib/Doctrine/Repositories/AggregateTokenRepository.php b/lib/Doctrine/Repositories/AggregateTokenRepository.php new file mode 100644 index 0000000000..a12579fabc --- /dev/null +++ b/lib/Doctrine/Repositories/AggregateTokenRepository.php @@ -0,0 +1,29 @@ +_em->createQuery($dql); + $query->setParameters(array( + ':usr_id' => $user->get_id()) + ); + + return $query->getOneOrNullResult(); + } +} diff --git a/lib/Doctrine/Repositories/FeedTokenRepository.php b/lib/Doctrine/Repositories/FeedTokenRepository.php new file mode 100644 index 0000000000..c592dd4611 --- /dev/null +++ b/lib/Doctrine/Repositories/FeedTokenRepository.php @@ -0,0 +1,31 @@ +_em->createQuery($dql); + $query->setParameters(array( + ':feed' => $feed, + ':usr_id' => $user->get_id()) + ); + + return $query->getOneOrNullResult(); + } +} From fc9379ca6309033bcc09107c2d3e77093cde604c Mon Sep 17 00:00:00 2001 From: Andrey Date: Thu, 30 May 2013 18:58:05 +0200 Subject: [PATCH 04/67] Add more search methods to repositories --- .../Repositories/OrderElementRepository.php | 19 ++++++-- .../Repositories/SessionRepository.php | 48 +++++++++++++++---- .../Repositories/UserSettingRepository.php | 40 ++++++++++++++++ 3 files changed, 93 insertions(+), 14 deletions(-) diff --git a/lib/Doctrine/Repositories/OrderElementRepository.php b/lib/Doctrine/Repositories/OrderElementRepository.php index 88c305fbea..916c536108 100644 --- a/lib/Doctrine/Repositories/OrderElementRepository.php +++ b/lib/Doctrine/Repositories/OrderElementRepository.php @@ -16,11 +16,22 @@ class OrderElementRepository extends EntityRepository { $dql = 'SELECT f FROM Entities\FeedPublisher f WHERE f.id = :id '; - + $query = $this->_em->createQuery($dql); $query->setParameter('id', $id); - $feed = $query->getResult(); - - return $feed[0]; + + return $query->getOneOrNullResult(); + } + + public function findByUser(\Entities\Feed $feed, \User_Adapter $user) + { + $dql = 'SELECT f FROM Entities\FeedPublisher f + WHERE f.usr_id = :usrId AND f.feed = :feed'; + + $query = $this->_em->createQuery($dql); + $query->setParameter('usrId', $user->get_id()); + $query->setParameter('feed', $feed); + + return $query->getOneOrNullResult(); } } diff --git a/lib/Doctrine/Repositories/SessionRepository.php b/lib/Doctrine/Repositories/SessionRepository.php index 3a927bb8e9..a3ca1b71e0 100644 --- a/lib/Doctrine/Repositories/SessionRepository.php +++ b/lib/Doctrine/Repositories/SessionRepository.php @@ -2,6 +2,7 @@ namespace Repositories; +use Alchemy\Phrasea\Application; use Doctrine\ORM\EntityRepository; /** @@ -12,7 +13,7 @@ use Doctrine\ORM\EntityRepository; */ class SessionRepository extends EntityRepository { - + /** * * @param User_Adapter $user @@ -35,19 +36,46 @@ class SessionRepository extends EntityRepository $query = $this->_em->createQuery($dql); $feeds = $query->getResult(); - + return $feeds; } - - public function find($id) + + public function findAllPublic() { $dql = 'SELECT f FROM Entities\Feed f - WHERE f.id = :id '; - + WHERE f.public = true + ORDER BY f.created_on DESC'; + $query = $this->_em->createQuery($dql); - $query->setParameter('id', $id); - $feed = $query->getResult(); - - return $feed[0]; + $feeds = $query->getResult(); + + return $feeds; + } + + public function loadWithUser(Application $app, \User_Adapter $user, $id) + { + $feed = $this->find($id); + if ($feed) { + $coll = $feed->getCollection($app); + if ($feed->getPublic() + || $coll === null + || in_array($coll->get_base_id(), array_keys($user->ACL()->get_granted_base()))) { + return $feed; + } + } + + return null; + } + + public function findByIdArray(array $feed_id) + { + $dql = 'SELECT f FROM Entities\Feed f + ORDER BY f.created_on DESC + WHERE f.id IN (' . implode(",", $feed_id) . ')'; + + $query = $this->_em->createQuery($dql); + $feeds = $query->getResult(); + + return $feeds; } } diff --git a/lib/Doctrine/Repositories/UserSettingRepository.php b/lib/Doctrine/Repositories/UserSettingRepository.php index 872f603c7f..3537ecd8b5 100644 --- a/lib/Doctrine/Repositories/UserSettingRepository.php +++ b/lib/Doctrine/Repositories/UserSettingRepository.php @@ -12,4 +12,44 @@ use Doctrine\ORM\EntityRepository; */ class UserSettingRepository extends EntityRepository { + public function find($id) + { + $dql = 'SELECT f FROM Entities\FeedEntry f + WHERE f.id = :id '; + + $query = $this->_em->createQuery($dql); + $query->setParameter('id', $id); + + return $query->getOneOrNullResult(); + } + + public function findByFeed($feed, $id) + { + $dql = 'SELECT f FROM Entities\FeedEntry f + WHERE f.id = :id AND f.feed = :feed'; + + $query = $this->_em->createQuery($dql); + $query->setParameter('id', $id); + $query->setParameter('feed', $feed); + + return $query->getOneOrNullResult(); + } + + public function findByFeeds($feeds, $offset_start = null, $how_many = null) + { + $dql = 'SELECT f FROM Entities\FeedEntry f + WHERE f.feed IN (:feeds)'; + + $query = $this->_em->createQuery($dql); + $query->setParameter('feeds', $feeds); + + if (null !== $offset_start) { + $query->setFirstResult($offset_start); + } + if (null !== $how_many) { + $query->setMaxResults($how_many); + } + + return $query->getResult(); + } } From f117817e8705d76a362d2605c133822aa8c0292e Mon Sep 17 00:00:00 2001 From: Andrey Date: Thu, 30 May 2013 19:04:49 +0200 Subject: [PATCH 05/67] Implementation of doctrine entities --- lib/Alchemy/Phrasea/Application.php | 2 + lib/Alchemy/Phrasea/Controller/Prod/Feed.php | 154 ++++++---- lib/Alchemy/Phrasea/Controller/Prod/Root.php | 9 +- .../Phrasea/Controller/Root/RSSFeeds.php | 47 ++-- .../Core/Provider/FeedServiceProvider.php | 34 +++ lib/Alchemy/Phrasea/Feed/Aggregate.php | 149 ++++++++++ .../Phrasea/Feed/AggregateLinkGenerator.php | 74 +++++ lib/Alchemy/Phrasea/Feed/AggregateToken.php | 111 ++++++++ lib/Alchemy/Phrasea/Feed/FeedInterface.php | 21 ++ lib/Alchemy/Phrasea/Feed/Link.php | 68 +++++ lib/Alchemy/Phrasea/Feed/LinkGenerator.php | 80 ++++++ lib/Alchemy/Phrasea/Feed/LinkInterface.php | 30 ++ lib/Doctrine/Entities/Feed.php | 124 +++++--- lib/Doctrine/Entities/FeedEntry.php | 8 +- lib/Doctrine/Entities/FeedItem.php | 4 - .../prod/actions/publish/publish.html.twig | 10 +- templates/web/prod/feeds/entry.html.twig | 2 +- .../web/prod/feeds/entry_macro.html.twig | 40 +-- templates/web/prod/feeds/feeds.html.twig | 29 +- templates/web/prod/index.html.twig | 10 +- .../Phrasea/Controller/Prod/FeedTest.php | 264 +++++++++--------- .../Core/Provider/FeedServiceProviderTest.php | 25 ++ .../Feed/AggregateLinkGeneratorTest.php | 129 +++++++++ .../Tests/Phrasea/Feed/LinkGeneratorTest.php | 126 +++++++++ tests/classes/PhraseanetPHPUnitAbstract.php | 126 +++++++++ 25 files changed, 1374 insertions(+), 302 deletions(-) create mode 100644 lib/Alchemy/Phrasea/Core/Provider/FeedServiceProvider.php create mode 100644 lib/Alchemy/Phrasea/Feed/Aggregate.php create mode 100644 lib/Alchemy/Phrasea/Feed/AggregateLinkGenerator.php create mode 100644 lib/Alchemy/Phrasea/Feed/AggregateToken.php create mode 100644 lib/Alchemy/Phrasea/Feed/FeedInterface.php create mode 100644 lib/Alchemy/Phrasea/Feed/Link.php create mode 100644 lib/Alchemy/Phrasea/Feed/LinkGenerator.php create mode 100644 lib/Alchemy/Phrasea/Feed/LinkInterface.php create mode 100644 tests/Alchemy/Tests/Phrasea/Core/Provider/FeedServiceProviderTest.php create mode 100644 tests/Alchemy/Tests/Phrasea/Feed/AggregateLinkGeneratorTest.php create mode 100644 tests/Alchemy/Tests/Phrasea/Feed/LinkGeneratorTest.php diff --git a/lib/Alchemy/Phrasea/Application.php b/lib/Alchemy/Phrasea/Application.php index 5c400af903..ae485b1af3 100644 --- a/lib/Alchemy/Phrasea/Application.php +++ b/lib/Alchemy/Phrasea/Application.php @@ -84,6 +84,7 @@ use Alchemy\Phrasea\Core\Provider\CacheServiceProvider; use Alchemy\Phrasea\Core\Provider\ConfigurationServiceProvider; use Alchemy\Phrasea\Core\Provider\ConfigurationTesterServiceProvider; use Alchemy\Phrasea\Core\Provider\FileServeServiceProvider; +use Alchemy\Phrasea\Core\Provider\FeedServiceProvider; use Alchemy\Phrasea\Core\Provider\FtpServiceProvider; use Alchemy\Geonames\GeonamesServiceProvider; use Alchemy\Phrasea\Core\Provider\InstallerServiceProvider; @@ -200,6 +201,7 @@ class Application extends SilexApplication $this->register(new ImagineServiceProvider()); $this->register(new JMSSerializerServiceProvider()); $this->register(new FFMpegServiceProvider()); + $this->register(new FeedServiceProvider()); $this->register(new FilesystemServiceProvider()); $this->register(new FtpServiceProvider()); $this->register(new GeonamesServiceProvider()); diff --git a/lib/Alchemy/Phrasea/Controller/Prod/Feed.php b/lib/Alchemy/Phrasea/Controller/Prod/Feed.php index b85df97637..0290f8ce91 100644 --- a/lib/Alchemy/Phrasea/Controller/Prod/Feed.php +++ b/lib/Alchemy/Phrasea/Controller/Prod/Feed.php @@ -11,7 +11,10 @@ namespace Alchemy\Phrasea\Controller\Prod; +use Alchemy\Phrasea\Feed\Aggregate; +use Alchemy\Phrasea\Feed\AggregateLinkGenerator; use Alchemy\Phrasea\Controller\RecordsRequest; +use Alchemy\Phrasea\Feed\LinkGenerator; use Silex\Application; use Silex\ControllerProviderInterface; use Symfony\Component\HttpFoundation\Request; @@ -39,10 +42,10 @@ class Feed implements ControllerProviderInterface * I got a selection of docs, which publications are available forthese docs ? */ $controllers->post('/requestavailable/', function(Application $app, Request $request) { - $feeds = \Feed_Collection::load_all($app, $app['authentication']->getUser()); + $feeds = $app["EM"]->getRepository("Entities\Feed")->getAllForUser($app['authentication']->getUser()); $publishing = RecordsRequest::fromRequest($app, $request, true, array(), array('bas_chupub')); - return $app['twig']->render('prod/actions/publish/publish.html.twig', array('publishing' => $publishing, 'feeds' => $feeds)); + return $app['twig']->render('prod/actions/publish/publish.html.twig', array('publishing' => $publishing, 'feeds' => $feeds)); }); /** @@ -50,24 +53,42 @@ class Feed implements ControllerProviderInterface */ $controllers->post('/entry/create/', function(Application $app, Request $request) { try { - $feed = new \Feed_Adapter($app, $request->request->get('feed_id')); - $publisher = \Feed_Publisher_Adapter::getPublisher($app['phraseanet.appbox'], $feed, $app['authentication']->getUser()); - + $feed = $app["EM"]->getRepository("Entities\Feed")->find($request->request->get('feed_id')); + $publisher = $app["EM"]->getRepository("Entities\FeedPublisher")->findByUser($feed, $app['authentication']->getUser()); $title = $request->request->get('title'); $subtitle = $request->request->get('subtitle'); $author_name = $request->request->get('author_name'); - $author_mail = $request->request->get('author_mail'); + $author_email = $request->request->get('author_email'); - $entry = \Feed_Entry_Adapter::create($app, $feed, $publisher, $title, $subtitle, $author_name, $author_mail); + $entry = new \Entities\FeedEntry(); + $entry->setFeed($feed); + $entry->setPublisher($publisher); + $entry->setTitle($title); + $entry->setSubtitle($subtitle); + $entry->setAuthorName($author_name); + $entry->setAuthorEmail($author_email); + + $feed->addEntry($entry); $publishing = RecordsRequest::fromRequest($app, $request, true, array(), array('bas_chupub')); - foreach ($publishing as $record) { - $item = \Feed_Entry_Item::create($app['phraseanet.appbox'], $entry, $record); + $item = new \Entities\FeedItem(); + $item->setEntry($entry); + $item->setRecordId($record->get_record_id()); + $item->setSbasId($record->get_sbas_id()); + $entry->addItem($item); + $app["EM"]->persist($item); } - $datas = array('error' => false, 'message' => false); + + $app["EM"]->persist($entry); + $app["EM"]->persist($feed); + $app["EM"]->flush(); + + $app['events-manager']->trigger('__FEED_ENTRY_CREATE__', array('entry_id' => $entry->getId()), $entry); + + $datas = array('error' => false, 'message' => false); } catch (\Exception $e) { - $datas = array('error' => true, 'message' => _('An error occured'), 'details' => $e->getMessage()); + $datas = array('error' => true, 'message' => _('An error occured'), 'details' => $e->getMessage()); } return $app->json($datas); @@ -78,13 +99,13 @@ class Feed implements ControllerProviderInterface }); $controllers->get('/entry/{id}/edit/', function(Application $app, Request $request, $id) { - $entry = \Feed_Entry_Adapter::load_from_id($app, $id); + $entry = $app["EM"]->getRepository("Entities\FeedEntry")->find($id); - if (!$entry->is_publisher($app['authentication']->getUser())) { + if (!$entry->isPublisher($app['authentication']->getUser())) { throw new AccessDeniedHttpException(); } - $feeds = \Feed_Collection::load_all($app, $app['authentication']->getUser()); + $feeds = $app["EM"]->getRepository("Entities\Feed")->findAll(); $datas = $app['twig']->render('prod/actions/publish/publish_edit.html.twig', array('entry' => $entry, 'feeds' => $feeds)); @@ -97,40 +118,44 @@ class Feed implements ControllerProviderInterface }); $controllers->post('/entry/{id}/update/', function(Application $app, Request $request, $id) { - $datas = array('error' => true, 'message' => '', 'datas' => ''); + $datas = array('error' => true, 'message' => '', 'datas' => ''); try { - $app['phraseanet.appbox']->get_connection()->beginTransaction(); + $entry = $app["EM"]->getRepository("Entities\FeedEntry")->find($id); - $entry = \Feed_Entry_Adapter::load_from_id($app, $id); - - if (!$entry->is_publisher($app['authentication']->getUser())) { + if (null === $entry) { + throw new NotFoundHttpException(); + } + if (!$entry->isPublisher($app['authentication']->getUser())) { throw new AccessDeniedHttpException(); } $title = $request->request->get('title'); $subtitle = $request->request->get('subtitle'); $author_name = $request->request->get('author_name'); - $author_mail = $request->request->get('author_mail'); + $author_mail = $request->request->get('author_email'); - $entry->set_author_email($author_mail) - ->set_author_name($author_name) - ->set_title($title) - ->set_subtitle($subtitle); + $entry->setAuthorEmail($author_mail) + ->setAuthorName($author_name) + ->setTitle($title) + ->setSubtitle($subtitle); - $current_feed_id = $entry->get_feed()->get_id(); + $current_feed_id = $entry->getFeed()->getId(); $new_feed_id = $request->request->get('feed_id', $current_feed_id); if ($current_feed_id != $new_feed_id) { try { - $new_feed = \Feed_Adapter::load_with_user($app, $app['authentication']->getUser(), $new_feed_id); + $new_feed = $app["EM"]->getRepository("Entities\Feed")->loadWithUser($app, $app['authentication']->getUser(), $new_feed_id); } catch (NotFoundHttpException $e) { throw new AccessDeniedHttpException('You have no access to this feed'); } - if (!$new_feed->is_publisher($app['authentication']->getUser())) { - throw new AccessDeniedHttpException('You are not publisher of this feed'); + if ($new_feed === null) { + throw new NotFoundHttpException(); } - $entry->set_feed($new_feed); + if (!$new_feed->isPublisher($app['authentication']->getUser())) { + throw new \Exception_Forbidden('You are not publisher of this feed'); + } + $entry->setFeed($new_feed); } $items = explode(';', $request->request->get('sorted_lst')); @@ -141,26 +166,26 @@ class Feed implements ControllerProviderInterface continue; } - $item = new \Feed_Entry_Item($app['phraseanet.appbox'], $entry, $item_sort_datas[0]); - - $item->set_ord($item_sort_datas[1]); + $item = new \entities\FeedItem($entry, $item_sort_datas[0]); + $item->setEntry($entry); + $entry->addItem($item); + $item->setOrd($item_sort_datas[1]); + $app["EM"]->persist($item); } - $app['phraseanet.appbox']->get_connection()->commit(); + + $app["EM"]->persist($entry); + $app["EM"]->flush(); $entry = $app['twig']->render('prod/feeds/entry.html.twig', array('entry' => $entry)); - $datas = array('error' => false, 'message' => 'succes', 'datas' => $entry); + $datas = array('error' => false, 'message' => 'succes', 'datas' => $entry); } catch (\Exception_Feed_EntryNotFound $e) { - $app['phraseanet.appbox']->get_connection()->rollBack(); $datas['message'] = _('Feed entry not found'); } catch (NotFoundHttpException $e) { - $app['phraseanet.appbox']->get_connection()->rollBack(); $datas['message'] = _('Feed not found'); } catch (AccessDeniedHttpException $e) { - $app['phraseanet.appbox']->get_connection()->rollBack(); $datas['message'] = _('You are not authorized to access this feed'); } catch (\Exception $e) { - $app['phraseanet.appbox']->get_connection()->rollBack(); $datas['message'] = $e->getMessage(); } @@ -172,26 +197,24 @@ class Feed implements ControllerProviderInterface }); $controllers->post('/entry/{id}/delete/', function(Application $app, Request $request, $id) { - $datas = array('error' => true, 'message' => ''); + $datas = array('error' => true, 'message' => ''); try { - $app['phraseanet.appbox']->get_connection()->beginTransaction(); + $entry = $app["EM"]->getRepository("Entities\FeedEntry")->find($id); - $entry = \Feed_Entry_Adapter::load_from_id($app, $id); - - if (!$entry->is_publisher($app['authentication']->getUser()) - && $entry->get_feed()->is_owner($app['authentication']->getUser()) === false) { + if (null === $entry) { + throw new NotFoundHttpException(); + } + if (!$entry->isPublisher($app['authentication']->getUser()) && $entry->getFeed()->isOwner($app['authentication']->getUser()) === false) { throw new AccessDeniedHttpException(_('Action Forbidden : You are not the publisher')); } - $entry->delete(); + $app["EM"]->remove($entry); + $app["EM"]->flush(); - $app['phraseanet.appbox']->get_connection()->commit(); - $datas = array('error' => false, 'message' => 'succes'); - } catch (\Exception_Feed_EntryNotFound $e) { - $app['phraseanet.appbox']->get_connection()->rollBack(); + $datas = array('error' => false, 'message' => 'succes'); + } catch (NotFoundHttpException $e) { $datas['message'] = _('Feed entry not found'); } catch (\Exception $e) { - $app['phraseanet.appbox']->get_connection()->rollBack(); $datas['message'] = $e->getMessage(); } @@ -207,13 +230,13 @@ class Feed implements ControllerProviderInterface $page = (int) $request->query->get('page'); $page = $page > 0 ? $page : 1; - $feeds = \Feed_Collection::load_all($app, $app['authentication']->getUser()); + $feeds = $app["EM"]->getRepository("Entities\Feed")->findAll(); $datas = $app['twig']->render('prod/feeds/feeds.html.twig' , array( 'feeds' => $feeds - , 'feed' => $feeds->get_aggregate() - , 'page' => $page + , 'feed' => new Aggregate($app, $feeds) + , 'page' => $page ) ); @@ -224,10 +247,10 @@ class Feed implements ControllerProviderInterface $page = (int) $request->query->get('page'); $page = $page > 0 ? $page : 1; - $feed = \Feed_Adapter::load_with_user($app, $app['authentication']->getUser(), $id); - $feeds = \Feed_Collection::load_all($app, $app['authentication']->getUser()); + $feed = $app["EM"]->getRepository("Entities\Feed")->loadWithUser($app, $app['authentication']->getUser(), $id); + $feeds = $app["EM"]->getRepository("Entities\Feed")->findAll(); - $datas = $app['twig']->render('prod/feeds/feeds.html.twig', array('feed' => $feed, 'feeds' => $feeds, 'page' => $page)); + $datas = $app['twig']->render('prod/feeds/feeds.html.twig', array('feed' => $feed, 'feeds' => $feeds, 'page' => $page)); return new Response($datas); }) @@ -237,12 +260,18 @@ class Feed implements ControllerProviderInterface $controllers->get('/subscribe/aggregated/', function(Application $app, Request $request) { $renew = ($request->query->get('renew') === 'true'); - $feeds = \Feed_Collection::load_all($app, $app['authentication']->getUser()); + $feeds = $app["EM"]->getRepository("Entities\Feed")->findAll(); + + $aggregateGenerator = new AggregateLinkGenerator($app['url_generator'], $app['EM'], $app['tokens']); + + $aggregate = new Aggregate($app, $feeds); + + $link = $aggregateGenerator->generate($aggregate, $app['authentication']->getUser(), AggregateLinkGenerator::FORMAT_RSS, null, $renew); $output = array( 'texte' => '

' . _('publication::Voici votre fil RSS personnel. Il vous permettra d\'etre tenu au courrant des publications.') . '

' . _('publications::Ne le partagez pas, il est strictement confidentiel') . '

-
', +
', 'titre' => _('publications::votre rss personnel') ); @@ -251,12 +280,17 @@ class Feed implements ControllerProviderInterface $controllers->get('/subscribe/{id}/', function(Application $app, Request $request, $id) { $renew = ($request->query->get('renew') === 'true'); - $feed = \Feed_Adapter::load_with_user($app, $app['authentication']->getUser(), $id); + + $feed = $app["EM"]->getRepository("Entities\Feed")->loadWithUser($app, $app['authentication']->getUser(), $id); + + $linkGenerator = new LinkGenerator($app['url_generator'], $app['EM'], $app['tokens']); + + $link = $linkGenerator->generate($feed, $app['authentication']->getUser(), LinkGenerator::FORMAT_RSS, null, $renew); $output = array( 'texte' => '

' . _('publication::Voici votre fil RSS personnel. Il vous permettra d\'etre tenu au courrant des publications.') . '

' . _('publications::Ne le partagez pas, il est strictement confidentiel') . '

-
', +
', 'titre' => _('publications::votre rss personnel') ); diff --git a/lib/Alchemy/Phrasea/Controller/Prod/Root.php b/lib/Alchemy/Phrasea/Controller/Prod/Root.php index 75d889bc39..3d85e8f16d 100644 --- a/lib/Alchemy/Phrasea/Controller/Prod/Root.php +++ b/lib/Alchemy/Phrasea/Controller/Prod/Root.php @@ -11,6 +11,7 @@ namespace Alchemy\Phrasea\Controller\Prod; +use \Alchemy\Phrasea\Feed\Aggregate; use Alchemy\Phrasea\Application; use Alchemy\Phrasea\Exception\SessionNotFound; use Silex\Application as SilexApplication; @@ -72,8 +73,10 @@ class Root implements ControllerProviderInterface $cssfile = '000000'; } - $user_feeds = \Feed_Collection::load_all($app, $app['authentication']->getUser()); - $feeds = array_merge(array($user_feeds->get_aggregate()), $user_feeds->get_feeds()); +// $user_feeds = \Feed_Collection::load_all($app, $app['authentication']->getUser()); +// $feeds = array_merge(array($user_feeds->get_aggregate()), $user_feeds->get_feeds()); + $user_feeds = $app["EM"]->getRepository("Entities\Feed")->getAllForUser($app['authentication']->getUser()); + $aggregate = new Aggregate($app, $user_feeds); $thjslist = ""; @@ -115,7 +118,7 @@ class Root implements ControllerProviderInterface 'GV_thesaurus' => $app['phraseanet.registry']->get('GV_thesaurus'), 'cgus_agreement' => \databox_cgu::askAgreement($app), 'css' => $css, - 'feeds' => $feeds, + 'aggregate' => $aggregate, 'GV_google_api' => $app['phraseanet.registry']->get('GV_google_api'), 'queries_topics' => $queries_topics, 'search_status' => \databox_status::getSearchStatus($app), diff --git a/lib/Alchemy/Phrasea/Controller/Root/RSSFeeds.php b/lib/Alchemy/Phrasea/Controller/Root/RSSFeeds.php index 7855fbf691..fb00b5304c 100644 --- a/lib/Alchemy/Phrasea/Controller/Root/RSSFeeds.php +++ b/lib/Alchemy/Phrasea/Controller/Root/RSSFeeds.php @@ -28,45 +28,45 @@ class RSSFeeds implements ControllerProviderInterface $controllers = $app['controllers_factory']; $display_feed = function(Application $app, $feed, $format, $page, $user = null) { - $total = $feed->get_count_total_entries(); + $total = $feed->getCountTotalEntries(); $perPage = 5; - $entries = $feed->get_entries((($page - 1) * $perPage), $perPage); + $entries = $feed->getEntries((($page - 1) * $perPage), $perPage); - if ($format == \Feed_Adapter::FORMAT_RSS) { + if ($format == \Entities\Feed::FORMAT_RSS) { $content = new \Feed_XML_RSS(); } - if ($format == \Feed_Adapter::FORMAT_ATOM) { + if ($format == \Entities\Feed::FORMAT_ATOM) { $content = new \Feed_XML_Atom(); } - if ($format == \Feed_Adapter::FORMAT_COOLIRIS) { + if ($format == \Entities\Feed::FORMAT_COOLIRIS) { $content = new \Feed_XML_Cooliris(); } if ($user instanceof \User_Adapter) - $link = $feed->get_user_link($app['phraseanet.registry'], $user, $format, $page); + $link = $feed->getUserLink($app['phraseanet.registry'], $user, $format, $page); else $link = $feed->get_homepage_link($app['phraseanet.registry'], $format, $page); $content->set_updated_on(new \DateTime()); - $content->set_title($feed->get_title()); - $content->set_subtitle($feed->get_subtitle()); + $content->set_title($feed->getTitle()); + $content->set_subtitle($feed->getSubtitle()); $content->set_generator('Phraseanet'); $content->set_link($link); if ($user instanceof \User_Adapter) { if ($page > 1) - $content->set_previous_page($feed->get_user_link($app['phraseanet.registry'], $user, $format, ($page - 1))); + $content->set_previous_page($feed->getUserLink($app['phraseanet.registry'], $user, $format, ($page - 1))); if ($total > ($page * $perPage)) - $content->set_next_page($feed->get_user_link($app['phraseanet.registry'], $user, $format, ($page + 1))); + $content->set_next_page($feed->getUserLink($app['phraseanet.registry'], $user, $format, ($page + 1))); } else { if ($page > 1) $content->set_previous_page($feed->get_homepage_link($app['phraseanet.registry'], $format, ($page - 1))); if ($total > ($page * $perPage)) $content->set_next_page($feed->get_homepage_link($app['phraseanet.registry'], $format, ($page + 1))); } - foreach ($entries->get_entries() as $entry) + foreach ($entries->getEntries() as $entry) $content->set_item($entry); $render = $content->render(); @@ -77,9 +77,10 @@ class RSSFeeds implements ControllerProviderInterface }; $controllers->get('/feed/{id}/{format}/', function(Application $app, $id, $format) use ($display_feed) { - $feed = new \Feed_Adapter($app, $id); + // $feed = new \Feed_Adapter($app, $id); + $feed = $app["EM"]->getRepository("Entities\Feed")->find($id); - if (!$feed->is_public()) { + if (!$feed->isPublic()) { return new Response('Forbidden', 403); } @@ -95,8 +96,8 @@ class RSSFeeds implements ControllerProviderInterface ->assert('format', '(rss|atom)'); $controllers->get('/userfeed/{token}/{id}/{format}/', function(Application $app, $token, $id, $format) use ($display_feed) { - $token = new \Feed_Token($app, $token, $id); - $feed = $token->get_feed(); + $token = $app["EM"]->getRepository("Entities\FeedToken")->findBy(array("id" => $id)); + $feed = $token->getFeed(); $request = $app['request']; @@ -110,8 +111,8 @@ class RSSFeeds implements ControllerProviderInterface ->assert('format', '(rss|atom)'); $controllers->get('/userfeed/aggregated/{token}/{format}/', function(Application $app, $token, $format) use ($display_feed) { - $token = new \Feed_TokenAggregate($app, $token); - $feed = $token->get_feed(); + $token = $app["EM"]->getRepository("Entities\AggregateToken")->findBy(array("id" => $id)); + //$feed = $token->getFeed(); $request = $app['request']; @@ -124,8 +125,10 @@ class RSSFeeds implements ControllerProviderInterface ->assert('format', '(rss|atom)'); $controllers->get('/aggregated/{format}/', function(Application $app, $format) use ($display_feed) { - $feeds = \Feed_Collection::load_public_feeds($app); - $feed = $feeds->get_aggregate(); + //$feeds = \Feed_Collection::load_public_feeds($app); + //$feed = $feeds->get_aggregate(); + $feeds = $app["EM"]->getRepository("Entities\Feed")->findAllPublic(); + $feed = new Aggregate($app, $feeds); $request = $app['request']; $page = (int) $request->query->get('page'); @@ -137,8 +140,10 @@ class RSSFeeds implements ControllerProviderInterface ->assert('format', '(rss|atom)'); $controllers->get('/cooliris/', function(Application $app) use ($display_feed) { - $feeds = \Feed_Collection::load_public_feeds($app); - $feed = $feeds->get_aggregate(); +// $feeds = \Feed_Collection::load_public_feeds($app); +// $feed = $feeds->get_aggregate(); + $feeds = $app["EM"]->getRepository("Entities\Feed")->findAllPublic(); + $feed = new Aggregate($app, $feeds); $request = $app['request']; $page = (int) $request->query->get('page'); diff --git a/lib/Alchemy/Phrasea/Core/Provider/FeedServiceProvider.php b/lib/Alchemy/Phrasea/Core/Provider/FeedServiceProvider.php new file mode 100644 index 0000000000..dc4ceef38f --- /dev/null +++ b/lib/Alchemy/Phrasea/Core/Provider/FeedServiceProvider.php @@ -0,0 +1,34 @@ +share(function($app) { + return new LinkGenerator($app['url_generator'], $app['EM'], $app['tokens']); + }); + $app['feed.aggreagate-link-generator'] = $app->share(function($app) { + return new AggregateLinkGenerator($app['url_generator'], $app['EM'], $app['tokens']); + }); + } + + public function boot(Application $app) + { + } +} diff --git a/lib/Alchemy/Phrasea/Feed/Aggregate.php b/lib/Alchemy/Phrasea/Feed/Aggregate.php new file mode 100644 index 0000000000..3bfbdd6177 --- /dev/null +++ b/lib/Alchemy/Phrasea/Feed/Aggregate.php @@ -0,0 +1,149 @@ +title = 'AGGREGATE'; + $this->subtitle = 'AGGREGATE SUBTITLE'; + $this->created_on = new \DateTime(); + $this->updated_on = new \DateTime(); + $this->app = $app; + + $tmp_feeds = array(); + + foreach ($feeds as $feed) { + $tmp_feeds[$feed->getId()] = $feed; + } + + $this->feeds = $tmp_feeds; + + return $this; + } + + public static function createFromUser(Application $app, \User_Adapter $user) + { + $feeds = $app["EM"]->getRepository('Entities\Feed')->findByUser($user); + + return new static($app, $feeds); + } + + public static function create(Application $app, array $feed_ids) + { + $feeds = $app["EM"]->getRepository('Entities\Feed')->findByIdArray($feed_ids); + + return new static($app, $feeds); + } + + public function isAggregated() + { + return true; + } + + public function getEntries($offset_start, $how_many) + { + $result = new \Feed_Entry_Collection(); + + if (count($this->feeds) === 0) { + return $result; + } + + $offset_start = (int) $offset_start; + $how_many = $how_many > 20 ? 20 : (int) $how_many; + + $rs = $this->app["EM"]->getRepository("Entities\FeedEntry")->findByFeeds($this->feeds, $offset_start, $how_many); + + foreach ($rs as $entry) { + if ($entry) { + $result->add_entry($entry); + } + } + + return $result; + } + + public function getSubtitle() + { + return $this->subtitle; + } + + public function getTitle() + { + return $this->title; + } + + public function getIconUrl() + { + $url = '/skins/icons/rss32.gif'; + + return $url; + } + + public function getCreatedOn() + { + return $this->created_on; + } + + public function getUpdatedOn() + { + return $this->updated_on; + } + + public function getToken() + { + return $this->token; + } + + public function setToken($token) + { + $this->token = $token; + } + + public function getFeeds() + { + return $this->feeds; + } + + public function getCountTotalEntries() + { + if (count($this->feeds) > 0) { + return count($this->app["EM"]->getRepository("Entities\FeedEntry")->findByFeeds($this->feeds)); + } + return 0; + } +} diff --git a/lib/Alchemy/Phrasea/Feed/AggregateLinkGenerator.php b/lib/Alchemy/Phrasea/Feed/AggregateLinkGenerator.php new file mode 100644 index 0000000000..6f9477c6f8 --- /dev/null +++ b/lib/Alchemy/Phrasea/Feed/AggregateLinkGenerator.php @@ -0,0 +1,74 @@ +generator = $generator; + $this->em = $em; + $this->random = $random; + } + + public function generate(Aggregate $aggregate, \User_Adapter $user, $format, $page = null, $renew = false) + { + switch ($format) { + case self::FORMAT_ATOM: + return new FeedLink( + $this->generator->generate('feed_user_aggregated', array( + 'token' => $this->getAggregateToken($user, $renew)->getValue(), + 'format' => 'atom', + ), UrlGenerator::ABSOLUTE_URL), + sprintf('%s - %s', $aggregate->getTitle(), 'Atom'), + 'application/atom+xml' + ); + break; + case self::FORMAT_RSS: + return new FeedLink( + $this->generator->generate('feed_user_aggregated', array( + 'token' => $this->getAggregateToken($user, $renew)->getValue(), + 'format' => 'rss', + ), UrlGenerator::ABSOLUTE_URL), + sprintf('%s - %s', $aggregate->getTitle(), 'RSS'), + 'application/rss+xml' + ); + break; + default: + throw new InvalidArgumentException(sprintf('Format %s is not recognized.', $format)); + } + } + + private function getAggregateToken(\User_Adapter $user, $renew = false) + { + $token = $this->em + ->getRepository('Entities\AggregateToken') + ->findByUser($user); + + if (null === $token || true === $renew) { + if (null === $token) { + $token = new AggregateToken(); + $token->setUsrId($user->get_id()); + } + + $token->setValue($this->random->generatePassword(12, \random::LETTERS_AND_NUMBERS)); + $this->em->persist($token); + $this->em->flush(); + } + + return $token; + } +} diff --git a/lib/Alchemy/Phrasea/Feed/AggregateToken.php b/lib/Alchemy/Phrasea/Feed/AggregateToken.php new file mode 100644 index 0000000000..6ef2a26227 --- /dev/null +++ b/lib/Alchemy/Phrasea/Feed/AggregateToken.php @@ -0,0 +1,111 @@ +id; + } + + /** + * Set usr_id + * + * @param integer $usrId + * @return FeedToken + */ + public function setUsrId($usrId) + { + $this->usr_id = $usrId; + + return $this; + } + + /** + * Get usr_id + * + * @return integer + */ + public function getUsrId() + { + return $this->usr_id; + } + + /** + * Set feed + * + * @param \Entities\Feed $feed + * @return FeedToken + */ + public function setFeed(\Entities\Feed $feed = null) + { + $this->feed = $feed; + + return $this; + } + + /** + * Get feed + * + * @return \Entities\Feed + */ + public function getFeed() + { + return $this->feed; + } + /** + * @var string + */ + private $value; + + + /** + * Set value + * + * @param string $value + * @return FeedToken + */ + public function setValue($value) + { + $this->value = $value; + + return $this; + } + + /** + * Get value + * + * @return string + */ + public function getValue() + { + return $this->value; + } +} \ No newline at end of file diff --git a/lib/Alchemy/Phrasea/Feed/FeedInterface.php b/lib/Alchemy/Phrasea/Feed/FeedInterface.php new file mode 100644 index 0000000000..504e9b6e37 --- /dev/null +++ b/lib/Alchemy/Phrasea/Feed/FeedInterface.php @@ -0,0 +1,21 @@ +mimetype = $mimetype; + $this->uri = $uri; + $this->title = $title; + } + + /** + * {@inheritdoc} + */ + public function getMimetype() + { + return $this->mimetype; + } + + /** + * {@inheritdoc} + */ + public function getTitle() + { + return $this->title; + } + + /** + * {@inheritdoc} + */ + public function getURI() + { + return $this->uri; + } +} diff --git a/lib/Alchemy/Phrasea/Feed/LinkGenerator.php b/lib/Alchemy/Phrasea/Feed/LinkGenerator.php new file mode 100644 index 0000000000..dbe105e0d6 --- /dev/null +++ b/lib/Alchemy/Phrasea/Feed/LinkGenerator.php @@ -0,0 +1,80 @@ +generator = $generator; + $this->em = $em; + $this->random = $random; + } + + public function generate(Feed $feed, \User_Adapter $user, $format, $page = null, $renew = false) + { + switch ($format) { + case self::FORMAT_ATOM: + return new FeedLink( + $this->generator->generate('feed_user', array( + 'token' => $this->getFeedToken($feed, $user, $renew)->getValue(), + 'id' => $feed->getId(), + 'format' => 'atom', + ), UrlGenerator::ABSOLUTE_URL), + sprintf('%s - %s', $feed->getTitle(), 'Atom'), + 'application/atom+xml' + ); + break; + case self::FORMAT_RSS: + return new FeedLink( + $this->generator->generate('feed_user', array( + 'token' => $this->getFeedToken($feed, $user, $renew)->getValue(), + 'id' => $feed->getId(), + 'format' => 'rss', + ), UrlGenerator::ABSOLUTE_URL), + sprintf('%s - %s', $feed->getTitle(), 'RSS'), + 'application/rss+xml' + ); + break; + default: + throw new InvalidArgumentException(sprintf('Format %s is not recognized.', $format)); + } + } + + private function getFeedToken(Feed $feed, \User_Adapter $user, $renew = false) + { + $token = $this->em + ->getRepository('Entities\FeedToken') + ->findByFeedAndUser($feed, $user); + + if (null === $token || true === $renew) { + if (null === $token) { + $token = new FeedToken(); + $token->setFeed($feed); + $token->setUsrId($user->get_id()); + $feed->addToken($token); + + $this->em->persist($feed); + } + + $token->setValue($this->random->generatePassword(12, \random::LETTERS_AND_NUMBERS)); + $this->em->persist($token); + $this->em->flush(); + } + + return $token; + } +} diff --git a/lib/Alchemy/Phrasea/Feed/LinkInterface.php b/lib/Alchemy/Phrasea/Feed/LinkInterface.php new file mode 100644 index 0000000000..4d45c2d4d8 --- /dev/null +++ b/lib/Alchemy/Phrasea/Feed/LinkInterface.php @@ -0,0 +1,30 @@ +publishers = new \Doctrine\Common\Collections\ArrayCollection(); $this->entries = new \Doctrine\Common\Collections\ArrayCollection(); } - + /** * Get id * - * @return integer + * @return integer */ public function getId() { @@ -88,14 +94,14 @@ class Feed public function setPublic($public) { $this->public = $public; - + return $this; } /** * Get public * - * @return boolean + * @return boolean */ public function getPublic() { @@ -111,21 +117,21 @@ class Feed public function setIconUrl($iconUrl) { $this->icon_url = $iconUrl; - + return $this; } /** * Get icon_url * - * @return string + * @return string */ public function getIconUrl() { if (!$this->icon_url) { return '/skins/icons/rss32.gif'; } - + return '/www/custom/feed_' . $this->getId() . '.jpg'; } @@ -138,14 +144,14 @@ class Feed public function setBaseId($baseId) { $this->base_id = $baseId; - + return $this; } /** * Get base_id * - * @return integer + * @return integer */ public function getBaseId() { @@ -161,14 +167,14 @@ class Feed public function setTitle($title) { $this->title = $title; - + return $this; } /** * Get title * - * @return string + * @return string */ public function getTitle() { @@ -184,7 +190,7 @@ class Feed public function addPublisher(\Entities\FeedPublisher $publishers) { $this->publishers[] = $publishers; - + return $this; } @@ -201,7 +207,7 @@ class Feed /** * Get publishers * - * @return \Doctrine\Common\Collections\Collection + * @return \Doctrine\Common\Collections\Collection */ public function getPublishers() { @@ -217,7 +223,7 @@ class Feed public function addEntry(\Entities\FeedEntry $entries) { $this->entries[] = $entries; - + return $this; } @@ -234,39 +240,39 @@ class Feed /** * Get entries * - * @return \Doctrine\Common\Collections\Collection + * @return \Doctrine\Common\Collections\Collection */ - public function getEntries() + public function getEntries($offset_start, $how_many) { - return $this->entries; + return $this->entries->slice($offset_start, $how_many); } - + public function getOwner() - { + { foreach ($this->getPublishers() as $publisher) { if ($publisher->getOwner()) { return $publisher; } } } - + public function isOwner(\User_Adapter $user) { $owner = $this->getOwner(); if ($owner !== null && $user->get_id() === $owner->getUsrId()) { return true; } - + return false; } - + public function getCollection(Application $app) { if ($this->getBaseId() !== null) { return \collection::get_from_base_id($app, $this->getBaseId()); } } - + public function setCollection(\collection $collection = null) { if ($collection === null) { @@ -285,14 +291,14 @@ class Feed public function setCreatedOn($createdOn) { $this->created_on = $createdOn; - + return $this; } /** * Get created_on * - * @return \DateTime + * @return \DateTime */ public function getCreatedOn() { @@ -308,20 +314,20 @@ class Feed public function setUpdatedOn($updatedOn) { $this->updated_on = $updatedOn; - + return $this; } /** * Get updated_on * - * @return \DateTime + * @return \DateTime */ public function getUpdatedOn() { return $this->updated_on; } - + public function isPublisher(\User_Adapter $user) { foreach ($this->getPublishers() as $publisher) { @@ -329,10 +335,21 @@ class Feed return true; } } - + return false; } + public function getPublisher(\User_Adapter $user) + { + foreach ($this->getPublishers() as $publisher) { + if ($publisher->getUsrId() == $user->get_id()) { + return $publisher; + } + } + + return null; + } + /** * Set subtitle * @@ -342,14 +359,14 @@ class Feed public function setSubtitle($subtitle) { $this->subtitle = $subtitle; - + return $this; } /** * Get subtitle * - * @return string + * @return string */ public function getSubtitle() { @@ -360,18 +377,51 @@ class Feed { return false; } - + public function getCountTotalEntries() { return (count($this->entries)); } - - public function hasAccess(User_Adapter $user) + + public function hasAccess(\User_Adapter $user, Application $app) { - if ($this->get_collection() instanceof collection) { + if ($this->getCollection($app) instanceof collection) { return $user->ACL()->has_access_to_base($this->collection->get_base_id()); } return true; } -} + + /** + * Add tokens + * + * @param \Entities\FeedToken $tokens + * @return Feed + */ + public function addToken(\Entities\FeedToken $tokens) + { + $this->tokens[] = $tokens; + + return $this; + } + + /** + * Remove tokens + * + * @param \Entities\FeedToken $tokens + */ + public function removeToken(\Entities\FeedToken $tokens) + { + $this->tokens->removeElement($tokens); + } + + /** + * Get tokens + * + * @return \Doctrine\Common\Collections\Collection + */ + public function getTokens() + { + return $this->tokens; + } +} \ No newline at end of file diff --git a/lib/Doctrine/Entities/FeedEntry.php b/lib/Doctrine/Entities/FeedEntry.php index f5f4e9288f..ae72ac8ecd 100644 --- a/lib/Doctrine/Entities/FeedEntry.php +++ b/lib/Doctrine/Entities/FeedEntry.php @@ -172,7 +172,7 @@ class FeedEntry /** * Set created * - * @param \DateTime $created + * @param \DateTime $createdOn * @return FeedEntry */ public function setCreatedOn($createdOn) @@ -189,7 +189,7 @@ class FeedEntry */ public function getCreatedOn() { - return $this->createdOn; + return $this->created_on; } /** @@ -212,7 +212,7 @@ class FeedEntry */ public function getUpdatedOn() { - return $this->updatedOn; + return $this->updated_on; } /** @@ -303,4 +303,4 @@ class FeedEntry return false; } -} +} \ No newline at end of file diff --git a/lib/Doctrine/Entities/FeedItem.php b/lib/Doctrine/Entities/FeedItem.php index 4d33318551..9c2682775f 100644 --- a/lib/Doctrine/Entities/FeedItem.php +++ b/lib/Doctrine/Entities/FeedItem.php @@ -39,10 +39,6 @@ class FeedItem */ private $entry; - public function __construct(\Entities\FeedEntry $entry, \record_adapter $record) - { - } - /** * Get id * diff --git a/templates/web/prod/actions/publish/publish.html.twig b/templates/web/prod/actions/publish/publish.html.twig index 3bd4fcebfb..f9df778eac 100644 --- a/templates/web/prod/actions/publish/publish.html.twig +++ b/templates/web/prod/actions/publish/publish.html.twig @@ -53,14 +53,14 @@

{% trans 'Fils disponibles' %}

- {% for feed in feeds.get_feeds() %} - {% if feed.is_publisher(app['authentication'].getUser()) %} + {% for feed in feeds %} + {% if feed.isPublisher(app['authentication'].getUser()) %}
- {{ feed.get_title() }} - {% if feed.is_public() %} + {{ feed.getTitle() }} + {% if feed.getPublic() %} {% endif %} - +
{% endif %} {% endfor %} diff --git a/templates/web/prod/feeds/entry.html.twig b/templates/web/prod/feeds/entry.html.twig index 7618484f4a..699d111ebd 100644 --- a/templates/web/prod/feeds/entry.html.twig +++ b/templates/web/prod/feeds/entry.html.twig @@ -1,2 +1,2 @@ {% import 'prod/feeds/entry_macro.html.twig' as _entry %} -{{ _entry.format(entry.get_feed(), entry) }} \ No newline at end of file +{{ _entry.format(entry.getFeed(), entry) }} \ No newline at end of file diff --git a/templates/web/prod/feeds/entry_macro.html.twig b/templates/web/prod/feeds/entry_macro.html.twig index 976d81275a..3954bde598 100644 --- a/templates/web/prod/feeds/entry_macro.html.twig +++ b/templates/web/prod/feeds/entry_macro.html.twig @@ -1,25 +1,25 @@ {% macro format(feed, entry)%} {% import 'prod/results/record.html.twig' as record_format %} -
+

- {% if feed.is_aggregated() %} - + {% if feed.isAggregated() %} + {% endif %} - {{ entry.get_title() }} - {% set author = entry.get_author_name() %} + {{ entry.getTitle() }} + {% set author = entry.getAuthorName() %} {% trans %}Par {{ author }}{% endtrans %}

- {% if entry.get_feed().is_owner(app['authentication'].getUser()) or entry.is_publisher(app['authentication'].getUser()) %} - + {% if entry.getFeed().isOwner(app['authentication'].getUser()) or entry.isPublisher(app['authentication'].getUser()) %} + - + {% endif %} @@ -27,8 +27,8 @@
- {% set updated_on = app['date-formatter'].getPrettyString(entry.get_updated_on()) %} - {% set created_on = app['date-formatter'].getPrettyString(entry.get_created_on()) %} + {% set updated_on = app['date-formatter'].getPrettyString(entry.getUpdatedOn()) %} + {% set created_on = app['date-formatter'].getPrettyString(entry.getCreatedOn()) %} {{ created_on }} @@ -41,23 +41,23 @@ ) {% endif %} - {% if feed.is_aggregated() %} - - {% set feed_name = entry.get_feed().get_title() %} + {% if feed.isAggregated() %} + + {% set feed_name = entry.getFeed().getTitle() %} {% trans %} dans {{feed_name}} {% endtrans %} - + {% endif %}
-

{{ entry.get_subtitle()|nl2br|raw }}

+

{{ entry.getSubtitle()|nl2br|raw }}

- {% for item in entry.get_content() %} - {% set record = item.get_record() %} - {% set prefix = 'PUBLI_' ~ item.get_id() %} - {{record_format.block(record, false, null, prefix, entry.get_id())}} + {% for item in entry.getItems() %} + {% set record = item.getRecord() %} + {% set prefix = 'PUBLI_' ~ item.getId() %} + {{record_format.block(record, false, null, prefix, entry.getId())}} {% endfor %}
-{% endmacro %} \ No newline at end of file +{% endmacro %} diff --git a/templates/web/prod/feeds/feeds.html.twig b/templates/web/prod/feeds/feeds.html.twig index 893e5d2669..182ff7b81a 100644 --- a/templates/web/prod/feeds/feeds.html.twig +++ b/templates/web/prod/feeds/feeds.html.twig @@ -6,23 +6,22 @@

- - {% if feed.is_aggregated %} + + {% if feed.isAggregated %} {% trans 'Toutes les publications' %} {% else %} - {{ feed.get_title() }} - + {{ feed.getTitle() }} + {% endif %} - - {% if feed.is_aggregated %} + {% if feed.isAggregated %} {% else %} - + {% endif %}

@@ -34,10 +33,10 @@
\ No newline at end of file +
diff --git a/templates/web/prod/index.html.twig b/templates/web/prod/index.html.twig index bea73022e5..e2cd7ac8ef 100644 --- a/templates/web/prod/index.html.twig +++ b/templates/web/prod/index.html.twig @@ -52,11 +52,11 @@ {% endblock %} {% block rss %} - {% for feed in feeds %} - {% set link = feed.get_user_link(app['phraseanet.registry'], app['authentication'].getUser(), 'rss') %} - - {% set link = feed.get_user_link(app['phraseanet.registry'], app['authentication'].getUser(), 'atom') %} - + {% for feed in aggregate.getFeeds() %} + {% set link = app['feed.user-link-generator'].generate(feed, app['authentication'].getUser(), 'rss') %} + + {% set link = app['feed.user-link-generator'].generate(feed, app['authentication'].getUser(), 'rss') %} + {% endfor %} {% endblock %} diff --git a/tests/Alchemy/Tests/Phrasea/Controller/Prod/FeedTest.php b/tests/Alchemy/Tests/Phrasea/Controller/Prod/FeedTest.php index 0b6b9ef15c..843df1659c 100644 --- a/tests/Alchemy/Tests/Phrasea/Controller/Prod/FeedTest.php +++ b/tests/Alchemy/Tests/Phrasea/Controller/Prod/FeedTest.php @@ -3,9 +3,12 @@ namespace Alchemy\Tests\Phrasea\Controller\Prod; use Alchemy\Phrasea\Application; +use Alchemy\Phrasea\Feed\Aggregate; +use Alchemy\Phrasea\Feed\AggregateLinkGenerator; +use Alchemy\Phrasea\Feed\LinkGenerator; use Symfony\Component\CssSelector\CssSelector; -class ControllerFeedApp extends \PhraseanetWebTestCaseAuthenticatedAbstract +class ControllerFeedTest extends \PhraseanetWebTestCaseAuthenticatedAbstract { /** * @@ -42,33 +45,28 @@ class ControllerFeedApp extends \PhraseanetWebTestCaseAuthenticatedAbstract { parent::setUp(); - self::$DI['app']['notification.deliverer'] = $this->getMockBuilder('Alchemy\Phrasea\Notification\Deliverer') - ->disableOriginalConstructor() - ->getMock(); - - self::$DI['app']['notification.deliverer']->expects($this->atLeastOnce()) - ->method('deliver') - ->with($this->isInstanceOf('Alchemy\Phrasea\Notification\Mail\MailInfoNewPublication'), $this->equalTo(null)); - - $this->feed = \Feed_Adapter::create( - self::$DI['app'], self::$DI['user'], $this->feed_title, $this->feed_subtitle - ); - - $this->publisher = \Feed_Publisher_Adapter::getPublisher( - self::$DI['app']['phraseanet.appbox'], $this->feed, self::$DI['user'] - ); - - $this->entry = \Feed_Entry_Adapter::create( - self::$DI['app'] - , $this->feed - , $this->publisher - , $this->entry_title - , $this->entry_subtitle - , $this->entry_authorname - , $this->entry_authormail - ); - - $this->item = \Feed_Entry_Item::create(self::$DI['app']['phraseanet.appbox'], $this->entry, self::$DI['record_1']); +// $this->publisher = new \Entities\FeedPublisher(self::$DI['user']); +// +// $this->feed = new \Entities\Feed($this->publisher, $this->feed_title, $this->feed_subtitle); +// +// $this->entry = new \Entities\FeedEntry( +// $this->feed +// , $this->publisher +// , $this->entry_title +// , $this->entry_subtitle +// , $this->entry_authorname +// , $this->entry_authormail +// ); +// +// $this->item = new \Entities\FeedItem($this->entry, self::$DI['record_1']); +// +// $this->publisher->setFeed($this->feed); +// +// self::$DI['app']["EM"]->persist($this->feed); +// self::$DI['app']["EM"]->persist($this->publisher); +// self::$DI['app']["EM"]->persist($this->entry); +// self::$DI['app']["EM"]->persist($this->item); +// self::$DI['app']["EM"]->flush(); } public static function setUpBeforeClass() @@ -84,34 +82,46 @@ class ControllerFeedApp extends \PhraseanetWebTestCaseAuthenticatedAbstract public function tearDown() { - if ($this->feed instanceof \Feed_Adapter) { - $this->feed->delete(); - } elseif ($this->entry instanceof \Feed_Entry_Adapter) { - $this->entry->delete(); - if ($this->publisher instanceof \Feed_Publisher_Adapter) { - $this->publisher->delete(); - } - } +// if ($this->feed instanceof \Entities\Feed) { +// self::$DI['app']["EM"]->remove($this->feed); +// } else if ($this->entry instanceof \Entities\FeedEntry) { +// self::$DI['app']["EM"]->remove($this->entry); +// if ($this->publisher instanceof \Entities\FeedPublisher) { +// self::$DI['app']["EM"]->remove($this->publisher); +// } +// } +// self::$DI['app']["EM"]->flush(); parent::tearDown(); } public function testRequestAvailable() { + $feed = $this->insertOneFeed(self::$DI['user']); + $crawler = self::$DI['client']->request('POST', '/prod/feeds/requestavailable/'); $this->assertTrue(self::$DI['client']->getResponse()->isOk()); - $feeds = \Feed_Collection::load_all(self::$DI['app'], self::$DI['user']); - foreach ($feeds->get_feeds() as $one_feed) { - if ($one_feed->is_publisher(self::$DI['user'])) { - $this->assertEquals(1, $crawler->filterXPath("//input[@value='" . $one_feed->get_id() . "']")->count()); + $feeds = self::$DI['app']["EM"]->getRepository("\Entities\Feed")->getAllForUser(self::$DI['user']); + foreach ($feeds as $one_feed) { + if ($one_feed->isPublisher(self::$DI['user'])) { + $this->assertEquals(1, $crawler->filterXPath("//input[@value='" . $one_feed->getId() . "']")->count()); } } } public function testEntryCreate() { + self::$DI['app']['notification.deliverer'] = $this->getMockBuilder('Alchemy\Phrasea\Notification\Deliverer') + ->disableOriginalConstructor() + ->getMock(); + + self::$DI['app']['notification.deliverer']->expects($this->atLeastOnce()) + ->method('deliver') + ->with($this->isInstanceOf('Alchemy\Phrasea\Notification\Mail\MailInfoNewPublication'), $this->equalTo(null)); + + $feed = $this->insertOneFeed(self::$DI['user']); $params = array( - "feed_id" => $this->feed->get_id() + "feed_id" => $feed->getId() , "title" => "salut" , "subtitle" => "coucou" , "author_name" => "robert" @@ -149,49 +159,36 @@ class ControllerFeedApp extends \PhraseanetWebTestCaseAuthenticatedAbstract public function testEntryEdit() { - - $crawler = self::$DI['client']->request('GET', '/prod/feeds/entry/' . $this->entry->get_id() . '/edit/'); + $entry = $this->insertOneFeedEntry(self::$DI['user']); + $crawler = self::$DI['client']->request('GET', '/prod/feeds/entry/' . $entry->getId() . '/edit/'); $pageContent = self::$DI['client']->getResponse()->getContent(); - foreach ($this->entry->get_content() as $content) { - $this->assertEquals(1, $crawler->filterXPath("//input[@value='" . $content->get_id() . "' and @name='item_id']")->count()); + foreach ($entry->getItems() as $content) { + $this->assertEquals(1, $crawler->filterXPath("//input[@value='" . $content->getId() . "' and @name='item_id']")->count()); } - $this->assertEquals(1, $crawler->filterXPath("//form[@action='/prod/feeds/entry/" . $this->entry->get_id() . "/update/']")->count()); - $this->assertEquals(1, $crawler->filterXPath("//input[@value='" . $this->entry_title . "']")->count()); - $this->assertEquals($this->entry_subtitle, $crawler->filterXPath("//textarea[@id='feed_add_subtitle']")->text()); - $this->assertEquals(1, $crawler->filterXPath("//input[@value='" . $this->entry_authorname . "']")->count()); - $this->assertEquals(1, $crawler->filterXPath("//input[@value='" . $this->entry_authormail . "']")->count()); + $this->assertEquals(1, $crawler->filterXPath("//form[@action='/prod/feeds/entry/" . $entry->getId() . "/update/']")->count()); + $this->assertEquals(1, $crawler->filterXPath("//input[@value='" . $entry->getTitle() . "']")->count()); + $this->assertEquals($entry->getSubtitle(), $crawler->filterXPath("//textarea[@id='feed_add_subtitle']")->text()); + $this->assertEquals(1, $crawler->filterXPath("//input[@value='" . $entry->getAuthorName() . "']")->count()); + $this->assertEquals(1, $crawler->filterXPath("//input[@value='" . $entry->getAuthorEmail() . "']")->count()); } public function testEntryEditUnauthorized() { - $feed = \Feed_Adapter::create( - self::$DI['app'], self::$DI['user_alt1'], $this->feed_title, $this->feed_subtitle - ); + $entry = $this->insertOneFeedEntry(self::$DI['user_alt1']); - $publisher = \Feed_Publisher_Adapter::getPublisher( - self::$DI['app']['phraseanet.appbox'], $feed, self::$DI['user_alt1'] - ); + try { + $crawler = self::$DI['client']->request('GET', '/prod/feeds/entry/' . $entry->getId() . '/edit/'); + $this->fail('Should raise an exception'); + } catch (\Exception_UnauthorizedAction $e) { - $entry = \Feed_Entry_Adapter::create( - self::$DI['app'] - , $feed - , $publisher - , $this->entry_title - , $this->entry_subtitle - , $this->entry_authorname - , $this->entry_authormail - ); - - self::$DI['client']->request('GET', '/prod/feeds/entry/' . $entry->get_id() . '/edit/'); - $this->assertEquals(403, self::$DI['client']->getResponse()->getStatusCode()); - - $feed->delete(); + } } public function testEntryUpdate() { + $entry = $this->insertOneFeedEntry(self::$DI['user']); $params = array( "title" => "dog", @@ -201,7 +198,7 @@ class ControllerFeedApp extends \PhraseanetWebTestCaseAuthenticatedAbstract 'lst' => self::$DI['record_1']->get_serialize_key(), ); - $crawler = self::$DI['client']->request('POST', '/prod/feeds/entry/' . $this->entry->get_id() . '/update/', $params); + $crawler = self::$DI['client']->request('POST', '/prod/feeds/entry/' . $entry->getId() . '/update/', $params); $this->assertTrue(self::$DI['client']->getResponse()->isOk()); $this->assertEquals("application/json", self::$DI['client']->getResponse()->headers->get("content-type")); $pageContent = json_decode(self::$DI['client']->getResponse()->getContent()); @@ -209,25 +206,23 @@ class ControllerFeedApp extends \PhraseanetWebTestCaseAuthenticatedAbstract $this->assertFalse($pageContent->error); $this->assertTrue(is_string($pageContent->message)); $this->assertTrue(is_string($pageContent->datas)); - $this->assertRegExp("/entry_" . $this->entry->get_id() . "/", $pageContent->datas); + $this->assertRegExp("/entry_" . $entry->getId() . "/", $pageContent->datas); } public function testEntryUpdateChangeFeed() { - $newfeed = \Feed_Adapter::create( - self::$DI['app'], self::$DI['user'], $this->feed_title, $this->feed_subtitle - ); + $entry = $this->insertOneFeedEntry(self::$DI['user']); + $newfeed = $this->insertOneFeed(self::$DI['user'], "test2"); $params = array( - "feed_id" => $newfeed->get_id(), + "feed_id" => $newfeed->getId(), "title" => "dog", "subtitle" => "cat", "author_name" => "bird", "author_email" => "mouse", 'lst' => self::$DI['record_1']->get_serialize_key(), ); - - $crawler = self::$DI['client']->request('POST', '/prod/feeds/entry/' . $this->entry->get_id() . '/update/', $params); + $crawler = self::$DI['client']->request('POST', '/prod/feeds/entry/' . $entry->getId() . '/update/', $params); $this->assertTrue(self::$DI['client']->getResponse()->isOk()); $this->assertEquals("application/json", self::$DI['client']->getResponse()->headers->get("content-type")); $pageContent = json_decode(self::$DI['client']->getResponse()->getContent()); @@ -235,23 +230,22 @@ class ControllerFeedApp extends \PhraseanetWebTestCaseAuthenticatedAbstract $this->assertFalse($pageContent->error); $this->assertTrue(is_string($pageContent->message)); $this->assertTrue(is_string($pageContent->datas)); - $this->assertRegExp("/entry_" . $this->entry->get_id() . "/", $pageContent->datas); + $this->assertRegExp("/entry_" . $entry->getId() . "/", $pageContent->datas); - $retrievedentry = \Feed_Entry_Adapter::load_from_id(self::$DI['app'], $this->entry->get_id()); - $this->assertEquals($newfeed->get_id(), $retrievedentry->get_feed()->get_id()); - - $newfeed->delete(); + $retrievedentry = self::$DI['app']["EM"]->getRepository("\Entities\FeedEntry")->find($entry->getId()); + $this->assertEquals($newfeed->getId(), $retrievedentry->getFeed()->getId()); } public function testEntryUpdateChangeFeedNoAccess() { - $newfeed = \Feed_Adapter::create( - self::$DI['app'], self::$DI['user'], $this->feed_title, $this->feed_subtitle - ); - $newfeed->set_collection(self::$DI['collection_no_access']); + $entry = $this->insertOneFeedEntry(self::$DI['user']); + $newfeed = $this->insertOneFeed(self::$DI['user'], "test2"); + $newfeed->setCollection(self::$DI['collection_no_access']); + self::$DI['app']["EM"]->persist($newfeed); + self::$DI['app']["EM"]->flush(); $params = array( - "feed_id" => $newfeed->get_id(), + "feed_id" => $newfeed->getId(), "title" => "dog", "subtitle" => "cat", "author_name" => "bird", @@ -259,19 +253,19 @@ class ControllerFeedApp extends \PhraseanetWebTestCaseAuthenticatedAbstract 'lst' => self::$DI['record_1']->get_serialize_key(), ); - $crawler = self::$DI['client']->request('POST', '/prod/feeds/entry/' . $this->entry->get_id() . '/update/', $params); + $crawler = self::$DI['client']->request('POST', '/prod/feeds/entry/' . $entry->getId() . '/update/', $params); $this->assertTrue(self::$DI['client']->getResponse()->isOk()); $this->assertEquals("application/json", self::$DI['client']->getResponse()->headers->get("content-type")); $pageContent = json_decode(self::$DI['client']->getResponse()->getContent()); $this->assertTrue(is_object($pageContent)); $this->assertTrue($pageContent->error); $this->assertTrue(is_string($pageContent->message)); - - $newfeed->delete(); } public function testEntryUpdateChangeFeedInvalidFeed() { + $entry = $this->insertOneFeedEntry(self::$DI['user']); + $params = array( "feed_id" => 0, "title" => "dog", @@ -281,7 +275,7 @@ class ControllerFeedApp extends \PhraseanetWebTestCaseAuthenticatedAbstract 'lst' => self::$DI['record_1']->get_serialize_key(), ); - $crawler = self::$DI['client']->request('POST', '/prod/feeds/entry/' . $this->entry->get_id() . '/update/', $params); + $crawler = self::$DI['client']->request('POST', '/prod/feeds/entry/' . $entry->getId() . '/update/', $params); $this->assertTrue(self::$DI['client']->getResponse()->isOk()); $this->assertEquals("application/json", self::$DI['client']->getResponse()->headers->get("content-type")); $pageContent = json_decode(self::$DI['client']->getResponse()->getContent()); @@ -317,6 +311,7 @@ class ControllerFeedApp extends \PhraseanetWebTestCaseAuthenticatedAbstract public function testEntryUpdateFailed() { + $entry = $this->insertOneFeedEntry(self::$DI['user']); $params = array( "feed_id" => 9999999 @@ -327,7 +322,7 @@ class ControllerFeedApp extends \PhraseanetWebTestCaseAuthenticatedAbstract , 'sorted_lst' => self::$DI['record_1']->get_serialize_key() . ";" . self::$DI['record_2']->get_serialize_key() . ";12345;" . "unknow_unknow" ); - $crawler = self::$DI['client']->request('POST', '/prod/feeds/entry/' . $this->entry->get_id() . '/update/', $params); + $crawler = self::$DI['client']->request('POST', '/prod/feeds/entry/' . $entry->getId() . '/update/', $params); $response = self::$DI['client']->getResponse(); @@ -345,13 +340,11 @@ class ControllerFeedApp extends \PhraseanetWebTestCaseAuthenticatedAbstract /** * I CREATE A FEED THAT IS NOT MINE * */ - $feed = \Feed_Adapter::create(self::$DI['app'], self::$DI['user_alt1'], "salut", 'coucou'); - $publisher = \Feed_Publisher_Adapter::getPublisher(self::$DI['app']['phraseanet.appbox'], $feed, self::$DI['user_alt1']); - $entry = \Feed_Entry_Adapter::create(self::$DI['app'], $feed, $publisher, "hello", "coucou", "salut", "bonjour@phraseanet.com"); - $item = \Feed_Entry_Item::create(self::$DI['app']['phraseanet.appbox'], $entry, self::$DI['record_1']); + + $entry = $this->insertOneFeedEntry(self::$DI['user_alt1']); $params = array( - "feed_id" => $feed->get_id() + "feed_id" => $entry->getFeed()->getId() , "title" => "dog" , "subtitle" => "cat" , "author_name" => "bird" @@ -359,7 +352,7 @@ class ControllerFeedApp extends \PhraseanetWebTestCaseAuthenticatedAbstract , 'lst' => self::$DI['record_1']->get_serialize_key() ); - $crawler = self::$DI['client']->request('POST', '/prod/feeds/entry/' . $entry->get_id() . '/update/', $params); + $crawler = self::$DI['client']->request('POST', '/prod/feeds/entry/' . $entry->getId() . '/update/', $params); $response = self::$DI['client']->getResponse(); @@ -370,14 +363,13 @@ class ControllerFeedApp extends \PhraseanetWebTestCaseAuthenticatedAbstract $this->assertTrue(is_object($pageContent)); $this->assertTrue($pageContent->error); $this->assertTrue(is_string($pageContent->message)); - - $feed->delete(); } public function testDelete() { + $entry = $this->insertOneFeedEntry(self::$DI['user']); - $crawler = self::$DI['client']->request('POST', '/prod/feeds/entry/' . $this->entry->get_id() . '/delete/'); + $crawler = self::$DI['client']->request('POST', '/prod/feeds/entry/' . $entry->getId() . '/delete/'); $this->assertTrue(self::$DI['client']->getResponse()->isOk()); $this->assertEquals("application/json", self::$DI['client']->getResponse()->headers->get("content-type")); @@ -389,7 +381,7 @@ class ControllerFeedApp extends \PhraseanetWebTestCaseAuthenticatedAbstract $this->assertTrue(is_string($pageContent->message)); try { - \Feed_Entry_Adapter::load_from_id(self::$DI['app'], $this->entry->get_id()); + self::$DI["app"]["EM"]->getRepository("\Entities\FeedEntry")->find($entry->getId()); $this->fail("Failed to delete entry"); } catch (\Exception $e) { @@ -417,13 +409,9 @@ class ControllerFeedApp extends \PhraseanetWebTestCaseAuthenticatedAbstract /** * I CREATE A FEED * */ - $feed = \Feed_Adapter::create(self::$DI['app'], self::$DI['user_alt1'], "salut", 'coucou'); + $entry = $this->insertOneFeedEntry(self::$DI['user_alt1']); - $publisher = \Feed_Publisher_Adapter::getPublisher(self::$DI['app']['phraseanet.appbox'], $feed, self::$DI['user_alt1']); - $entry = \Feed_Entry_Adapter::create(self::$DI['app'], $feed, $publisher, "hello", "coucou", "salut", "bonjour@phraseanet.com"); - $item = \Feed_Entry_Item::create(self::$DI['app']['phraseanet.appbox'], $entry, self::$DI['record_1']); - - $crawler = self::$DI['client']->request('POST', '/prod/feeds/entry/' . $entry->get_id() . '/delete/'); + $crawler = self::$DI['client']->request('POST', '/prod/feeds/entry/' . $entry->getId() . '/delete/'); $response = self::$DI['client']->getResponse(); @@ -434,8 +422,6 @@ class ControllerFeedApp extends \PhraseanetWebTestCaseAuthenticatedAbstract $this->assertTrue(is_object($pageContent)); $this->assertTrue($pageContent->error); $this->assertTrue(is_string($pageContent->message)); - - $feed->delete(); } public function testRoot() @@ -447,12 +433,12 @@ class ControllerFeedApp extends \PhraseanetWebTestCaseAuthenticatedAbstract $this->assertTrue(self::$DI['client']->getResponse()->isOk()); - $feeds = \Feed_Collection::load_all(self::$DI['app'], self::$DI['user']); + $feeds = self::$DI['app']["EM"]->getRepository("\Entities\Feed")->getAllForUser(self::$DI['user']); - foreach ($feeds->get_feeds() as $one_feed) { + foreach ($feeds as $one_feed) { - $path = CssSelector::toXPath("ul.submenu a[href='/prod/feeds/feed/" . $one_feed->get_id() . "/']"); - $msg = sprintf("user %s has access to feed %s", self::$DI['user']->get_id(), $one_feed->get_id()); + $path = CssSelector::toXPath("ul.submenu a[href='/prod/feeds/feed/" . $one_feed->getId() . "/']"); + $msg = sprintf("user %s has access to feed %s", self::$DI['user']->getId(), $one_feed->getId()); if ($one_feed->has_access(self::$DI['user'])) { $this->assertEquals(1, $crawler->filterXPath($path)->count(), $msg); @@ -465,16 +451,18 @@ class ControllerFeedApp extends \PhraseanetWebTestCaseAuthenticatedAbstract public function testGetFeed() { - $feeds = \Feed_Collection::load_all(self::$DI['app'], self::$DI['user']); + $feed = $this->insertOneFeed(self::$DI['user']); - $crawler = self::$DI['client']->request('GET', '/prod/feeds/feed/' . $this->feed->get_id() . "/"); + $feeds = self::$DI['app']["EM"]->getRepository("\Entities\Feed")->getAllForUser(self::$DI['user']); + + $crawler = self::$DI['client']->request('GET', '/prod/feeds/feed/' . $feed->getId() . "/"); $pageContent = self::$DI['client']->getResponse()->getContent(); - foreach ($feeds->get_feeds() as $one_feed) { - $path = CssSelector::toXPath("ul.submenu a[href='/prod/feeds/feed/" . $one_feed->get_id() . "/']"); - $msg = sprintf("user %s has access to feed %s", self::$DI['user']->get_id(), $one_feed->get_id()); + foreach ($feeds as $one_feed) { + $path = CssSelector::toXPath("ul.submenu a[href='/prod/feeds/feed/" . $one_feed->getId() . "/']"); + $msg = sprintf("user %s has access to feed %s", self::$DI['user']->get_id(), $one_feed->getId()); - if ($one_feed->has_access(self::$DI['user'])) { + if ($one_feed->hasAccess(self::$DI['user'], self::$DI['app'])) { $this->assertEquals(1, $crawler->filterXPath($path)->count(), $msg); } else { $this->fail('Feed_collection::load_all should return feed where I got access'); @@ -484,26 +472,48 @@ class ControllerFeedApp extends \PhraseanetWebTestCaseAuthenticatedAbstract public function testSuscribeAggregate() { - $feeds = \Feed_Collection::load_all(self::$DI['app'], self::$DI['user']); + $feed = $this->insertOneFeed(self::$DI['user']); + + $generator = $this->getMockBuilder('Symfony\Component\Routing\Generator\UrlGenerator') + ->disableOriginalConstructor() + ->getMock(); + + $random = self::$DI['app']['tokens']; + + $aggregateGenerator = new AggregateLinkGenerator($generator, self::$DI['app']['EM'], $random); + + $feeds = self::$DI['app']["EM"]->getRepository("\Entities\Feed")->getAllForUser(self::$DI['user']); $crawler = self::$DI['client']->request('GET', '/prod/feeds/subscribe/aggregated/'); $this->assertTrue(self::$DI['client']->getResponse()->isOk()); $this->assertEquals("application/json", self::$DI['client']->getResponse()->headers->get("content-type")); $pageContent = json_decode(self::$DI['client']->getResponse()->getContent()); $this->assertTrue(is_object($pageContent)); $this->assertTrue(is_string($pageContent->texte)); - $suscribe_link = $feeds->get_aggregate()->get_user_link(self::$DI['app']['phraseanet.registry'], self::$DI['user'], \Feed_Adapter::FORMAT_RSS, null, false)->get_href(); - $this->assertContains($suscribe_link, $pageContent->texte); + $aggregate = new Aggregate(self::$DI['app'], $feeds); + $suscribe_link = $aggregateGenerator->generate($aggregate, self::$DI['user'], AggregateLinkGenerator::FORMAT_RSS); + $this->assertContains($suscribe_link->getURI(), $pageContent->texte); } public function testSuscribe() { - $crawler = self::$DI['client']->request('GET', '/prod/feeds/subscribe/' . $this->feed->get_id() . '/'); + $feed = $this->insertOneFeed(self::$DI['user']); + + $generator = $this->getMockBuilder('Symfony\Component\Routing\Generator\UrlGenerator') + ->disableOriginalConstructor() + ->getMock(); + + $random = self::$DI['app']['tokens']; + + $linkGenerator = new LinkGenerator($generator, self::$DI['app']['EM'], $random); + + $crawler = self::$DI['client']->request('GET', '/prod/feeds/subscribe/' . $feed->getId() . '/'); $this->assertTrue(self::$DI['client']->getResponse()->isOk()); $this->assertEquals("application/json", self::$DI['client']->getResponse()->headers->get("content-type")); $pageContent = json_decode(self::$DI['client']->getResponse()->getContent()); $this->assertTrue(is_object($pageContent)); $this->assertTrue(is_string($pageContent->texte)); - $suscribe_link = $this->feed->get_user_link(self::$DI['app']['phraseanet.registry'], self::$DI['user'], \Feed_Adapter::FORMAT_RSS, null, false)->get_href(); - $this->assertContains($suscribe_link, $pageContent->texte); + $suscribe_link = $linkGenerator->generate($feed, self::$DI['user'], LinkGenerator::FORMAT_RSS); + var_dump($suscribe_link); + $this->assertContains($suscribe_link->getURI(), $pageContent->texte); } } diff --git a/tests/Alchemy/Tests/Phrasea/Core/Provider/FeedServiceProviderTest.php b/tests/Alchemy/Tests/Phrasea/Core/Provider/FeedServiceProviderTest.php new file mode 100644 index 0000000000..0f160ae1c4 --- /dev/null +++ b/tests/Alchemy/Tests/Phrasea/Core/Provider/FeedServiceProviderTest.php @@ -0,0 +1,25 @@ +setTitle("title"); + + $another_feed = new Feed($user); + $another_feed->setTitle("another_title"); + + $feeds = array($feed, $another_feed); + + $aggregate = new Aggregate(self::$DI['app'], $feeds); + + $generator = $this->getMockBuilder('Symfony\Component\Routing\Generator\UrlGenerator') + ->disableOriginalConstructor() + ->getMock(); + + if ($alreadyCreated) { + $token = $this->insertOneAggregateToken($user); + $tokenValue = $token->getValue(); + } + + $capture = null; + $generator->expects($this->once()) + ->method('generate') + ->with('feed_user_aggregated', $this->isType('array'), UrlGenerator::ABSOLUTE_URL) + ->will($this->returnCallback(function ($name, $data, $option) use (&$capture, $expected) { + $capture = $data; + + return $expected; + })); + + $random = self::$DI['app']['tokens']; + + $linkGenerator = new AggregateLinkGenerator($generator, self::$DI['app']['EM'], $random); + + $link = $linkGenerator->generate($aggregate, $user, $format, $page, $renew); + + $this->assertSame($expected, $link->getUri()); + if ($format == "atom") { + $this->assertSame("application/atom+xml", $link->getMimetype()); + $this->assertSame("AGGREGATE - Atom", $link->getTitle()); + } + elseif ($format == "rss") { + $this->assertSame("application/rss+xml", $link->getMimetype()); + $this->assertSame("AGGREGATE - RSS", $link->getTitle()); + } + + if ($alreadyCreated) { + if ($renew) { + $this->assertCount(2, $capture); + $this->assertEquals($format, $capture['format']); + $this->assertNotEquals($tokenValue, $capture['token']); + + $this->assertCount(0, self::$DI['app']['EM'] + ->getRepository("Entities\AggregateToken") + ->findBy(array('value' => $tokenValue))); + $this->assertCount(1, self::$DI['app']['EM'] + ->getRepository("Entities\AggregateToken") + ->findBy(array('value' => $capture['token']))); + } else { + $this->assertEquals(array( + 'token' => $tokenValue, + 'format' => $format, + ), $capture); + + $this->assertCount(1, self::$DI['app']['EM'] + ->getRepository("Entities\AggregateToken") + ->findBy(array('value' => $tokenValue))); + } + } else { + $this->assertCount(2, $capture); + $this->assertEquals($format, $capture['format']); + $this->assertEquals(12, strlen($capture['token'])); + + $this->assertCount(1, self::$DI['app']['EM'] + ->getRepository("Entities\AggregateToken") + ->findBy(array('value' => $capture['token']))); + } + $token = self::$DI['app']['EM'] + ->getRepository('Entities\AggregateToken') + ->findByUser($user); + self::$DI['app']['EM']->remove($token); + self::$DI['app']['EM']->flush(); + } + + public function provideGenerationData() + { + $user = $this->getMockBuilder('User_Adapter') + ->disableOriginalConstructor() + ->getMock(); + + $user->expects($this->any()) + ->method('get_id') + ->will($this->returnValue(42)); + + return array( + array('doliprane', 'atom', $user, null, false, false), + array('doliprane', 'atom', $user, null, false, true), + array('doliprane', 'atom', $user, null, true, false), + array('doliprane', 'atom', $user, null, true, true), + array('doliprane', 'atom', $user, 1, false, false), + array('doliprane', 'atom', $user, 1, false, true), + array('doliprane', 'atom', $user, 1, true, false), + array('doliprane', 'atom', $user, 1, true, true), + array('doliprane', 'rss', $user, null, false, false), + array('doliprane', 'rss', $user, null, false, true), + array('doliprane', 'rss', $user, null, true, false), + array('doliprane', 'rss', $user, null, true, true), + array('doliprane', 'rss', $user, 1, false, false), + array('doliprane', 'rss', $user, 1, false, true), + array('doliprane', 'rss', $user, 1, true, false), + array('doliprane', 'rss', $user, 1, true, true), + ); + } +} diff --git a/tests/Alchemy/Tests/Phrasea/Feed/LinkGeneratorTest.php b/tests/Alchemy/Tests/Phrasea/Feed/LinkGeneratorTest.php new file mode 100644 index 0000000000..7121e4c3dc --- /dev/null +++ b/tests/Alchemy/Tests/Phrasea/Feed/LinkGeneratorTest.php @@ -0,0 +1,126 @@ +persist($feed); + self::$DI['app']['EM']->flush(); + + $generator = $this->getMockBuilder('Symfony\Component\Routing\Generator\UrlGenerator') + ->disableOriginalConstructor() + ->getMock(); + + if ($alreadyCreated) { + $token = $this->insertOneFeedToken($feed, $user); + $tokenValue = $token->getValue(); + } + + $capture = null; + $generator->expects($this->once()) + ->method('generate') + ->with('feed_user', $this->isType('array'), UrlGenerator::ABSOLUTE_URL) + ->will($this->returnCallback(function ($name, $data, $option) use (&$capture, $expected) { + $capture = $data; + + return $expected; + })); + + $random = self::$DI['app']['tokens']; + + $linkGenerator = new LinkGenerator($generator, self::$DI['app']['EM'], $random); + + $link = $linkGenerator->generate($feed, $user, $format, $page, $renew); + + $this->assertSame($expected, $link->getUri()); + if ($format == "atom") { + $this->assertSame("application/atom+xml", $link->getMimetype()); + $this->assertSame("Title - Atom", $link->getTitle()); + } + elseif ($format == "rss") { + $this->assertSame("application/rss+xml", $link->getMimetype()); + $this->assertSame("Title - RSS", $link->getTitle()); + } + + if ($alreadyCreated) { + if ($renew) { + $this->assertCount(3, $capture); + $this->assertEquals($feed->getId(), $capture['id']); + $this->assertEquals($format, $capture['format']); + $this->assertNotEquals($tokenValue, $capture['token']); + + $this->assertCount(0, self::$DI['app']['EM'] + ->getRepository("Entities\FeedToken") + ->findBy(array('value' => $tokenValue))); + $this->assertCount(1, self::$DI['app']['EM'] + ->getRepository("Entities\FeedToken") + ->findBy(array('value' => $capture['token']))); + } else { + $this->assertEquals(array( + 'token' => $tokenValue, + 'id' => $feed->getId(), + 'format' => $format, + ), $capture); + + $this->assertCount(1, self::$DI['app']['EM'] + ->getRepository("Entities\FeedToken") + ->findBy(array('value' => $tokenValue))); + } + } else { + $this->assertCount(3, $capture); + $this->assertEquals($feed->getId(), $capture['id']); + $this->assertEquals($format, $capture['format']); + $this->assertEquals(12, strlen($capture['token'])); + + $this->assertCount(1, self::$DI['app']['EM'] + ->getRepository("Entities\FeedToken") + ->findBy(array('value' => $capture['token']))); + } + $token = self::$DI['app']['EM'] + ->getRepository('Entities\FeedToken') + ->findByFeedAndUser($feed, $user); + self::$DI['app']['EM']->remove($token); + self::$DI['app']['EM']->flush(); + } + + public function provideGenerationData() + { + $user = $this->getMockBuilder('User_Adapter') + ->disableOriginalConstructor() + ->getMock(); + + $user->expects($this->any()) + ->method('get_id') + ->will($this->returnValue(42)); + + $feed = new \Entities\Feed(); + $feed->setTitle('Title'); + + return array( + array('doliprane', 'atom', $feed, $user, null, false, false), + array('doliprane', 'atom', $feed, $user, null, false, true), + array('doliprane', 'atom', $feed, $user, null, true, false), + array('doliprane', 'atom', $feed, $user, null, true, true), + array('doliprane', 'atom', $feed, $user, 1, false, false), + array('doliprane', 'atom', $feed, $user, 1, false, true), + array('doliprane', 'atom', $feed, $user, 1, true, false), + array('doliprane', 'atom', $feed, $user, 1, true, true), + array('doliprane', 'rss', $feed, $user, null, false, false), + array('doliprane', 'rss', $feed, $user, null, false, true), + array('doliprane', 'rss', $feed, $user, null, true, false), + array('doliprane', 'rss', $feed, $user, null, true, true), + array('doliprane', 'rss', $feed, $user, 1, false, false), + array('doliprane', 'rss', $feed, $user, 1, false, true), + array('doliprane', 'rss', $feed, $user, 1, true, false), + array('doliprane', 'rss', $feed, $user, 1, true, true), + ); + } +} diff --git a/tests/classes/PhraseanetPHPUnitAbstract.php b/tests/classes/PhraseanetPHPUnitAbstract.php index ac3ab4e698..6aa28dc264 100644 --- a/tests/classes/PhraseanetPHPUnitAbstract.php +++ b/tests/classes/PhraseanetPHPUnitAbstract.php @@ -4,6 +4,9 @@ use Alchemy\Phrasea\CLI; use Alchemy\Phrasea\Application; use Alchemy\Phrasea\Border\File; use Doctrine\Common\DataFixtures\Loader; +use Entities\AggregateToken; +use Entities\Feed; +use Entities\FeedToken; use Entities\User; use Silex\WebTestCase; use Symfony\Component\HttpFoundation\Response; @@ -323,6 +326,129 @@ abstract class PhraseanetPHPUnitAbstract extends WebTestCase } } + /** + * Insert one feed + * + * @return \Entities\Feed + */ + protected function insertOneFeed(\User_Adapter $user, $title = null) + { + try { + $feedFixture = new PhraseaFixture\Feed\LoadOneFeed(); + $feedFixture->setUser($user); + + if ($title !== null) { + $feedFixture->setTitle($title); + } + + $loader = new Loader(); + $loader->addFixture($feedFixture); + + $this->insertFixtureInDatabase($loader); + + return $feedFixture->feed; + } catch (\Exception $e) { + $this->fail('Fail to load one Feed : ' . $e->getMessage()); + } + } + + /** + * + * @return \Entities\FeedEntry + */ + protected function insertOneFeedEntry(\User_Adapter $user) + { + try { + $feed = $this->insertOneFeed($user); + + $em = self::$DI['app']['EM']; + + $entry = new \Entities\FeedEntry(); + $entry->setFeed($feed); + $entry->setTitle("test"); + $entry->setSubtitle("description"); + $entry->setAuthorName('user'); + $entry->setAuthorEmail('user@email.com'); + + $publisher = $feed->getPublisher($user); + + if ($publisher !== null) { + $entry->setPublisher($publisher); + } + + $feed->addEntry($entry); + + $em->persist($entry); + $em->persist($feed); + + $em->flush(); + + return $entry; + } catch (\Exception $e) { + $this->fail('Fail to load one FeedEntry : ' . $e->getMessage()); + } + } + + protected function insertOneFeedToken(Feed $feed, \User_Adapter $user) + { + try { + $token = new FeedToken(); + $token->setValue(self::$DI['app']['tokens']->generatePassword(12)); + $token->setFeed($feed); + $token->setUsrId($user->get_id()); + + self::$DI['app']['EM']->persist($token); + self::$DI['app']['EM']->flush(); + } catch (\Exception $e) { + $this->fail('Fail to load one FeedToken : ' . $e->getMessage()); + } + + return $token; + } + + protected function insertOneAggregateToken(\User_Adapter $user) + { + try { + $token = new AggregateToken(); + $token->setValue(self::$DI['app']['tokens']->generatePassword(12)); + $token->setUsrId($user->get_id()); + + self::$DI['app']['EM']->persist($token); + self::$DI['app']['EM']->flush(); + } catch (\Exception $e) { + $this->fail('Fail to load one AggregateToken : ' . $e->getMessage()); + } + + return $token; + } + + /** + * + * @return \Entities\FeedEntry + */ + protected function insertOneFeedItem(\User_Adapter $user) + { + try { + $entry = $this->insertOneFeedEntry($user); + + $item = new \Entities\FeedItem(); + $item->setEntry($entry); + + $entry->addItem($item); + + $em = self::$DI['app']['EM']; + + $em->persist($entry); + $em->persist($item); + + $em->flush(); + + return $entry; + } catch (\Exception $e) { + $this->fail('Fail to load one FeedEntry : ' . $e->getMessage()); + } + } + /** * Insert one basket entry ans set current authenticated user as owner * From 1d7c60ac418abf0967cf104cb870a9ee431e777e Mon Sep 17 00:00:00 2001 From: Andrey Date: Thu, 30 May 2013 19:06:14 +0200 Subject: [PATCH 06/67] Add token entities dcm files --- .../Doctrine/Entities.AggregateToken.dcm.yml | 20 ++++++++++++++++ .../Doctrine/Entities.FeedToken.dcm.yml | 24 +++++++++++++++++++ 2 files changed, 44 insertions(+) create mode 100644 lib/conf.d/Doctrine/Entities.AggregateToken.dcm.yml create mode 100644 lib/conf.d/Doctrine/Entities.FeedToken.dcm.yml diff --git a/lib/conf.d/Doctrine/Entities.AggregateToken.dcm.yml b/lib/conf.d/Doctrine/Entities.AggregateToken.dcm.yml new file mode 100644 index 0000000000..43eb71ae75 --- /dev/null +++ b/lib/conf.d/Doctrine/Entities.AggregateToken.dcm.yml @@ -0,0 +1,20 @@ +Entities\AggregateToken: + type: entity + repositoryClass: Repositories\AggregateTokenRepository + table: AggregateTokens + uniqueConstraints: + unique_aggregate_token_index: + columns: usr_id + id: + id: + type: integer + generator: + strategy: AUTO + fields: + usr_id: + type: integer + value: + type: string + length: 12 + nullable: true + \ No newline at end of file diff --git a/lib/conf.d/Doctrine/Entities.FeedToken.dcm.yml b/lib/conf.d/Doctrine/Entities.FeedToken.dcm.yml new file mode 100644 index 0000000000..c4efc5b43e --- /dev/null +++ b/lib/conf.d/Doctrine/Entities.FeedToken.dcm.yml @@ -0,0 +1,24 @@ +Entities\FeedToken: + type: entity + repositoryClass: Repositories\FeedTokenRepository + table: FeedTokens + id: + id: + type: integer + generator: + strategy: AUTO + fields: + usr_id: + type: integer + value: + type: string + length: 12 + nullable: true + manyToOne: + feed: + targetEntity: Feed + inversedBy: tokens + joinColumn: + name: feed_id + referencedColumnName: id + cascade: ["persist"] From affdfe7a0a59540ed3156b651d28036bd9411b26 Mon Sep 17 00:00:00 2001 From: Andrey Date: Tue, 4 Jun 2013 19:12:59 +0200 Subject: [PATCH 07/67] Implement RSSFeeds, fixed controllers implementation, fixed tests --- .../Phrasea/Controller/Admin/Publications.php | 9 +- .../Phrasea/Controller/Client/Root.php | 3 +- lib/Alchemy/Phrasea/Controller/Lightbox.php | 15 ++- lib/Alchemy/Phrasea/Controller/Prod/Feed.php | 16 +-- lib/Alchemy/Phrasea/Controller/Prod/Root.php | 8 +- lib/Alchemy/Phrasea/Controller/Root/Login.php | 5 +- .../Phrasea/Controller/Root/RSSFeeds.php | 14 +- .../Core/Provider/FeedServiceProvider.php | 2 +- .../Phrasea/Feed/AggregateLinkGenerator.php | 50 +++++-- lib/Alchemy/Phrasea/Feed/LinkGenerator.php | 56 ++++++-- lib/Doctrine/Entities/Feed.php | 23 ++++ lib/Doctrine/Entities/FeedEntry.php | 55 ++++---- lib/Doctrine/Entities/FeedItem.php | 37 +++--- lib/classes/eventsmanager/notify/feed.php | 28 ++-- templates/web/lightbox/feed.html.twig | 14 +- .../web/lightbox/feed_container.html.twig | 12 +- .../web/lightbox/feed_options_box.html.twig | 2 +- templates/web/login/index.html.twig | 6 +- .../actions/publish/publish_edit.html.twig | 30 ++--- templates/web/prod/index.html.twig | 2 +- .../Phrasea/Controller/Prod/FeedTest.php | 122 +++++++----------- .../Feed/AggregateLinkGeneratorTest.php | 29 ++++- .../Tests/Phrasea/Feed/LinkGeneratorTest.php | 76 ++++++++++- 23 files changed, 393 insertions(+), 221 deletions(-) diff --git a/lib/Alchemy/Phrasea/Controller/Admin/Publications.php b/lib/Alchemy/Phrasea/Controller/Admin/Publications.php index b0d8bec98e..83a2a3072f 100644 --- a/lib/Alchemy/Phrasea/Controller/Admin/Publications.php +++ b/lib/Alchemy/Phrasea/Controller/Admin/Publications.php @@ -12,7 +12,8 @@ namespace Alchemy\Phrasea\Controller\Admin; use Alchemy\Phrasea\Application as PhraseaApplication; -use Repositories; +use Entities\Feed; +use Entities\FeedPublisher; use Silex\Application; use Silex\ControllerProviderInterface; use Symfony\Component\HttpFoundation\Request; @@ -47,9 +48,9 @@ class Publications implements ControllerProviderInterface $controllers->post('/create/', function(PhraseaApplication $app, Request $request) { - $publisher = new \Entities\FeedPublisher($app['authentication']->getUser(), true); + $publisher = new FeedPublisher($app['authentication']->getUser(), true); - $feed = new \Entities\Feed($publisher, $request->request->get('title'), $request->request->get('subtitle')); + $feed = new Feed($publisher, $request->request->get('title'), $request->request->get('subtitle')); if ($request->request->get('public') == '1') { $feed->setPublic(true); @@ -178,7 +179,7 @@ class Publications implements ControllerProviderInterface $user = \User_Adapter::getInstance($request->request->get('usr_id'), $app); $feed = $app["EM"]->getRepository("Entities\Feed")->find($id); - $publisher = new \Entities\FeedPublisher($user, false); + $publisher = new FeedPublisher($user, false); $publisher->setFeed($feed); $feed->addPublisher($publisher); diff --git a/lib/Alchemy/Phrasea/Controller/Client/Root.php b/lib/Alchemy/Phrasea/Controller/Client/Root.php index 656c9b9a56..7bfd23ffcc 100644 --- a/lib/Alchemy/Phrasea/Controller/Client/Root.php +++ b/lib/Alchemy/Phrasea/Controller/Client/Root.php @@ -539,7 +539,8 @@ class Root implements ControllerProviderInterface private function getPublicationStartPage(Application $app) { return $app['twig']->render('client/home_inter_pub_basket.html.twig', array( - 'feeds' => \Feed_Collection::load_all($app, $app['authentication']->getUser()), +// 'feeds' => \Feed_Collection::load_all($app, $app['authentication']->getUser()), + 'feeds' => $app['EM']->getRepository('Entities\Feed')->getAllforUser($app['authentication']->getUser()), 'image_size' => (int) $app['authentication']->getUser()->getPrefs('images_size') )); } diff --git a/lib/Alchemy/Phrasea/Controller/Lightbox.php b/lib/Alchemy/Phrasea/Controller/Lightbox.php index 15395ea667..5fcbf35441 100644 --- a/lib/Alchemy/Phrasea/Controller/Lightbox.php +++ b/lib/Alchemy/Phrasea/Controller/Lightbox.php @@ -160,13 +160,15 @@ class Lightbox implements ControllerProviderInterface $controllers->get('/ajax/LOAD_FEED_ITEM/{entry_id}/{item_id}/', function(SilexApplication $app, $entry_id, $item_id) { - $entry = \Feed_Entry_Adapter::load_from_id($app, $entry_id); - $item = new \Feed_Entry_Item($app['phraseanet.appbox'], $entry, $item_id); +// $entry = \Feed_Entry_Adapter::load_from_id($app, $entry_id); + $entry = $app['EM']->getRepository("Entities\FeedEntry")->find($entry_id); +// $item = new \Feed_Entry_Item($app['phraseanet.appbox'], $entry, $item_id); + $item = $entry->getItems()->getItem($item_id); if ($app['browser']->isMobile()) { $output = $app['twig']->render('lightbox/feed_element.html.twig', array( 'feed_element' => $item, - 'module_name' => $item->get_record()->get_title() + 'module_name' => $item->getRecord()->get_title() ) ); @@ -313,7 +315,8 @@ class Lightbox implements ControllerProviderInterface return $app->redirectPath('logout'); } - $feed_entry = \Feed_Entry_Adapter::load_from_id($app, $entry_id); +// $feed_entry = \Feed_Entry_Adapter::load_from_id($app, $entry_id); + $feed_entry = $app['EM']->getEntity("Entities\FeedEntry")->find($entry_id); $template = 'lightbox/feed.html.twig'; @@ -321,12 +324,12 @@ class Lightbox implements ControllerProviderInterface $template = 'lightbox/IE6/feed.html.twig'; } - $content = $feed_entry->get_content(); + $content = $feed_entry->getItems(); $output = $app['twig']->render($template, array( 'feed_entry' => $feed_entry, 'first_item' => array_shift($content), - 'local_title' => $feed_entry->get_title(), + 'local_title' => $feed_entry->getTitle(), 'module' => 'lightbox', 'module_name' => _('admin::monitor: module validation') ) diff --git a/lib/Alchemy/Phrasea/Controller/Prod/Feed.php b/lib/Alchemy/Phrasea/Controller/Prod/Feed.php index 0290f8ce91..dc477fb40b 100644 --- a/lib/Alchemy/Phrasea/Controller/Prod/Feed.php +++ b/lib/Alchemy/Phrasea/Controller/Prod/Feed.php @@ -15,6 +15,8 @@ use Alchemy\Phrasea\Feed\Aggregate; use Alchemy\Phrasea\Feed\AggregateLinkGenerator; use Alchemy\Phrasea\Controller\RecordsRequest; use Alchemy\Phrasea\Feed\LinkGenerator; +use Entities\FeedEntry; +use Entities\FeedItem; use Silex\Application; use Silex\ControllerProviderInterface; use Symfony\Component\HttpFoundation\Request; @@ -60,7 +62,7 @@ class Feed implements ControllerProviderInterface $author_name = $request->request->get('author_name'); $author_email = $request->request->get('author_email'); - $entry = new \Entities\FeedEntry(); + $entry = new FeedEntry(); $entry->setFeed($feed); $entry->setPublisher($publisher); $entry->setTitle($title); @@ -72,7 +74,7 @@ class Feed implements ControllerProviderInterface $publishing = RecordsRequest::fromRequest($app, $request, true, array(), array('bas_chupub')); foreach ($publishing as $record) { - $item = new \Entities\FeedItem(); + $item = new FeedItem(); $item->setEntry($entry); $item->setRecordId($record->get_record_id()); $item->setSbasId($record->get_sbas_id()); @@ -166,7 +168,7 @@ class Feed implements ControllerProviderInterface continue; } - $item = new \entities\FeedItem($entry, $item_sort_datas[0]); + $item = new FeedItem($entry, $item_sort_datas[0]); $item->setEntry($entry); $entry->addItem($item); $item->setOrd($item_sort_datas[1]); @@ -262,11 +264,9 @@ class Feed implements ControllerProviderInterface $feeds = $app["EM"]->getRepository("Entities\Feed")->findAll(); - $aggregateGenerator = new AggregateLinkGenerator($app['url_generator'], $app['EM'], $app['tokens']); - $aggregate = new Aggregate($app, $feeds); - $link = $aggregateGenerator->generate($aggregate, $app['authentication']->getUser(), AggregateLinkGenerator::FORMAT_RSS, null, $renew); + $link = $app['feed.aggregate-link-generator']->generate($aggregate, $app['authentication']->getUser(), AggregateLinkGenerator::FORMAT_RSS, null, $renew); $output = array( 'texte' => '

' . _('publication::Voici votre fil RSS personnel. Il vous permettra d\'etre tenu au courrant des publications.') @@ -283,9 +283,7 @@ class Feed implements ControllerProviderInterface $feed = $app["EM"]->getRepository("Entities\Feed")->loadWithUser($app, $app['authentication']->getUser(), $id); - $linkGenerator = new LinkGenerator($app['url_generator'], $app['EM'], $app['tokens']); - - $link = $linkGenerator->generate($feed, $app['authentication']->getUser(), LinkGenerator::FORMAT_RSS, null, $renew); + $link = $app['feed.user-link-generator']->generate($feed, $app['authentication']->getUser(), LinkGenerator::FORMAT_RSS, null, $renew); $output = array( 'texte' => '

' . _('publication::Voici votre fil RSS personnel. Il vous permettra d\'etre tenu au courrant des publications.') diff --git a/lib/Alchemy/Phrasea/Controller/Prod/Root.php b/lib/Alchemy/Phrasea/Controller/Prod/Root.php index 3d85e8f16d..dee619260b 100644 --- a/lib/Alchemy/Phrasea/Controller/Prod/Root.php +++ b/lib/Alchemy/Phrasea/Controller/Prod/Root.php @@ -11,7 +11,7 @@ namespace Alchemy\Phrasea\Controller\Prod; -use \Alchemy\Phrasea\Feed\Aggregate; +use Alchemy\Phrasea\Feed\Aggregate; use Alchemy\Phrasea\Application; use Alchemy\Phrasea\Exception\SessionNotFound; use Silex\Application as SilexApplication; @@ -75,8 +75,8 @@ class Root implements ControllerProviderInterface // $user_feeds = \Feed_Collection::load_all($app, $app['authentication']->getUser()); // $feeds = array_merge(array($user_feeds->get_aggregate()), $user_feeds->get_feeds()); - $user_feeds = $app["EM"]->getRepository("Entities\Feed")->getAllForUser($app['authentication']->getUser()); - $aggregate = new Aggregate($app, $user_feeds); + $feeds = $app["EM"]->getRepository("Entities\Feed")->getAllForUser($app['authentication']->getUser()); +// $aggregate = new Aggregate($app, $user_feeds); $thjslist = ""; @@ -118,7 +118,7 @@ class Root implements ControllerProviderInterface 'GV_thesaurus' => $app['phraseanet.registry']->get('GV_thesaurus'), 'cgus_agreement' => \databox_cgu::askAgreement($app), 'css' => $css, - 'aggregate' => $aggregate, + 'feeds' => $feeds, 'GV_google_api' => $app['phraseanet.registry']->get('GV_google_api'), 'queries_topics' => $queries_topics, 'search_status' => \databox_status::getSearchStatus($app), diff --git a/lib/Alchemy/Phrasea/Controller/Root/Login.php b/lib/Alchemy/Phrasea/Controller/Root/Login.php index 11e385702e..af346af770 100644 --- a/lib/Alchemy/Phrasea/Controller/Root/Login.php +++ b/lib/Alchemy/Phrasea/Controller/Root/Login.php @@ -725,10 +725,7 @@ class Login implements ControllerProviderInterface $app->addFlash('error', _('login::erreur: No available connection - Please contact sys-admin')); } - $public_feeds = \Feed_Collection::load_public_feeds($app); - - $feeds = $public_feeds->get_feeds(); - array_unshift($feeds, $public_feeds->get_aggregate()); + $feeds = $app['EM']->getRepository('Entities\Feed')->findAllPublic(); $form = $app->form(new PhraseaAuthenticationForm()); $form->setData(array( diff --git a/lib/Alchemy/Phrasea/Controller/Root/RSSFeeds.php b/lib/Alchemy/Phrasea/Controller/Root/RSSFeeds.php index fb00b5304c..b448de9eef 100644 --- a/lib/Alchemy/Phrasea/Controller/Root/RSSFeeds.php +++ b/lib/Alchemy/Phrasea/Controller/Root/RSSFeeds.php @@ -32,15 +32,15 @@ class RSSFeeds implements ControllerProviderInterface $perPage = 5; $entries = $feed->getEntries((($page - 1) * $perPage), $perPage); - if ($format == \Entities\Feed::FORMAT_RSS) { + if ($format == 'rss') { $content = new \Feed_XML_RSS(); } - if ($format == \Entities\Feed::FORMAT_ATOM) { + if ($format == 'atom') { $content = new \Feed_XML_Atom(); } - if ($format == \Entities\Feed::FORMAT_COOLIRIS) { + if ($format == 'cooliris') { $content = new \Feed_XML_Cooliris(); } @@ -77,7 +77,6 @@ class RSSFeeds implements ControllerProviderInterface }; $controllers->get('/feed/{id}/{format}/', function(Application $app, $id, $format) use ($display_feed) { - // $feed = new \Feed_Adapter($app, $id); $feed = $app["EM"]->getRepository("Entities\Feed")->find($id); if (!$feed->isPublic()) { @@ -112,7 +111,6 @@ class RSSFeeds implements ControllerProviderInterface $controllers->get('/userfeed/aggregated/{token}/{format}/', function(Application $app, $token, $format) use ($display_feed) { $token = $app["EM"]->getRepository("Entities\AggregateToken")->findBy(array("id" => $id)); - //$feed = $token->getFeed(); $request = $app['request']; @@ -125,8 +123,6 @@ class RSSFeeds implements ControllerProviderInterface ->assert('format', '(rss|atom)'); $controllers->get('/aggregated/{format}/', function(Application $app, $format) use ($display_feed) { - //$feeds = \Feed_Collection::load_public_feeds($app); - //$feed = $feeds->get_aggregate(); $feeds = $app["EM"]->getRepository("Entities\Feed")->findAllPublic(); $feed = new Aggregate($app, $feeds); @@ -140,8 +136,6 @@ class RSSFeeds implements ControllerProviderInterface ->assert('format', '(rss|atom)'); $controllers->get('/cooliris/', function(Application $app) use ($display_feed) { -// $feeds = \Feed_Collection::load_public_feeds($app); -// $feed = $feeds->get_aggregate(); $feeds = $app["EM"]->getRepository("Entities\Feed")->findAllPublic(); $feed = new Aggregate($app, $feeds); @@ -149,7 +143,7 @@ class RSSFeeds implements ControllerProviderInterface $page = (int) $request->query->get('page'); $page = $page < 1 ? 1 : $page; - return $display_feed($app, $feed, \Feed_Adapter::FORMAT_COOLIRIS, $page); + return $display_feed($app, $feed, 'cooliris', $page); }) ->bind('feed_public_cooliris'); diff --git a/lib/Alchemy/Phrasea/Core/Provider/FeedServiceProvider.php b/lib/Alchemy/Phrasea/Core/Provider/FeedServiceProvider.php index dc4ceef38f..f16badbc1c 100644 --- a/lib/Alchemy/Phrasea/Core/Provider/FeedServiceProvider.php +++ b/lib/Alchemy/Phrasea/Core/Provider/FeedServiceProvider.php @@ -23,7 +23,7 @@ class FeedServiceProvider implements ServiceProviderInterface $app['feed.user-link-generator'] = $app->share(function($app) { return new LinkGenerator($app['url_generator'], $app['EM'], $app['tokens']); }); - $app['feed.aggreagate-link-generator'] = $app->share(function($app) { + $app['feed.aggregate-link-generator'] = $app->share(function($app) { return new AggregateLinkGenerator($app['url_generator'], $app['EM'], $app['tokens']); }); } diff --git a/lib/Alchemy/Phrasea/Feed/AggregateLinkGenerator.php b/lib/Alchemy/Phrasea/Feed/AggregateLinkGenerator.php index 6f9477c6f8..9579fc2090 100644 --- a/lib/Alchemy/Phrasea/Feed/AggregateLinkGenerator.php +++ b/lib/Alchemy/Phrasea/Feed/AggregateLinkGenerator.php @@ -28,21 +28,55 @@ class AggregateLinkGenerator { switch ($format) { case self::FORMAT_ATOM: + $params = array('token' => $this->getAggregateToken($user, $renew)->getValue(), + 'format' => 'atom'); + if (null !== $page) { + $params['page'] = $page; + } return new FeedLink( - $this->generator->generate('feed_user_aggregated', array( - 'token' => $this->getAggregateToken($user, $renew)->getValue(), - 'format' => 'atom', - ), UrlGenerator::ABSOLUTE_URL), + $this->generator->generate('feed_user_aggregated', $params, UrlGenerator::ABSOLUTE_URL), sprintf('%s - %s', $aggregate->getTitle(), 'Atom'), 'application/atom+xml' ); break; case self::FORMAT_RSS: + $params = array('token' => $this->getAggregateToken($user, $renew)->getValue(), + 'format' => 'rss'); + if (null !== $page) { + $params['page'] = $page; + } return new FeedLink( - $this->generator->generate('feed_user_aggregated', array( - 'token' => $this->getAggregateToken($user, $renew)->getValue(), - 'format' => 'rss', - ), UrlGenerator::ABSOLUTE_URL), + $this->generator->generate('feed_user_aggregated', $params, UrlGenerator::ABSOLUTE_URL), + sprintf('%s - %s', $aggregate->getTitle(), 'RSS'), + 'application/rss+xml' + ); + break; + default: + throw new InvalidArgumentException(sprintf('Format %s is not recognized.', $format)); + } + } + + public function generatePublic(Aggregate $aggregate, $format, $page = null) + { + switch ($format) { + case self::FORMAT_ATOM: + $params = array('format' => 'atom'); + if (null !== $page) { + $params['page'] = $page; + } + return new FeedLink( + $this->generator->generate('feed_user_aggregated', $params, UrlGenerator::ABSOLUTE_URL), + sprintf('%s - %s', $aggregate->getTitle(), 'Atom'), + 'application/atom+xml' + ); + break; + case self::FORMAT_RSS: + $params = array('format' => 'rss'); + if (null !== $page) { + $params['page'] = $page; + } + return new FeedLink( + $this->generator->generate('feed_user_aggregated', $params, UrlGenerator::ABSOLUTE_URL), sprintf('%s - %s', $aggregate->getTitle(), 'RSS'), 'application/rss+xml' ); diff --git a/lib/Alchemy/Phrasea/Feed/LinkGenerator.php b/lib/Alchemy/Phrasea/Feed/LinkGenerator.php index dbe105e0d6..b63347697d 100644 --- a/lib/Alchemy/Phrasea/Feed/LinkGenerator.php +++ b/lib/Alchemy/Phrasea/Feed/LinkGenerator.php @@ -28,23 +28,59 @@ class LinkGenerator { switch ($format) { case self::FORMAT_ATOM: + $params = array('token' => $this->getFeedToken($feed, $user, $renew)->getValue(), + 'id' => $feed->getId(), + 'format' => 'atom'); + if (null !== $page) { + $params['page'] = $page; + } return new FeedLink( - $this->generator->generate('feed_user', array( - 'token' => $this->getFeedToken($feed, $user, $renew)->getValue(), - 'id' => $feed->getId(), - 'format' => 'atom', - ), UrlGenerator::ABSOLUTE_URL), + $this->generator->generate('feed_user', $params, UrlGenerator::ABSOLUTE_URL), sprintf('%s - %s', $feed->getTitle(), 'Atom'), 'application/atom+xml' ); break; case self::FORMAT_RSS: + $params = array('token' => $this->getFeedToken($feed, $user, $renew)->getValue(), + 'id' => $feed->getId(), + 'format' => 'rss'); + if (null !== $page) { + $params['page'] = $page; + } return new FeedLink( - $this->generator->generate('feed_user', array( - 'token' => $this->getFeedToken($feed, $user, $renew)->getValue(), - 'id' => $feed->getId(), - 'format' => 'rss', - ), UrlGenerator::ABSOLUTE_URL), + $this->generator->generate('feed_user', $params, UrlGenerator::ABSOLUTE_URL), + sprintf('%s - %s', $feed->getTitle(), 'RSS'), + 'application/rss+xml' + ); + break; + default: + throw new InvalidArgumentException(sprintf('Format %s is not recognized.', $format)); + } + } + + public function generatePublic(Feed $feed, $format, $page = null) + { + switch ($format) { + case self::FORMAT_ATOM: + $params = array('id' => $feed->getId(), + 'format' => 'atom'); + if (null !== $page) { + $params['page'] = $page; + } + return new FeedLink( + $this->generator->generate('feed_public', $params, UrlGenerator::ABSOLUTE_URL), + sprintf('%s - %s', $feed->getTitle(), 'Atom'), + 'application/atom+xml' + ); + break; + case self::FORMAT_RSS: + $params = array('id' => $feed->getId(), + 'format' => 'rss'); + if (null !== $page) { + $params['page'] = $page; + } + return new FeedLink( + $this->generator->generate('feed_public', $params, UrlGenerator::ABSOLUTE_URL), sprintf('%s - %s', $feed->getTitle(), 'RSS'), 'application/rss+xml' ); diff --git a/lib/Doctrine/Entities/Feed.php b/lib/Doctrine/Entities/Feed.php index 8d44126200..2ba83f8cbc 100644 --- a/lib/Doctrine/Entities/Feed.php +++ b/lib/Doctrine/Entities/Feed.php @@ -424,4 +424,27 @@ class Feed implements FeedInterface { return $this->tokens; } + + /** + * Add entries + * + * @param \Entities\FeedEntry $entries + * @return Feed + */ + public function addEntrie(\Entities\FeedEntry $entries) + { + $this->entries[] = $entries; + + return $this; + } + + /** + * Remove entries + * + * @param \Entities\FeedEntry $entries + */ + public function removeEntrie(\Entities\FeedEntry $entries) + { + $this->entries->removeElement($entries); + } } \ No newline at end of file diff --git a/lib/Doctrine/Entities/FeedEntry.php b/lib/Doctrine/Entities/FeedEntry.php index ae72ac8ecd..62c1ce0a2c 100644 --- a/lib/Doctrine/Entities/FeedEntry.php +++ b/lib/Doctrine/Entities/FeedEntry.php @@ -66,11 +66,11 @@ class FeedEntry { $this->items = new \Doctrine\Common\Collections\ArrayCollection(); } - + /** * Get id * - * @return integer + * @return integer */ public function getId() { @@ -86,14 +86,14 @@ class FeedEntry public function setTitle($title) { $this->title = $title; - + return $this; } /** * Get title * - * @return string + * @return string */ public function getTitle() { @@ -109,14 +109,14 @@ class FeedEntry public function setSubtitle($subtitle) { $this->subtitle = $subtitle; - + return $this; } /** * Get subtitle * - * @return string + * @return string */ public function getSubtitle() { @@ -132,14 +132,14 @@ class FeedEntry public function setAuthorName($authorName) { $this->author_name = $authorName; - + return $this; } /** * Get author_name * - * @return string + * @return string */ public function getAuthorName() { @@ -155,14 +155,14 @@ class FeedEntry public function setAuthorEmail($authorEmail) { $this->author_email = $authorEmail; - + return $this; } /** * Get author_email * - * @return string + * @return string */ public function getAuthorEmail() { @@ -178,14 +178,14 @@ class FeedEntry public function setCreatedOn($createdOn) { $this->created_on = $createdOn; - + return $this; } /** * Get created * - * @return \DateTime + * @return \DateTime */ public function getCreatedOn() { @@ -201,14 +201,14 @@ class FeedEntry public function setUpdatedOn($updatedOn) { $this->updated_on = $updatedOn; - + return $this; } /** * Get updated * - * @return \DateTime + * @return \DateTime */ public function getUpdatedOn() { @@ -224,7 +224,7 @@ class FeedEntry public function addItem(\Entities\FeedItem $items) { $this->items[] = $items; - + return $this; } @@ -241,7 +241,7 @@ class FeedEntry /** * Get items * - * @return \Doctrine\Common\Collections\Collection + * @return \Doctrine\Common\Collections\Collection */ public function getItems() { @@ -257,14 +257,14 @@ class FeedEntry public function setPublisher(\Entities\FeedPublisher $publisher = null) { $this->publisher = $publisher; - + return $this; } /** * Get publisher * - * @return \Entities\FeedPublisher + * @return \Entities\FeedPublisher */ public function getPublisher() { @@ -280,27 +280,38 @@ class FeedEntry public function setFeed(\Entities\Feed $feed = null) { $this->feed = $feed; - + return $this; } /** * Get feed * - * @return \Entities\Feed + * @return \Entities\Feed */ public function getFeed() { return $this->feed; } - + public function isPublisher(\User_Adapter $user) { if ($this->publisher) { if ($this->publisher->getUsrId() === $user->get_id()) return true; } - + return false; } + + public function getItem($id) + { + foreach ($this->items as $item) { + if ($item->getId() == $id) { + return ($item); + } + } + + return null; + } } \ No newline at end of file diff --git a/lib/Doctrine/Entities/FeedItem.php b/lib/Doctrine/Entities/FeedItem.php index 9c2682775f..1ec74e792d 100644 --- a/lib/Doctrine/Entities/FeedItem.php +++ b/lib/Doctrine/Entities/FeedItem.php @@ -42,7 +42,7 @@ class FeedItem /** * Get id * - * @return integer + * @return integer */ public function getId() { @@ -58,14 +58,14 @@ class FeedItem public function setRecordId($recordId) { $this->record_id = $recordId; - + return $this; } /** * Get record_id * - * @return integer + * @return integer */ public function getRecordId() { @@ -81,14 +81,14 @@ class FeedItem public function setSbasId($sbasId) { $this->sbas_id = $sbasId; - + return $this; } /** * Get sbas_id * - * @return integer + * @return integer */ public function getSbasId() { @@ -104,21 +104,21 @@ class FeedItem public function setEntry(\Entities\FeedEntry $entry = null) { $this->entry = $entry; - + return $this; } /** * Get entry * - * @return \Entities\FeedEntry + * @return \Entities\FeedEntry */ public function getEntry() { return $this->entry; } /** - * @var int + * @var integer */ private $ord; @@ -126,20 +126,20 @@ class FeedItem /** * Set ord * - * @param \int $ord + * @param integer $ord * @return FeedItem */ - public function setOrd(\int $ord) + public function setOrd($ord) { $this->ord = $ord; - + return $this; } /** * Get ord * - * @return \int + * @return integer */ public function getOrd() { @@ -155,14 +155,14 @@ class FeedItem public function setCreatedOn($createdOn) { $this->created_on = $createdOn; - + return $this; } /** * Get created_on * - * @return \DateTime + * @return \DateTime */ public function getCreatedOn() { @@ -178,17 +178,22 @@ class FeedItem public function setUpdatedOn($updatedOn) { $this->updated_on = $updatedOn; - + return $this; } /** * Get updated_on * - * @return \DateTime + * @return \DateTime */ public function getUpdatedOn() { return $this->updated_on; } + + public function setLastInFeedItem() + { + $this->setOrd($this->getEntry()->getItems()->count() + 1); + } } \ No newline at end of file diff --git a/lib/classes/eventsmanager/notify/feed.php b/lib/classes/eventsmanager/notify/feed.php index 7d4eb3ee44..55783d5bb8 100644 --- a/lib/classes/eventsmanager/notify/feed.php +++ b/lib/classes/eventsmanager/notify/feed.php @@ -45,7 +45,7 @@ class eventsmanager_notify_feed extends eventsmanager_notifyAbstract public function fire($event, $params, &$entry) { $params = array( - 'entry_id' => $entry->get_id() + 'entry_id' => $entry->getId() ); $dom_xml = new DOMDocument('1.0', 'UTF-8'); @@ -72,13 +72,18 @@ class eventsmanager_notify_feed extends eventsmanager_notifyAbstract ->include_templates(false) ->email_not_null(true); - if ($entry->get_feed()->get_collection()) { - $Query->on_base_ids(array($entry->get_feed()->get_collection()->get_base_id())); + if ($entry->getFeed()->getCollection($this->app)) { + $Query->on_base_ids(array($entry->getFeed()->getCollection($this->app)->get_base_id())); } $start = 0; $perLoop = 100; + $from = array( + 'email' => $entry->getAuthorEmail(), + 'name' => $entry->getAuthorName() + ); + do { $results = $Query->limit($start, $perLoop)->execute()->get_results(); @@ -93,7 +98,7 @@ class eventsmanager_notify_feed extends eventsmanager_notifyAbstract \random::TYPE_FEED_ENTRY , $user_to_notif->get_id() , null - , $entry->get_id() + , $entry->getId() ); $url = $this->app->url('lightbox', array('LOG' => $token)); @@ -107,8 +112,8 @@ class eventsmanager_notify_feed extends eventsmanager_notifyAbstract if ($readyToSend) { $mail = MailInfoNewPublication::create($this->app, $receiver); $mail->setButtonUrl($url); - $mail->setAuthor($entry->get_author_name()); - $mail->setTitle($entry->get_title()); + $mail->setAuthor($entry->getAuthorName()); + $mail->setTitle($entry->getTitle()); $this->app['notification.deliverer']->deliver($mail); $mailed = true; @@ -116,6 +121,7 @@ class eventsmanager_notify_feed extends eventsmanager_notifyAbstract } $this->broker->notify($user_to_notif->get_id(), __CLASS__, $datas, $mailed); + } $start += $perLoop; } while (count($results) > 0); @@ -134,16 +140,20 @@ class eventsmanager_notify_feed extends eventsmanager_notifyAbstract $sx = simplexml_load_string($datas); try { - $entry = \Feed_Entry_Adapter::load_from_id($this->app, (int) $sx->entry_id); + $entry = $this->app['EM']->getRepository("Entities\FeedEntry")->find((int) $sx->entry_id); } catch (\Exception $e) { return array(); } + if (null === $entry) { + return array(); + } + $ret = array( 'text' => sprintf( _('%1$s has published %2$s') - , $entry->get_author_name() - , '' . $entry->get_title() . '' + , $entry->getAuthorName() + , '' . $entry->getTitle() . '' ) , 'class' => ($unread == 1 ? 'reload_baskets' : '') ); diff --git a/templates/web/lightbox/feed.html.twig b/templates/web/lightbox/feed.html.twig index b5ea76a30d..42afbaa452 100644 --- a/templates/web/lightbox/feed.html.twig +++ b/templates/web/lightbox/feed.html.twig @@ -27,8 +27,8 @@

{% if first_item %}{{first_item.get_ord()}}{% endif %}
-
- {% if first_item %}{{first_item.get_record().get_title|raw}}{% endif %} +
+ {% if first_item %}{{first_item.get_record().getTitle|raw}}{% endif %}
@@ -43,9 +43,9 @@
{% if first_item %} {% if app['authentication'].getUser().ACL().has_access_to_subdef(first_item.get_record(), 'preview') %} - {% set bask_prev = first_item.get_record().get_preview() %} + {% set bask_prev = first_item.getRecord().get_preview() %} {% else %} - {% set bask_prev = first_item.get_record().get_thumbnail() %} + {% set bask_prev = first_item.getRecord().get_thumbnail() %} {% endif %} {{thumbnail.format(bask_prev,bask_prev.get_width(),bask_prev.get_height(),'', false, false)}} {% endif %} @@ -60,8 +60,8 @@
-
- {% if first_item %}{{first_item.get_record().get_title}}{% endif %} +
+ {% if first_item %}{{first_item.getRecord().get_title}}{% endif %}
@@ -83,7 +83,7 @@
{% set business = app['authentication'].getUser().ACL().has_right_on_base(first_item.get_record().get_base_id(), 'canmodifrecord') %} {% if first_item %} - {{caption.format_caption(first_item.get_record(), '', null, business)}} + {{caption.format_caption(first_item.getRecord(), '', null, business)}} {% endif %}
diff --git a/templates/web/lightbox/feed_container.html.twig b/templates/web/lightbox/feed_container.html.twig index 0c74835877..8b86ac19e9 100644 --- a/templates/web/lightbox/feed_container.html.twig +++ b/templates/web/lightbox/feed_container.html.twig @@ -3,14 +3,14 @@
{% for element in feed_entry.get_content() %}
- - diff --git a/templates/web/lightbox/feed_options_box.html.twig b/templates/web/lightbox/feed_options_box.html.twig index c567276fb2..79f89f04ce 100644 --- a/templates/web/lightbox/feed_options_box.html.twig +++ b/templates/web/lightbox/feed_options_box.html.twig @@ -22,7 +22,7 @@
- +
| {% endif %} diff --git a/templates/web/login/index.html.twig b/templates/web/login/index.html.twig index c69c67b529..3dda0bec61 100644 --- a/templates/web/login/index.html.twig +++ b/templates/web/login/index.html.twig @@ -8,10 +8,10 @@ {% endblock %} {% block header_rss %} - {% for feed in feeds %} - {% set link = feed.get_homepage_link(app['phraseanet.registry'], 'rss') %} + {% for feed in feeds %} + {% set link = app['feed.user-link-generator'].generatePublic(feed, 'rss') %} - {% set link = feed.get_homepage_link(app['phraseanet.registry'], 'atom') %} + {% set link = app['feed.user-link-generator'].generatePublic(feed, 'atom') %} {% endfor %} {% endblock %} diff --git a/templates/web/prod/actions/publish/publish_edit.html.twig b/templates/web/prod/actions/publish/publish_edit.html.twig index d41df7909c..ccd22f34cf 100644 --- a/templates/web/prod/actions/publish/publish_edit.html.twig +++ b/templates/web/prod/actions/publish/publish_edit.html.twig @@ -16,46 +16,46 @@
- {% for content in entry.get_content() %} + {% for content in entry.getItems() %}
- {{ _self.format_diapo(content.get_record()) }} + {{ _self.format_diapo(content.getRecord()) }}
- +
{% endfor %}
-
+
-
+
-
+
-
+
-
+

{% trans 'Fils disponibles' %}

- {% set feed_id = entry.get_feed().get_id() %} - {% for feed in feeds.get_feeds() %} - {% if feed.is_publisher(app['authentication'].getUser()) %} -
- {{ feed.get_title() }} - + {% set feed_id = entry.getFeed().getId() %} + {% for feed in feeds %} + {% if feed.isPublisher(app['authentication'].getUser()) %} +
+ {{ feed.getTitle() }} +
{% endif %} {% endfor %} - +
diff --git a/templates/web/prod/index.html.twig b/templates/web/prod/index.html.twig index e2cd7ac8ef..c8594d97d9 100644 --- a/templates/web/prod/index.html.twig +++ b/templates/web/prod/index.html.twig @@ -52,7 +52,7 @@ {% endblock %} {% block rss %} - {% for feed in aggregate.getFeeds() %} + {% for feed in feeds %} {% set link = app['feed.user-link-generator'].generate(feed, app['authentication'].getUser(), 'rss') %} {% set link = app['feed.user-link-generator'].generate(feed, app['authentication'].getUser(), 'rss') %} diff --git a/tests/Alchemy/Tests/Phrasea/Controller/Prod/FeedTest.php b/tests/Alchemy/Tests/Phrasea/Controller/Prod/FeedTest.php index 843df1659c..829b53c7e0 100644 --- a/tests/Alchemy/Tests/Phrasea/Controller/Prod/FeedTest.php +++ b/tests/Alchemy/Tests/Phrasea/Controller/Prod/FeedTest.php @@ -3,9 +3,6 @@ namespace Alchemy\Tests\Phrasea\Controller\Prod; use Alchemy\Phrasea\Application; -use Alchemy\Phrasea\Feed\Aggregate; -use Alchemy\Phrasea\Feed\AggregateLinkGenerator; -use Alchemy\Phrasea\Feed\LinkGenerator; use Symfony\Component\CssSelector\CssSelector; class ControllerFeedTest extends \PhraseanetWebTestCaseAuthenticatedAbstract @@ -41,34 +38,6 @@ class ControllerFeedTest extends \PhraseanetWebTestCaseAuthenticatedAbstract protected $entry_authorname = 'author name'; protected $entry_authormail = 'author.mail@example.com'; - public function setUp() - { - parent::setUp(); - -// $this->publisher = new \Entities\FeedPublisher(self::$DI['user']); -// -// $this->feed = new \Entities\Feed($this->publisher, $this->feed_title, $this->feed_subtitle); -// -// $this->entry = new \Entities\FeedEntry( -// $this->feed -// , $this->publisher -// , $this->entry_title -// , $this->entry_subtitle -// , $this->entry_authorname -// , $this->entry_authormail -// ); -// -// $this->item = new \Entities\FeedItem($this->entry, self::$DI['record_1']); -// -// $this->publisher->setFeed($this->feed); -// -// self::$DI['app']["EM"]->persist($this->feed); -// self::$DI['app']["EM"]->persist($this->publisher); -// self::$DI['app']["EM"]->persist($this->entry); -// self::$DI['app']["EM"]->persist($this->item); -// self::$DI['app']["EM"]->flush(); - } - public static function setUpBeforeClass() { parent::setUpBeforeClass(); @@ -80,21 +49,6 @@ class ControllerFeedTest extends \PhraseanetWebTestCaseAuthenticatedAbstract self::$DI['user']->ACL()->set_masks_on_base(self::$DI['collection_no_access_by_status']->get_base_id(), '0000000000000000000000000000000000000000000000000001000000000000', '0000000000000000000000000000000000000000000000000001000000000000', '0000000000000000000000000000000000000000000000000001000000000000', '0000000000000000000000000000000000000000000000000001000000000000'); } - public function tearDown() - { -// if ($this->feed instanceof \Entities\Feed) { -// self::$DI['app']["EM"]->remove($this->feed); -// } else if ($this->entry instanceof \Entities\FeedEntry) { -// self::$DI['app']["EM"]->remove($this->entry); -// if ($this->publisher instanceof \Entities\FeedPublisher) { -// self::$DI['app']["EM"]->remove($this->publisher); -// } -// } -// self::$DI['app']["EM"]->flush(); - - parent::tearDown(); - } - public function testRequestAvailable() { $feed = $this->insertOneFeed(self::$DI['user']); @@ -178,12 +132,9 @@ class ControllerFeedTest extends \PhraseanetWebTestCaseAuthenticatedAbstract { $entry = $this->insertOneFeedEntry(self::$DI['user_alt1']); - try { - $crawler = self::$DI['client']->request('GET', '/prod/feeds/entry/' . $entry->getId() . '/edit/'); - $this->fail('Should raise an exception'); - } catch (\Exception_UnauthorizedAction $e) { - - } + $crawler = self::$DI['client']->request('GET', '/prod/feeds/entry/' . $entry->getId() . '/edit/'); + $pageContent = self::$DI['client']->getResponse(); + $this->assertEquals(403, $pageContent->getStatusCode()); } public function testEntryUpdate() @@ -474,46 +425,67 @@ class ControllerFeedTest extends \PhraseanetWebTestCaseAuthenticatedAbstract { $feed = $this->insertOneFeed(self::$DI['user']); - $generator = $this->getMockBuilder('Symfony\Component\Routing\Generator\UrlGenerator') + self::$DI['app']['feed.aggregate-link-generator'] = $this->getMockBuilder('Alchemy\Phrasea\Feed\AggregateLinkGenerator') ->disableOriginalConstructor() ->getMock(); + $link = $this->getMockBuilder('Alchemy\Phrasea\Feed\FeedLink') + ->disableOriginalConstructor() + ->getMock(); + $link->expects($this->once()) + ->method('getURI') + ->will($this->returnValue('http://aggregated-link/')); + self::$DI['app']['feed.aggregate-link-generator']->expects($this->once()) + ->method('generate') + ->with($this->isInstanceOf('Alchemy\Phrasea\Feed\Aggregate'), $this->isInstanceOf('\User_Adapter'), 'rss', null, false) + ->will($this->returnValue($link)); - $random = self::$DI['app']['tokens']; + self::$DI['client']->request('GET', '/prod/feeds/subscribe/aggregated/'); - $aggregateGenerator = new AggregateLinkGenerator($generator, self::$DI['app']['EM'], $random); - - $feeds = self::$DI['app']["EM"]->getRepository("\Entities\Feed")->getAllForUser(self::$DI['user']); - $crawler = self::$DI['client']->request('GET', '/prod/feeds/subscribe/aggregated/'); $this->assertTrue(self::$DI['client']->getResponse()->isOk()); $this->assertEquals("application/json", self::$DI['client']->getResponse()->headers->get("content-type")); - $pageContent = json_decode(self::$DI['client']->getResponse()->getContent()); - $this->assertTrue(is_object($pageContent)); - $this->assertTrue(is_string($pageContent->texte)); - $aggregate = new Aggregate(self::$DI['app'], $feeds); - $suscribe_link = $aggregateGenerator->generate($aggregate, self::$DI['user'], AggregateLinkGenerator::FORMAT_RSS); - $this->assertContains($suscribe_link->getURI(), $pageContent->texte); + + $pageContent = json_decode(self::$DI['client']->getResponse()->getContent(), true); + + $this->assertArrayHasKey('texte', $pageContent); + $this->assertArrayHasKey('titre', $pageContent); + + $this->assertInternalType('string', $pageContent['texte']); + $this->assertInternalType('string', $pageContent['titre']); + + $this->assertContains('http://aggregated-link/', $pageContent['texte']); } public function testSuscribe() { $feed = $this->insertOneFeed(self::$DI['user']); - $generator = $this->getMockBuilder('Symfony\Component\Routing\Generator\UrlGenerator') + self::$DI['app']['feed.user-link-generator'] = $this->getMockBuilder('Alchemy\Phrasea\Feed\LinkGenerator') ->disableOriginalConstructor() ->getMock(); - - $random = self::$DI['app']['tokens']; - - $linkGenerator = new LinkGenerator($generator, self::$DI['app']['EM'], $random); + $link = $this->getMockBuilder('Alchemy\Phrasea\Feed\FeedLink') + ->disableOriginalConstructor() + ->getMock(); + $link->expects($this->once()) + ->method('getURI') + ->will($this->returnValue('http://user-link/')); + self::$DI['app']['feed.user-link-generator']->expects($this->once()) + ->method('generate') + ->with($this->isInstanceOf('\Entities\Feed'), $this->isInstanceOf('\User_Adapter'), 'rss', null, false) + ->will($this->returnValue($link)); $crawler = self::$DI['client']->request('GET', '/prod/feeds/subscribe/' . $feed->getId() . '/'); + $this->assertTrue(self::$DI['client']->getResponse()->isOk()); $this->assertEquals("application/json", self::$DI['client']->getResponse()->headers->get("content-type")); - $pageContent = json_decode(self::$DI['client']->getResponse()->getContent()); - $this->assertTrue(is_object($pageContent)); - $this->assertTrue(is_string($pageContent->texte)); - $suscribe_link = $linkGenerator->generate($feed, self::$DI['user'], LinkGenerator::FORMAT_RSS); - var_dump($suscribe_link); - $this->assertContains($suscribe_link->getURI(), $pageContent->texte); + + $pageContent = json_decode(self::$DI['client']->getResponse()->getContent(), true); + + $this->assertArrayHasKey('texte', $pageContent); + $this->assertArrayHasKey('titre', $pageContent); + + $this->assertInternalType('string', $pageContent['texte']); + $this->assertInternalType('string', $pageContent['titre']); + + $this->assertContains('http://user-link/', $pageContent['texte']); } } diff --git a/tests/Alchemy/Tests/Phrasea/Feed/AggregateLinkGeneratorTest.php b/tests/Alchemy/Tests/Phrasea/Feed/AggregateLinkGeneratorTest.php index ec0d43a4f5..17d21f31d2 100644 --- a/tests/Alchemy/Tests/Phrasea/Feed/AggregateLinkGeneratorTest.php +++ b/tests/Alchemy/Tests/Phrasea/Feed/AggregateLinkGeneratorTest.php @@ -49,7 +49,6 @@ class AggregateLinkGeneratorTest extends \PhraseanetPHPUnitAbstract $link = $linkGenerator->generate($aggregate, $user, $format, $page, $renew); - $this->assertSame($expected, $link->getUri()); if ($format == "atom") { $this->assertSame("application/atom+xml", $link->getMimetype()); $this->assertSame("AGGREGATE - Atom", $link->getTitle()); @@ -61,8 +60,10 @@ class AggregateLinkGeneratorTest extends \PhraseanetPHPUnitAbstract if ($alreadyCreated) { if ($renew) { - $this->assertCount(2, $capture); $this->assertEquals($format, $capture['format']); + if (null !== $page) { + $this->assertEquals($page, $capture['page']); + } $this->assertNotEquals($tokenValue, $capture['token']); $this->assertCount(0, self::$DI['app']['EM'] @@ -72,17 +73,25 @@ class AggregateLinkGeneratorTest extends \PhraseanetPHPUnitAbstract ->getRepository("Entities\AggregateToken") ->findBy(array('value' => $capture['token']))); } else { - $this->assertEquals(array( + $expectedParams = array( 'token' => $tokenValue, 'format' => $format, - ), $capture); + ); + + if ($page !== null) { + $expectedParams['page'] = $page; + } + + $this->assertEquals($expectedParams, $capture); $this->assertCount(1, self::$DI['app']['EM'] ->getRepository("Entities\AggregateToken") ->findBy(array('value' => $tokenValue))); } } else { - $this->assertCount(2, $capture); + if (null !== $page) { + $this->assertEquals($page, $capture['page']); + } $this->assertEquals($format, $capture['format']); $this->assertEquals(12, strlen($capture['token'])); @@ -126,4 +135,14 @@ class AggregateLinkGeneratorTest extends \PhraseanetPHPUnitAbstract array('doliprane', 'rss', $user, 1, true, true), ); } + + public function provideGenerationDataPublic() + { + return array( + array('doliprane', 'atom', null), + array('doliprane', 'atom', 1), + array('doliprane', 'rss', null), + array('doliprane', 'rss', 1) + ); + } } diff --git a/tests/Alchemy/Tests/Phrasea/Feed/LinkGeneratorTest.php b/tests/Alchemy/Tests/Phrasea/Feed/LinkGeneratorTest.php index 7121e4c3dc..3739c297ee 100644 --- a/tests/Alchemy/Tests/Phrasea/Feed/LinkGeneratorTest.php +++ b/tests/Alchemy/Tests/Phrasea/Feed/LinkGeneratorTest.php @@ -52,10 +52,12 @@ class LinkGeneratorTest extends \PhraseanetPHPUnitAbstract if ($alreadyCreated) { if ($renew) { - $this->assertCount(3, $capture); $this->assertEquals($feed->getId(), $capture['id']); $this->assertEquals($format, $capture['format']); $this->assertNotEquals($tokenValue, $capture['token']); + if (null !== $page) { + $this->assertEquals($page, $capture['page']); + } $this->assertCount(0, self::$DI['app']['EM'] ->getRepository("Entities\FeedToken") @@ -64,18 +66,26 @@ class LinkGeneratorTest extends \PhraseanetPHPUnitAbstract ->getRepository("Entities\FeedToken") ->findBy(array('value' => $capture['token']))); } else { - $this->assertEquals(array( + $expectedParams = array( 'token' => $tokenValue, 'id' => $feed->getId(), 'format' => $format, - ), $capture); + ); + + if ($page !== null) { + $expectedParams['page'] = $page; + } + + $this->assertEquals($expectedParams, $capture); $this->assertCount(1, self::$DI['app']['EM'] ->getRepository("Entities\FeedToken") ->findBy(array('value' => $tokenValue))); } } else { - $this->assertCount(3, $capture); + if (null !== $page) { + $this->assertEquals($page, $capture['page']); + } $this->assertEquals($feed->getId(), $capture['id']); $this->assertEquals($format, $capture['format']); $this->assertEquals(12, strlen($capture['token'])); @@ -91,6 +101,51 @@ class LinkGeneratorTest extends \PhraseanetPHPUnitAbstract self::$DI['app']['EM']->flush(); } + /** + * @dataProvider provideGenerationDataPublic + */ + public function testGeneratePublic($expected, $format, $feed, $page) + { + self::$DI['app']['EM']->persist($feed); + self::$DI['app']['EM']->flush(); + + $generator = $this->getMockBuilder('Symfony\Component\Routing\Generator\UrlGenerator') + ->disableOriginalConstructor() + ->getMock(); + + $capture = null; + $generator->expects($this->once()) + ->method('generate') + ->with('feed_public', $this->isType('array'), UrlGenerator::ABSOLUTE_URL) + ->will($this->returnCallback(function ($name, $data, $option) use (&$capture, $expected) { + $capture = $data; + + return $expected; + })); + + $random = self::$DI['app']['tokens']; + + $linkGenerator = new LinkGenerator($generator, self::$DI['app']['EM'], $random); + + $link = $linkGenerator->generatePublic($feed, $format, $page); + + $this->assertSame($expected, $link->getUri()); + if ($format == "atom") { + $this->assertSame("application/atom+xml", $link->getMimetype()); + $this->assertSame("Title - Atom", $link->getTitle()); + } + elseif ($format == "rss") { + $this->assertSame("application/rss+xml", $link->getMimetype()); + $this->assertSame("Title - RSS", $link->getTitle()); + } + + if (null !== $page) { + $this->assertEquals($page, $capture['page']); + } + $this->assertEquals($feed->getId(), $capture['id']); + $this->assertEquals($format, $capture['format']); + } + public function provideGenerationData() { $user = $this->getMockBuilder('User_Adapter') @@ -123,4 +178,17 @@ class LinkGeneratorTest extends \PhraseanetPHPUnitAbstract array('doliprane', 'rss', $feed, $user, 1, true, true), ); } + + public function provideGenerationDataPublic() + { + $feed = new \Entities\Feed(); + $feed->setTitle('Title'); + + return array( + array('doliprane', 'atom', $feed, null), + array('doliprane', 'atom', $feed, 1), + array('doliprane', 'rss', $feed, null), + array('doliprane', 'rss', $feed, 1) + ); + } } From d303a383e6c381c2084e70de36731d0bd5725718 Mon Sep 17 00:00:00 2001 From: Andrey Date: Tue, 11 Jun 2013 11:16:52 +0200 Subject: [PATCH 08/67] Implement feed formatters, fixed tests and prod controllers --- .../Phrasea/Controller/Admin/Publications.php | 49 ++- .../Phrasea/Controller/Client/Root.php | 1 - lib/Alchemy/Phrasea/Controller/Prod/Feed.php | 16 +- .../Phrasea/Controller/Root/RSSFeeds.php | 112 +++---- .../Core/Provider/FeedServiceProvider.php | 25 +- lib/Alchemy/Phrasea/Feed/Aggregate.php | 57 ++-- lib/Alchemy/Phrasea/Feed/FeedInterface.php | 14 +- .../Phrasea/Feed/Formatter/AtomFormatter.php | 158 +++++++++ .../Feed/Formatter/CoolirisFormatter.php | 266 +++++++++++++++ .../Feed/Formatter/FeedFormatterAbstract.php | 164 +++++++++ .../Feed/Formatter/FeedFormatterInterface.php | 20 ++ .../Phrasea/Feed/Formatter/RssFormatter.php | 204 ++++++++++++ .../Feed/Link/AggregateLinkGenerator.php | 122 +++++++ lib/Alchemy/Phrasea/Feed/Link/FeedLink.php | 68 ++++ .../Phrasea/Feed/Link/FeedLinkGenerator.php | 142 ++++++++ .../Phrasea/Feed/Link/FeedLinkInterface.php | 30 ++ .../Feed/Link/LinkGeneratorCollection.php | 50 +++ .../Feed/Link/LinkGeneratorInterface.php | 32 ++ lib/Doctrine/Entities/Feed.php | 15 +- .../web/admin/publications/fiche.html.twig | 2 +- .../client/home_inter_pub_basket.html.twig | 24 +- .../web/lightbox/feed_container.html.twig | 2 +- .../Controller/Admin/PublicationTest.php | 146 ++++---- .../Phrasea/Controller/Prod/FeedTest.php | 34 +- .../Phrasea/Controller/Root/RSSFeedTest.php | 311 +++++------------- .../Feed/AggregateLinkGeneratorTest.php | 4 +- .../Phrasea/Feed/FeedLinkGeneratorTest.php | 194 +++++++++++ tests/classes/PhraseanetPHPUnitAbstract.php | 9 +- 28 files changed, 1803 insertions(+), 468 deletions(-) create mode 100644 lib/Alchemy/Phrasea/Feed/Formatter/AtomFormatter.php create mode 100644 lib/Alchemy/Phrasea/Feed/Formatter/CoolirisFormatter.php create mode 100644 lib/Alchemy/Phrasea/Feed/Formatter/FeedFormatterAbstract.php create mode 100644 lib/Alchemy/Phrasea/Feed/Formatter/FeedFormatterInterface.php create mode 100644 lib/Alchemy/Phrasea/Feed/Formatter/RssFormatter.php create mode 100644 lib/Alchemy/Phrasea/Feed/Link/AggregateLinkGenerator.php create mode 100644 lib/Alchemy/Phrasea/Feed/Link/FeedLink.php create mode 100644 lib/Alchemy/Phrasea/Feed/Link/FeedLinkGenerator.php create mode 100644 lib/Alchemy/Phrasea/Feed/Link/FeedLinkInterface.php create mode 100644 lib/Alchemy/Phrasea/Feed/Link/LinkGeneratorCollection.php create mode 100644 lib/Alchemy/Phrasea/Feed/Link/LinkGeneratorInterface.php create mode 100644 tests/Alchemy/Tests/Phrasea/Feed/FeedLinkGeneratorTest.php diff --git a/lib/Alchemy/Phrasea/Controller/Admin/Publications.php b/lib/Alchemy/Phrasea/Controller/Admin/Publications.php index 83a2a3072f..850183cb08 100644 --- a/lib/Alchemy/Phrasea/Controller/Admin/Publications.php +++ b/lib/Alchemy/Phrasea/Controller/Admin/Publications.php @@ -48,9 +48,17 @@ class Publications implements ControllerProviderInterface $controllers->post('/create/', function(PhraseaApplication $app, Request $request) { - $publisher = new FeedPublisher($app['authentication']->getUser(), true); + $publisher = new FeedPublisher(); - $feed = new Feed($publisher, $request->request->get('title'), $request->request->get('subtitle')); + $feed = new Feed(); + + $publisher->setFeed($feed); + $publisher->setUsrId($app['authentication']->getUser()->get_id()); + $publisher->setOwner(true); + + $feed->addPublisher($publisher); + $feed->setTitle($request->request->get('title')); + $feed->setSubtitle($request->request->get('subtitle')); if ($request->request->get('public') == '1') { $feed->setPublic(true); @@ -69,7 +77,7 @@ class Publications implements ControllerProviderInterface })->bind('admin_feeds_create'); $controllers->get('/feed/{id}/', function(PhraseaApplication $app, Request $request, $id) { - $feed = $app["EM"]->getRepository("Entities\Feed")->find($id); + $feed = $app["EM"]->getRepository("Entities\Feed")->findOneBy(array("id" => $id)); return $app['twig'] ->render('admin/publications/fiche.html.twig', array('feed' => $feed, 'error' => $app['request']->query->get('error'))); @@ -79,24 +87,27 @@ class Publications implements ControllerProviderInterface $controllers->post('/feed/{id}/update/', function(PhraseaApplication $app, Request $request, $id) { - $feed = $app["EM"]->getRepository("Entities\Feed")->find($id); + $feed = $app["EM"]->getRepository("Entities\Feed")->findOneBy(array("id" => $id)); try { $collection = \collection::get_from_base_id($app, $request->request->get('base_id')); } catch (\Exception $e) { $collection = null; } - $feed->setTitle($request->request->get('title')); - $feed->setDescription($request->request->get('subtitle')); + if (null !== $request->request->get('title')) { + $feed->setTitle($request->request->get('title')); + } + if (null !== $request->request->get('subtitle')) { + $feed->setSubtitle($request->request->get('subtitle')); + } $feed->setCollection($collection); - $feed->setPublic($request->request->get('public')); - + $feed->setPublic($request->request->get('public') === '1' ? true : false); $app["EM"]->persist($feed); $app["EM"]->flush(); return $app->redirectPath('admin_feeds_list'); })->before(function(Request $request) use ($app) { - $feed = $app["EM"]->getRepository("Entities\Feed")->find($request->attributes->get('id')); + $feed = $app["EM"]->getRepository("Entities\Feed")->findOneBy(array("id" => $request->attributes->get('id'))); if (!$feed->getOwner($app['authentication']->getUser())) { return $app->redirectPath('admin_feeds_feed', array('id' => $request->attributes->get('id'), 'error' => _('You are not the owner of this feed, you can not edit it'))); @@ -110,7 +121,7 @@ class Publications implements ControllerProviderInterface 'success' => false, 'message' => '', ); - $feed = $app["EM"]->getRepository("Entities\Feed")->find($id); + $feed = $app["EM"]->getRepository("Entities\Feed")->findOneBy(array("id" => $id)); $request = $app["request"]; @@ -156,8 +167,6 @@ class Publications implements ControllerProviderInterface throw new \Exception_InternalServerError('Error while resizing'); } - //$feed->set_icon($tmpname); - unset($media); $app['filesystem']->remove($tmpname); @@ -177,9 +186,11 @@ class Publications implements ControllerProviderInterface try { $request = $app['request']; $user = \User_Adapter::getInstance($request->request->get('usr_id'), $app); - $feed = $app["EM"]->getRepository("Entities\Feed")->find($id); + $feed = $app["EM"]->getRepository("Entities\Feed")->findOneBy(array("id" => $id)); - $publisher = new FeedPublisher($user, false); + $publisher = new FeedPublisher(); + $publisher->setUsrId($user->get_id()); + $publisher->setOwner(false); $publisher->setFeed($feed); $feed->addPublisher($publisher); @@ -201,9 +212,13 @@ class Publications implements ControllerProviderInterface try { $request = $app['request']; - $feed = $app["EM"]->getRepository("Entities\Feed")->find($id); + $feed = $app["EM"]->getRepository("Entities\Feed")->findOneBy(array("id" => $id)); + + $publisher = $app["EM"]->getRepository("Entities\FeedPublisher")->findOneBy(array("id" => $request->request->get('publisher_id'))); + if (null === $publisher) { + throw new \Exception_Feed_PublisherNotFound(); + } - $publisher = $app["EM"]->getRepository("Entities\FeedPublisher")->find($request->request->get('publisher_id')); $user = $publisher->getUser($app); if ($feed->isPublisher($user) === true && $feed->isOwner($user) === false) { $feed->removePublisher($publisher); @@ -221,7 +236,7 @@ class Publications implements ControllerProviderInterface ->assert('id', '\d+'); $controllers->post('/feed/{id}/delete/', function(PhraseaApplication $app, $id) { - $feed = $app["EM"]->getRepository("Entities\Feed")->find($id); + $feed = $app["EM"]->getRepository("Entities\Feed")->findOneBy(array("id" => $id)); $publishers = $feed->getPublishers(); foreach ($publishers as $publisher) { $app["EM"]->remove($publisher); diff --git a/lib/Alchemy/Phrasea/Controller/Client/Root.php b/lib/Alchemy/Phrasea/Controller/Client/Root.php index 7bfd23ffcc..6e90f40b93 100644 --- a/lib/Alchemy/Phrasea/Controller/Client/Root.php +++ b/lib/Alchemy/Phrasea/Controller/Client/Root.php @@ -539,7 +539,6 @@ class Root implements ControllerProviderInterface private function getPublicationStartPage(Application $app) { return $app['twig']->render('client/home_inter_pub_basket.html.twig', array( -// 'feeds' => \Feed_Collection::load_all($app, $app['authentication']->getUser()), 'feeds' => $app['EM']->getRepository('Entities\Feed')->getAllforUser($app['authentication']->getUser()), 'image_size' => (int) $app['authentication']->getUser()->getPrefs('images_size') )); diff --git a/lib/Alchemy/Phrasea/Controller/Prod/Feed.php b/lib/Alchemy/Phrasea/Controller/Prod/Feed.php index dc477fb40b..8ede6dfdd6 100644 --- a/lib/Alchemy/Phrasea/Controller/Prod/Feed.php +++ b/lib/Alchemy/Phrasea/Controller/Prod/Feed.php @@ -11,10 +11,10 @@ namespace Alchemy\Phrasea\Controller\Prod; -use Alchemy\Phrasea\Feed\Aggregate; -use Alchemy\Phrasea\Feed\AggregateLinkGenerator; use Alchemy\Phrasea\Controller\RecordsRequest; -use Alchemy\Phrasea\Feed\LinkGenerator; +use Alchemy\Phrasea\Feed\Aggregate; +use Alchemy\Phrasea\Feed\Link\AggregateLinkGenerator; +use Alchemy\Phrasea\Feed\Link\FeedLinkGenerator; use Entities\FeedEntry; use Entities\FeedItem; use Silex\Application; @@ -60,7 +60,7 @@ class Feed implements ControllerProviderInterface $title = $request->request->get('title'); $subtitle = $request->request->get('subtitle'); $author_name = $request->request->get('author_name'); - $author_email = $request->request->get('author_email'); + $author_email = $request->request->get('author_mail'); $entry = new FeedEntry(); $entry->setFeed($feed); @@ -134,7 +134,7 @@ class Feed implements ControllerProviderInterface $title = $request->request->get('title'); $subtitle = $request->request->get('subtitle'); $author_name = $request->request->get('author_name'); - $author_mail = $request->request->get('author_email'); + $author_mail = $request->request->get('author_mail'); $entry->setAuthorEmail($author_mail) ->setAuthorName($author_name) @@ -237,7 +237,7 @@ class Feed implements ControllerProviderInterface $datas = $app['twig']->render('prod/feeds/feeds.html.twig' , array( 'feeds' => $feeds - , 'feed' => new Aggregate($app, $feeds) + , 'feed' => new Aggregate($app["EM"], $feeds) , 'page' => $page ) ); @@ -264,7 +264,7 @@ class Feed implements ControllerProviderInterface $feeds = $app["EM"]->getRepository("Entities\Feed")->findAll(); - $aggregate = new Aggregate($app, $feeds); + $aggregate = new Aggregate($app["EM"], $feeds); $link = $app['feed.aggregate-link-generator']->generate($aggregate, $app['authentication']->getUser(), AggregateLinkGenerator::FORMAT_RSS, null, $renew); @@ -283,7 +283,7 @@ class Feed implements ControllerProviderInterface $feed = $app["EM"]->getRepository("Entities\Feed")->loadWithUser($app, $app['authentication']->getUser(), $id); - $link = $app['feed.user-link-generator']->generate($feed, $app['authentication']->getUser(), LinkGenerator::FORMAT_RSS, null, $renew); + $link = $app['feed.user-link-generator']->generate($feed, $app['authentication']->getUser(), FeedLinkGenerator::FORMAT_RSS, null, $renew); $output = array( 'texte' => '

' . _('publication::Voici votre fil RSS personnel. Il vous permettra d\'etre tenu au courrant des publications.') diff --git a/lib/Alchemy/Phrasea/Controller/Root/RSSFeeds.php b/lib/Alchemy/Phrasea/Controller/Root/RSSFeeds.php index b448de9eef..02870affb5 100644 --- a/lib/Alchemy/Phrasea/Controller/Root/RSSFeeds.php +++ b/lib/Alchemy/Phrasea/Controller/Root/RSSFeeds.php @@ -11,6 +11,8 @@ namespace Alchemy\Phrasea\Controller\Root; +use Entities\Feed; +use Alchemy\Phrasea\Feed\Aggregate; use Symfony\Component\HttpFoundation\Response; use Silex\Application; use Silex\ControllerProviderInterface; @@ -27,59 +29,14 @@ class RSSFeeds implements ControllerProviderInterface { $controllers = $app['controllers_factory']; - $display_feed = function(Application $app, $feed, $format, $page, $user = null) { - $total = $feed->getCountTotalEntries(); - $perPage = 5; - $entries = $feed->getEntries((($page - 1) * $perPage), $perPage); - - if ($format == 'rss') { - $content = new \Feed_XML_RSS(); - } - - if ($format == 'atom') { - $content = new \Feed_XML_Atom(); - } - - if ($format == 'cooliris') { - $content = new \Feed_XML_Cooliris(); - } - - if ($user instanceof \User_Adapter) - $link = $feed->getUserLink($app['phraseanet.registry'], $user, $format, $page); - else - $link = $feed->get_homepage_link($app['phraseanet.registry'], $format, $page); - - $content->set_updated_on(new \DateTime()); - $content->set_title($feed->getTitle()); - $content->set_subtitle($feed->getSubtitle()); - $content->set_generator('Phraseanet'); - $content->set_link($link); - - if ($user instanceof \User_Adapter) { - if ($page > 1) - $content->set_previous_page($feed->getUserLink($app['phraseanet.registry'], $user, $format, ($page - 1))); - if ($total > ($page * $perPage)) - $content->set_next_page($feed->getUserLink($app['phraseanet.registry'], $user, $format, ($page + 1))); - } else { - if ($page > 1) - $content->set_previous_page($feed->get_homepage_link($app['phraseanet.registry'], $format, ($page - 1))); - if ($total > ($page * $perPage)) - $content->set_next_page($feed->get_homepage_link($app['phraseanet.registry'], $format, ($page + 1))); - } - foreach ($entries->getEntries() as $entry) - $content->set_item($entry); - - $render = $content->render(); - $response = new Response($render, 200, array('Content-Type' => $content->get_mimetype())); - $response->setCharset('UTF-8'); - - return $response; - }; - - $controllers->get('/feed/{id}/{format}/', function(Application $app, $id, $format) use ($display_feed) { + $controllers->get('/feed/{id}/{format}/', function(Application $app, $id, $format) { $feed = $app["EM"]->getRepository("Entities\Feed")->find($id); - if (!$feed->isPublic()) { + if (!$feed) { + return new Response('Not Found', 404); + } + + if (!$feed->getPublic()) { return new Response('Forbidden', 403); } @@ -88,65 +45,92 @@ class RSSFeeds implements ControllerProviderInterface $page = (int) $request->query->get('page'); $page = $page < 1 ? 1 : $page; - return $display_feed($app, $feed, $format, $page); + return $app[$this->getFormater($format)]->createResponse($feed, $page); }) ->bind('feed_public') ->assert('id', '\d+') ->assert('format', '(rss|atom)'); - $controllers->get('/userfeed/{token}/{id}/{format}/', function(Application $app, $token, $id, $format) use ($display_feed) { - $token = $app["EM"]->getRepository("Entities\FeedToken")->findBy(array("id" => $id)); + $controllers->get('/userfeed/{token}/{id}/{format}/', function(Application $app, $token, $id, $format) { + $token = $app["EM"]->getRepository("Entities\FeedToken")->findOneBy(array("id" => $id)); $feed = $token->getFeed(); + $usrId = $token->getUsrId(); + + $user = \User_Adapter::getInstance($usrId, $app); $request = $app['request']; $page = (int) $request->query->get('page'); $page = $page < 1 ? 1 : $page; - return $display_feed($app, $feed, $format, $page, $token->get_user()); + return $app[$this->getFormater($format)]->createResponse($feed, $page, $user); }) ->bind('feed_user') ->assert('id', '\d+') ->assert('format', '(rss|atom)'); - $controllers->get('/userfeed/aggregated/{token}/{format}/', function(Application $app, $token, $format) use ($display_feed) { - $token = $app["EM"]->getRepository("Entities\AggregateToken")->findBy(array("id" => $id)); + $controllers->get('/userfeed/aggregated/{token}/{format}/', function(Application $app, $token, $format) { + $token = $app["EM"]->getRepository("Entities\AggregateToken")->findOneBy(array("value" => $token)); + $usrId = $token->getUsrId(); + + $user = \User_Adapter::getInstance($usrId, $app); + + $feeds = $app["EM"]->getRepository('Entities\Feed')->getAllForUser($user); + + $aggregate = new Aggregate($app["EM"], $feeds, $token); $request = $app['request']; $page = (int) $request->query->get('page'); $page = $page < 1 ? 1 : $page; - return $display_feed($app, $feed, $format, $page, $token->get_user()); + return $app[$this->getFormater($format)]->createResponse($aggregate, $page, $user); }) ->bind('feed_user_aggregated') ->assert('format', '(rss|atom)'); - $controllers->get('/aggregated/{format}/', function(Application $app, $format) use ($display_feed) { + $controllers->get('/aggregated/{format}/', function(Application $app, $format) { $feeds = $app["EM"]->getRepository("Entities\Feed")->findAllPublic(); - $feed = new Aggregate($app, $feeds); + $feed = new Aggregate($app["EM"], $feeds); $request = $app['request']; $page = (int) $request->query->get('page'); $page = $page < 1 ? 1 : $page; - return $display_feed($app, $feed, $format, $page); + return $app[$this->getFormater($format)]->createResponse($feed, $page); }) ->bind('feed_public_aggregated') ->assert('format', '(rss|atom)'); - $controllers->get('/cooliris/', function(Application $app) use ($display_feed) { + $controllers->get('/cooliris/', function(Application $app) { $feeds = $app["EM"]->getRepository("Entities\Feed")->findAllPublic(); - $feed = new Aggregate($app, $feeds); + $feed = new Aggregate($app["EM"], $feeds); $request = $app['request']; $page = (int) $request->query->get('page'); $page = $page < 1 ? 1 : $page; - return $display_feed($app, $feed, 'cooliris', $page); + return $app[$this->getFormater('cooliris')]->createResponse($feed, $page); }) ->bind('feed_public_cooliris'); return $controllers; } + + private function getFormater($type) + { + switch ($type) { + case 'rss': + return 'feed.rss-formatter'; + break; + case 'atom': + return 'feed.atom-formatter'; + break; + case 'cooliris': + return 'feed.cooliris-formatter'; + break; + default: + throw new InvalidArgumentException(sprintf('Format %s is not recognized.', $format)); + } + } } diff --git a/lib/Alchemy/Phrasea/Core/Provider/FeedServiceProvider.php b/lib/Alchemy/Phrasea/Core/Provider/FeedServiceProvider.php index f16badbc1c..4009fdb552 100644 --- a/lib/Alchemy/Phrasea/Core/Provider/FeedServiceProvider.php +++ b/lib/Alchemy/Phrasea/Core/Provider/FeedServiceProvider.php @@ -11,8 +11,12 @@ namespace Alchemy\Phrasea\Core\Provider; -use Alchemy\Phrasea\Feed\LinkGenerator; -use Alchemy\Phrasea\Feed\AggregateLinkGenerator; +use Alchemy\Phrasea\Feed\Formatter\AtomFormatter; +use Alchemy\Phrasea\Feed\Formatter\CoolirisFormatter; +use Alchemy\Phrasea\Feed\Formatter\RssFormatter; +use Alchemy\Phrasea\Feed\Link\AggregateLinkGenerator; +use Alchemy\Phrasea\Feed\Link\FeedLinkGenerator; +use Alchemy\Phrasea\Feed\Link\LinkGeneratorCollection; use Silex\Application; use Silex\ServiceProviderInterface; @@ -21,11 +25,26 @@ class FeedServiceProvider implements ServiceProviderInterface public function register(Application $app) { $app['feed.user-link-generator'] = $app->share(function($app) { - return new LinkGenerator($app['url_generator'], $app['EM'], $app['tokens']); + return new FeedLinkGenerator($app['url_generator'], $app['EM'], $app['tokens']); }); $app['feed.aggregate-link-generator'] = $app->share(function($app) { return new AggregateLinkGenerator($app['url_generator'], $app['EM'], $app['tokens']); }); + $app['feed.link-generator-collection'] = $app->share(function($app) { + $collection = new LinkGeneratorCollection(); + $collection->pushGenerator($app['feed.user-link-generator']); + $collection->pushGenerator($app['feed.aggregate-link-generator']); + return $collection; + }); + $app['feed.rss-formatter'] = $app->share(function($app) { + return new RssFormatter($app['feed.link-generator-collection']); + }); + $app['feed.atom-formatter'] = $app->share(function($app) { + return new AtomFormatter($app['feed.link-generator-collection']); + }); + $app['feed.cooliris-formatter'] = $app->share(function($app) { + return new CoolirisFormatter($app['feed.link-generator-collection']); + }); } public function boot(Application $app) diff --git a/lib/Alchemy/Phrasea/Feed/Aggregate.php b/lib/Alchemy/Phrasea/Feed/Aggregate.php index 3bfbdd6177..03d90e979a 100644 --- a/lib/Alchemy/Phrasea/Feed/Aggregate.php +++ b/lib/Alchemy/Phrasea/Feed/Aggregate.php @@ -4,6 +4,7 @@ namespace Alchemy\Phrasea\Feed; use Alchemy\Phrasea\Application; use Doctrine\ORM\EntityManager; +use Entities\AggregateToken; class Aggregate implements FeedInterface { @@ -35,15 +36,15 @@ class Aggregate implements FeedInterface protected $token; - protected $app; + protected $em; - public function __construct(Application $app, array $feeds) + public function __construct(EntityManager $em, array $feeds, AggregateToken $token = null) { $this->title = 'AGGREGATE'; $this->subtitle = 'AGGREGATE SUBTITLE'; $this->created_on = new \DateTime(); $this->updated_on = new \DateTime(); - $this->app = $app; + $this->em = $em; $tmp_feeds = array(); @@ -52,20 +53,22 @@ class Aggregate implements FeedInterface } $this->feeds = $tmp_feeds; + $this->token = $token; return $this; } - public static function createFromUser(Application $app, \User_Adapter $user) + public static function createFromUser(EntityManager $em, \User_Adapter $user) { - $feeds = $app["EM"]->getRepository('Entities\Feed')->findByUser($user); + $feeds = $em->getRepository('Entities\Feed')->getAllForUser($user); + $token = $em->getRepository('Entities\AggregateToken')->findByUser($user); - return new static($app, $feeds); + return new static($em, $feeds, $token); } public static function create(Application $app, array $feed_ids) { - $feeds = $app["EM"]->getRepository('Entities\Feed')->findByIdArray($feed_ids); + $feeds = $this->em->getRepository('Entities\Feed')->findByIdArray($feed_ids); return new static($app, $feeds); } @@ -75,26 +78,26 @@ class Aggregate implements FeedInterface return true; } - public function getEntries($offset_start, $how_many) + public function getEntries($offset_start = 0, $how_many = null) { - $result = new \Feed_Entry_Collection(); + $count = 0; + $added = 0; - if (count($this->feeds) === 0) { - return $result; - } - - $offset_start = (int) $offset_start; - $how_many = $how_many > 20 ? 20 : (int) $how_many; - - $rs = $this->app["EM"]->getRepository("Entities\FeedEntry")->findByFeeds($this->feeds, $offset_start, $how_many); - - foreach ($rs as $entry) { - if ($entry) { - $result->add_entry($entry); + $collection = array(); + foreach ($this->feeds as $feed) { + foreach ($feed->getEntries() as $entry) { + if ($count >= $offset_start) { + $collection[] = $entry; + $added++; + } + $count++; + if (null !== $how_many && $added == $how_many) { + return $collection; + } } } - return $result; + return $collection; } public function getSubtitle() @@ -142,8 +145,16 @@ class Aggregate implements FeedInterface public function getCountTotalEntries() { if (count($this->feeds) > 0) { - return count($this->app["EM"]->getRepository("Entities\FeedEntry")->findByFeeds($this->feeds)); + return count($this->em->getRepository("Entities\FeedEntry")->findByFeeds($this->feeds)); } return 0; } + + public function hasPage($page, $pageSize) + { + $count = $this->getCountTotalEntries(); + if ($page >= $count / $pageSize) + return true; + return false; + } } diff --git a/lib/Alchemy/Phrasea/Feed/FeedInterface.php b/lib/Alchemy/Phrasea/Feed/FeedInterface.php index 504e9b6e37..976cc07d6b 100644 --- a/lib/Alchemy/Phrasea/Feed/FeedInterface.php +++ b/lib/Alchemy/Phrasea/Feed/FeedInterface.php @@ -1,15 +1,23 @@ linkGenerator = $generator; + } + + public function createResponse(FeedInterface $feed, $page, \User_Adapter $user = null, $generator = 'Phraseanet') + { + $content = $this->format($feed, $page, $user, $generator); + $response = new Response($content, 200, array('Content-Type' => 'application/atom+xml')); + $response->setCharset('UTF-8'); + return $response; + } + + public function format(FeedInterface $feed, $page, \User_Adapter $user = null, $generator = 'Phraseanet') + { + $title = $feed->getTitle(); + $subtitle = $feed->getSubtitle(); + $updated_on = $feed->getUpdatedOn(); + + $document = new \DOMDocument('1.0', 'UTF-8'); + $document->formatOutput = true; + $document->standalone = true; + + $root = $this->addTag($document, $document, 'feed'); + $root->setAttribute('xmlns', 'http://www.w3.org/2005/Atom'); + $root->setAttribute('xmlns:media', 'http://search.yahoo.com/mrss/'); + + $this->addTag($document, $root, 'title', $title); + if ($updated_on instanceof \DateTime) { + $updated_on = $updated_on->format(DATE_ATOM); + $this->addTag($document, $root, 'updated', $updated_on); + } + + if ($feed->hasPage($page + 1, static::PAGE_SIZE)) { + if (null === $user) { + $next = $this->linkGenerator->generatePublic($feed, static::FORMAT, $page + 1); + } else { + $next = $this->linkGenerator->generate($feed, $user, static::FORMAT, $page + 1); + } + } else { + $next = null; + } + if ($feed->hasPage($page - 1, static::PAGE_SIZE)) { + if (null === $user) { + $prev = $this->linkGenerator->generatePublic($feed, static::FORMAT, $page - 1); + } else { + $prev = $this->linkGenerator->generate($feed, $user, static::FORMAT, $page - 1); + } + } else { + $prev = null; + } + + if (null !== $user) { + $feedlink = $this->linkGenerator->generate($feed, $user, static::FORMAT, $page); + } + else { + $feedlink = $this->linkGenerator->generatePublic($feed, static::FORMAT, $page); + } + + if ($feedlink instanceof FeedLink) { + $link = $this->addTag($document, $root, 'link'); + $link->setAttribute('rel', 'self'); + $link->setAttribute('href', $feedlink->getURI()); + $this->addTag($document, $root, 'id', $feedlink->getURI()); + } + + if ($prev instanceof FeedLink) { + $prev_link = $this->addTag($document, $root, 'link'); + $prev_link->setAttribute('rel', 'previous'); + $prev_link->setAttribute('href', $prev->getURI()); + } + + if ($next instanceof FeedLink) { + $next_link = $this->addTag($document, $root, 'link'); + $next_link->setAttribute('rel', 'next'); + $next_link->setAttribute('href', $next->getURI()); + } + + if (isset($generator)) + $this->addTag($document, $root, 'generator', $generator); + if (isset($subtitle)) + $this->addTag($document, $root, 'subtitle', $subtitle); + if (isset($this->icon)) + $this->addTag($document, $root, 'icon', $this->icon); + if (isset($this->author)) { + $author = $this->addTag($document, $root, 'author'); + if (isset($this->author_email)) + $this->addTag($document, $author, 'email', $this->author_email); + if (isset($this->author_name)) + $this->addTag($document, $author, 'name', $this->author_name); + if (isset($this->author_url)) + $this->addTag($document, $author, 'uri', $this->author_url); + } + + foreach ($feed->getEntries() as $item) { + $this->addItem($document, $root, $item, $feedlink); + } + + return $document->saveXML(); + } + + protected function addItem(DOMDocument $document, DOMNode $feed, FeedEntry $entry, FeedLink $link) + { + $entry_node = $this->addTag($document, $feed, 'entry'); + + $link = sprintf('%sentry/%d/', $link->getURI(), $entry->getId()); + + $this->addTag($document, $entry_node, 'id', $link); + $link_tag = $this->addTag($document, $entry_node, 'link'); + $link_tag->setAttribute('rel', 'self'); + $link_tag->setAttribute('href', $link); + + $updated_on = $entry->getUpdatedOn()->format(DATE_ATOM); + $created_on = $entry->getCreatedOn()->format(DATE_ATOM); + + $this->addTag($document, $entry_node, 'updated', $updated_on); + $this->addTag($document, $entry_node, 'published', $created_on); + $this->addTag($document, $entry_node, 'title', $entry->getTitle()); + $author = $this->addTag($document, $entry_node, 'author'); + + if ($entry->getAuthorEmail()) + $this->addTag($document, $author, 'email', $entry->getAuthorEmail()); + if ($entry->getAuthorName()) + $this->addTag($document, $author, 'name', $entry->getAuthorName()); + + $this->addTag($document, $entry_node, 'content', $entry->getSubtitle()); + + foreach ($entry->getItems() as $content) { + $this->addContent($document, $entry_node, $entry, $content); + } + + return $entry_node; + } +} + diff --git a/lib/Alchemy/Phrasea/Feed/Formatter/CoolirisFormatter.php b/lib/Alchemy/Phrasea/Feed/Formatter/CoolirisFormatter.php new file mode 100644 index 0000000000..74fbc4c734 --- /dev/null +++ b/lib/Alchemy/Phrasea/Feed/Formatter/CoolirisFormatter.php @@ -0,0 +1,266 @@ +linkGenerator = $generator; + } + + public function createResponse(FeedInterface $feed, $page, \User_Adapter $user = null, $generator = 'Phraseanet') + { + $content = $this->format($feed, $page, $user, $generator); + $response = new Response($content, 200, array('Content-Type' => 'application/rss+xml')); + $response->setCharset('UTF-8'); + return $response; + } + + public function format(FeedInterface $feed, $page, \User_Adapter $user = null, $generator = 'Phraseanet') + { + $title = $feed->getTitle(); + $subtitle = $feed->getSubtitle(); + $updated_on = $feed->getUpdatedOn(); + + $doc = new \DOMDocument('1.0', 'UTF-8'); + $doc->formatOutput = true; + $doc->standalone = true; + + $root = $this->addTag($doc, $doc, 'rss'); + + $root->setAttribute('version', self::VERSION); + $root->setAttribute('xmlns:media', 'http://search.yahoo.com/mrss/'); + $root->setAttribute('xmlns:atom', 'http://www.w3.org/2005/Atom'); + $root->setAttribute('xmlns:dc', 'http://purl.org/dc/elements/1.1/'); + + $channel = $this->addTag($doc, $root, 'channel'); + + $this->addTag($doc, $channel, 'title', $title); + $this->addTag($doc, $channel, 'dc:title', $title); + $this->addTag($doc, $channel, 'description', $subtitle); + + if (null !== $user) { + $link = $this->linkGenerator->generate($feed, $user, static::FORMAT, $page); + } + else { + $link = $this->linkGenerator->generatePublic($feed, static::FORMAT, $page); + } + + if ($link instanceof FeedLink) + $this->addTag($doc, $channel, 'link', $link->getURI()); + + if (isset($this->language)) + $this->addTag($doc, $channel, 'language', $this->language); + if (isset($this->copyright)) + $this->addTag($doc, $channel, 'copyright', $this->copyright); + if (isset($this->managingEditor)) + $this->addTag($doc, $channel, 'managingEditor', $this->managingEditor); + if (isset($this->webMaster)) + $this->addTag($doc, $channel, 'webMaster', $this->webMaster); + if ($updated_on instanceof DateTime) { + $updated_on = $updated_on->format(DATE_RFC2822); + $this->addTag($doc, $channel, 'pubDate', $updated_on); + } + if (isset($this->lastBuildDate) && $this->lastBuildDate instanceof DateTime) { + $last_build = $this->lastBuildDate->format(DATE_RFC2822); + $this->addTag($doc, $channel, 'lastBuildDate', $last_build); + } + if (isset($this->categories) && count($this->categories) > 0) { + foreach ($this->categories as $category) { + $this->addTag($doc, $channel, 'category', $category); + } + } + if (isset($this->linkgenerator)) + $this->addTag($doc, $channel, 'generator', $this->linkgenerator); + if (isset($this->docs)) + $this->addTag($doc, $channel, 'docs', $this->docs); + if (isset($this->ttl)) + $this->addTag($doc, $channel, 'ttl', $this->ttl); + if (isset($this->image) && $this->image instanceof Feed_XML_RSS_Image) { + $image = $this->addTag($doc, $channel, 'image'); + $this->addTag($doc, $image, 'url', $this->image->get_url()); + $this->addTag($doc, $image, 'title', $this->image->get_title()); + $this->addTag($doc, $image, 'link', $this->image->get_link()); + if ($this->image->get_width()) + $this->addTag($doc, $image, 'width', $this->image->get_width()); + if ($this->image->get_height()) + $this->addTag($doc, $image, 'height', $this->image->get_height()); + if ($this->image->get_description()) + $this->addTag($doc, $image, 'description', $this->image->get_description()); + } + if (isset($this->skipHours) && count($this->skipHours)) { + $skipHours = $this->addTag($doc, $channel, 'skipHours'); + foreach ($this->skipHours as $hour) { + $this->addTag($doc, $skipHours, 'hour', $hour); + } + } + if (isset($this->skipDays) && count($this->skipDays) > 0) { + $skipDays = $this->addTag($doc, $channel, 'skipDays'); + foreach ($this->skipDays as $day) { + $this->addTag($doc, $skipDays, 'day', $day); + } + } + if ($link instanceof FeedLink) { + $self_link = $this->addTag($doc, $channel, 'atom:link'); + $self_link->setAttribute('rel', 'self'); + $self_link->setAttribute('href', $link->getURI()); + } + + if ($feed->hasPage($page + 1, static::PAGE_SIZE)) { + if (null === $user) { + $next = $this->linkGenerator->generatePublic($feed, static::FORMAT, $page + 1); + } else { + $next = $this->linkGenerator->generate($feed, $user, static::FORMAT, $page + 1); + } + } else { + $next = null; + } + if ($feed->hasPage($page - 1, static::PAGE_SIZE)) { + if (null === $user) { + $prev = $this->linkGenerator->generatePublic($feed, static::FORMAT, $page - 1); + } else { + $prev = $this->linkGenerator->generate($feed, $user, static::FORMAT, $page - 1); + } + } else { + $prev = null; + } + + $prefix = 'atom'; + + if ($prev instanceof FeedLink) { + $prev_link = $this->addTag($doc, $channel, $prefix . 'link'); + $prev_link->setAttribute('rel', 'previous'); + $prev_link->setAttribute('href', $prev->getURI()); + } + + if ($next instanceof FeedLink) { + $next_link = $this->addTag($doc, $channel, $prefix . 'link'); + $next_link->setAttribute('rel', 'next'); + $next_link->setAttribute('href', $next->getURI()); + } + + foreach ($feed->getEntries() as $item) { + $this->addItem($doc, $channel, $item); + } + + return $doc->saveXML(); + } + + protected function addItem(\DOMDocument $document, \DOMNode $feed, FeedEntry $entry) + { + foreach ($entry->get_content() as $content) { + $this->addContent($document, $feed, $entry, $content); + } + } + + protected function addContent(\DOMDocument $document, \DOMNode $node, FeedItem $content) + { + + $preview_sd = $content->getRecord()->get_subdef('preview'); + $preview_permalink = $preview_sd->get_permalink(); + $thumbnail_sd = $content->getRecord()->get_thumbnail(); + $thumbnail_permalink = $thumbnail_sd->get_permalink(); + + $medium = strtolower($content->getRecord()->get_type()); + + if ( ! in_array($medium, array('image', 'audio', 'video'))) { + return $this; + } + + if (! $preview_permalink || ! $thumbnail_permalink) { + return $this; + } + + //add item node to channel node + $item = $this->addTag($document, $node, 'item'); + + $caption = $content->getRecord()->get_caption(); + + $title_field = $caption->get_dc_field(databox_Field_DCESAbstract::Title); + if ($title_field) { + $str_title = $title_field->get_serialized_values(' '); + } else { + $str_title = $content->getRecord()->get_title(); + } + + //attach tile node to item node + $title = $this->addTag($document, $item, 'title', $str_title); + + $desc_field = $caption->get_dc_field(databox_Field_DCESAbstract::Description); + if ($desc_field) { + $str_desc = $desc_field->get_serialized_values(' '); + } else { + $str_desc = ''; + } + + //attach desc node to item node + $desc = $this->addTag($document, $item, 'description', $str_desc); + + $duration = $content->getRecord()->get_duration(); + + if ($preview_permalink) { + $preview = $this->addTag($document, $item, 'media:content'); + + $preview->setAttribute('url', $preview_permalink->get_url()); + $preview->setAttribute('fileSize', $preview_sd->get_size()); + $preview->setAttribute('type', $preview_sd->get_mime()); + $preview->setAttribute('medium', $medium); + $preview->setAttribute('expression', 'full'); + $preview->setAttribute('isDefault', 'true'); + + if ($preview_sd->get_width()) + $preview->setAttribute('width', $preview_sd->get_width()); + if ($preview_sd->get_height()) + $preview->setAttribute('height', $preview_sd->get_height()); + if ($duration) + $preview->setAttribute('duration', $duration); + } + + if ($thumbnail_permalink) { + $thumbnail = $this->addTag($document, $item, 'media:thumbnail'); + + $thumbnail->setAttribute('url', $thumbnail_permalink->get_url()); + + if ($thumbnail_sd->get_width()) + $thumbnail->setAttribute('width', $thumbnail_sd->get_width()); + if ($thumbnail_sd->get_height()) + $thumbnail->setAttribute('height', $thumbnail_sd->get_height()); + + $thumbnail = $this->addTag($document, $item, 'media:content'); + + $thumbnail->setAttribute('url', $thumbnail_permalink->get_url()); + $thumbnail->setAttribute('fileSize', $thumbnail_sd->get_size()); + $thumbnail->setAttribute('type', $thumbnail_sd->get_mime()); + $thumbnail->setAttribute('medium', $medium); + $thumbnail->setAttribute('isDefault', 'false'); + + if ($thumbnail_sd->get_width()) + $thumbnail->setAttribute('width', $thumbnail_sd->get_width()); + if ($thumbnail_sd->get_height()) + $thumbnail->setAttribute('height', $thumbnail_sd->get_height()); + if ($duration) + $thumbnail->setAttribute('duration', $duration); + } + + return $this; + } +} + diff --git a/lib/Alchemy/Phrasea/Feed/Formatter/FeedFormatterAbstract.php b/lib/Alchemy/Phrasea/Feed/Formatter/FeedFormatterAbstract.php new file mode 100644 index 0000000000..97974f2729 --- /dev/null +++ b/lib/Alchemy/Phrasea/Feed/Formatter/FeedFormatterAbstract.php @@ -0,0 +1,164 @@ +createElement($tagname); + + if (trim($tagcontent) !== '') + $tag->appendChild($document->createTextNode($tagcontent)); + $node->appendChild($tag); + + return $tag; + } + + /** + * + * @param DOMDocument $document + * @param DOMNode $item + * @param FeedItem $content + * @return FeedFormaterInterface + */ + protected function addContent(\DOMDocument $document, \DOMNode $item, FeedItem $content) + { + $preview_sd = $content->getRecord()->get_subdef('preview'); + $preview_permalink = $preview_sd->get_permalink(); + $thumbnail_sd = $content->getRecord()->get_thumbnail(); + $thumbnail_permalink = $thumbnail_sd->get_permalink(); + + $medium = strtolower($content->getRecord()->get_type()); + + if ( ! in_array($medium, array('image', 'audio', 'video'))) { + return $this; + } + + if (! $preview_permalink || ! $thumbnail_permalink) { + return $this; + } + + $group = $this->addTag($document, $item, 'media:group'); + + $caption = $content->getRecord()->get_caption(); + + $title_field = $caption->get_dc_field(databox_Field_DCESAbstract::Title); + if ($title_field) { + $str_title = $title_field->get_serialized_values(' '); + $title = $this->addTag($document, $group, 'media:title', $str_title); + $title->setAttribute('type', 'plain'); + } + + $desc_field = $caption->get_dc_field(databox_Field_DCESAbstract::Description); + if ($desc_field) { + $str_desc = $desc_field->get_serialized_values(' '); + $desc = $this->addTag($document, $group, 'media:description', $str_desc); + $desc->setAttribute('type', 'plain'); + } + + $contrib_field = $caption->get_dc_field(databox_Field_DCESAbstract::Contributor); + if ($contrib_field) { + $str_contrib = $contrib_field->get_serialized_values(' '); + $contrib = $this->addTag($document, $group, 'media:credit', $str_contrib); + $contrib->setAttribute('role', 'contributor'); + $contrib->setAttribute('scheme', 'urn:ebu'); + } + + $director_field = $caption->get_dc_field(databox_Field_DCESAbstract::Creator); + if ($director_field) { + $str_director = $director_field->get_serialized_values(' '); + $director = $this->addTag($document, $group, 'media:credit', $str_director); + $director->setAttribute('role', 'director'); + $director->setAttribute('scheme', 'urn:ebu'); + } + + $publisher_field = $caption->get_dc_field(databox_Field_DCESAbstract::Publisher); + if ($publisher_field) { + $str_publisher = $publisher_field->get_serialized_values(' '); + $publisher = $this->addTag($document, $group, 'media:credit', $str_publisher); + $publisher->setAttribute('role', 'publisher'); + $publisher->setAttribute('scheme', 'urn:ebu'); + } + + $rights_field = $caption->get_dc_field(databox_Field_DCESAbstract::Rights); + if ($rights_field) { + $str_rights = $rights_field->get_serialized_values(' '); + $rights = $this->addTag($document, $group, 'media:copyright', $str_rights); + } + + $keyword_field = $caption->get_dc_field(databox_Field_DCESAbstract::Subject); + if ($keyword_field) { + $str_keywords = $keyword_field->get_serialized_values(', '); + $keywords = $this->addTag($document, $group, 'media:keywords', $str_keywords); + } + + $duration = $content->get_record()->get_duration(); + + if ($preview_permalink) { + $preview = $this->addTag($document, $group, 'media:content'); + + $preview->setAttribute('url', $preview_permalink->get_url()); + $preview->setAttribute('fileSize', $preview_sd->get_size()); + $preview->setAttribute('type', $preview_sd->get_mime()); + $preview->setAttribute('medium', $medium); + $preview->setAttribute('expression', 'full'); + $preview->setAttribute('isDefault', 'true'); + + if ($preview_sd->get_width()) + $preview->setAttribute('width', $preview_sd->get_width()); + if ($preview_sd->get_height()) + $preview->setAttribute('height', $preview_sd->get_height()); + if ($duration) + $preview->setAttribute('duration', $duration); + } + + if ($thumbnail_permalink) { + $thumbnail = $this->addTag($document, $group, 'media:thumbnail'); + + $thumbnail->setAttribute('url', $thumbnail_permalink->get_url()); + + if ($thumbnail_sd->get_width()) + $thumbnail->setAttribute('width', $thumbnail_sd->get_width()); + if ($thumbnail_sd->get_height()) + $thumbnail->setAttribute('height', $thumbnail_sd->get_height()); + + $thumbnail = $this->addTag($document, $group, 'media:content'); + + $thumbnail->setAttribute('url', $thumbnail_permalink->get_url()); + $thumbnail->setAttribute('fileSize', $thumbnail_sd->get_size()); + $thumbnail->setAttribute('type', $thumbnail_sd->get_mime()); + $thumbnail->setAttribute('medium', $medium); + $thumbnail->setAttribute('isDefault', 'false'); + + if ($thumbnail_sd->get_width()) + $thumbnail->setAttribute('width', $thumbnail_sd->get_width()); + if ($thumbnail_sd->get_height()) + $thumbnail->setAttribute('height', $thumbnail_sd->get_height()); + if ($duration) + $thumbnail->setAttribute('duration', $duration); + } + + return $this; + } + +} diff --git a/lib/Alchemy/Phrasea/Feed/Formatter/FeedFormatterInterface.php b/lib/Alchemy/Phrasea/Feed/Formatter/FeedFormatterInterface.php new file mode 100644 index 0000000000..7ac7185652 --- /dev/null +++ b/lib/Alchemy/Phrasea/Feed/Formatter/FeedFormatterInterface.php @@ -0,0 +1,20 @@ +linkGenerator = $generator; + } + + public function createResponse(FeedInterface $feed, $page, \User_Adapter $user = null, $generator = 'Phraseanet') + { + $content = $this->format($feed, $page, $user, $generator); + $response = new Response($content, 200, array('Content-Type' => 'application/rss+xml')); + $response->setCharset('UTF-8'); + return $response; + } + + public function format(FeedInterface $feed, $page, \User_Adapter $user = null, $generator = 'Phraseanet') + { + $title = $feed->getTitle(); + $subtitle = $feed->getSubtitle(); + $updated_on = $feed->getUpdatedOn(); + + if ($feed->hasPage($page + 1, static::PAGE_SIZE)) { + if (null === $user) { + $next = $this->linkGenerator->generatePublic($feed, static::FORMAT, $page + 1); + } else { + $next = $this->linkGenerator->generate($feed, $user, static::FORMAT, $page + 1); + } + } else { + $next = null; + } + if ($feed->hasPage($page - 1, static::PAGE_SIZE)) { + if (null === $user) { + $prev = $this->linkGenerator->generatePublic($feed, static::FORMAT, $page - 1); + } else { + $prev = $this->linkGenerator->generate($feed, $user, static::FORMAT, $page - 1); + } + } else { + $prev = null; + } + + if (null !== $user) { + $link = $this->linkGenerator->generate($feed, $user, static::FORMAT, $page); + } + else { + $link = $this->linkGenerator->generatePublic($feed, static::FORMAT, $page); + } + + $doc = new \DOMDocument('1.0', 'UTF-8'); + $doc->formatOutput = true; + $doc->standalone = true; + + $root = $this->addTag($doc, $doc, 'rss'); + + $root->setAttribute('version', static::VERSION); + $root->setAttribute('xmlns:media', 'http://search.yahoo.com/mrss/'); + $root->setAttribute('xmlns:atom', 'http://www.w3.org/2005/Atom'); + $root->setAttribute('xmlns:dc', 'http://purl.org/dc/elements/1.1/'); + + $channel = $this->addTag($doc, $root, 'channel'); + + $this->addTag($doc, $channel, 'title', $title); + $this->addTag($doc, $channel, 'dc:title', $title); + $this->addTag($doc, $channel, 'description', $subtitle); + if ($link instanceof FeedLink) + $this->addTag($doc, $channel, 'link', $link->getURI()); + + if (isset($this->language)) + $this->addTag($doc, $channel, 'language', $this->language); + if (isset($this->copyright)) + $this->addTag($doc, $channel, 'copyright', $this->copyright); + if (isset($this->managingEditor)) + $this->addTag($doc, $channel, 'managingEditor', $this->managingEditor); + if (isset($this->webMaster)) + $this->addTag($doc, $channel, 'webMaster', $this->webMaster); + if ($updated_on instanceof \DateTime) { + $updated_on = $updated_on->format(DATE_RFC2822); + $this->addTag($doc, $channel, 'pubDate', $updated_on); + } + if (isset($this->lastBuildDate) && $this->lastBuildDate instanceof DateTime) { + $last_build = $this->lastBuildDate->format(DATE_RFC2822); + $this->addTag($doc, $channel, 'lastBuildDate', $last_build); + } + if (isset($this->categories) && count($this->categories) > 0) { + foreach ($this->categories as $category) { + $this->addTag($doc, $channel, 'category', $category); + } + } + if (isset($generator)) + $this->addTag($doc, $channel, 'generator', $generator); + if (isset($this->docs)) + $this->addTag($doc, $channel, 'docs', $this->docs); + if (isset($this->ttl)) + $this->addTag($doc, $channel, 'ttl', $this->ttl); + if (isset($this->image) && $this->image instanceof Feed_XML_RSS_Image) { + $image = $this->addTag($doc, $channel, 'image'); + $this->addTag($doc, $image, 'url', $this->image->get_url()); + $this->addTag($doc, $image, 'title', $this->image->get_title()); + $this->addTag($doc, $image, 'link', $this->image->get_link()); + if ($this->image->get_width()) + $this->addTag($doc, $image, 'width', $this->image->get_width()); + if ($this->image->get_height()) + $this->addTag($doc, $image, 'height', $this->image->get_height()); + if ($this->image->get_description()) + $this->addTag($doc, $image, 'description', $this->image->get_description()); + } + if (isset($this->skipHours) && count($this->skipHours)) { + $skipHours = $this->addTag($doc, $channel, 'skipHours'); + foreach ($this->skipHours as $hour) { + $this->addTag($doc, $skipHours, 'hour', $hour); + } + } + if (isset($this->skipDays) && count($this->skipDays) > 0) { + $skipDays = $this->addTag($doc, $channel, 'skipDays'); + foreach ($this->skipDays as $day) { + $this->addTag($doc, $skipDays, 'day', $day); + } + } + if ($link instanceof FeedLink) { + $self_link = $this->addTag($doc, $channel, 'atom:link'); + $self_link->setAttribute('rel', 'self'); + $self_link->setAttribute('href', $link->getURI()); + } + + $prefix = 'atom:'; + + if ($prev instanceof FeedLink) { + $prev_link = $this->addTag($doc, $channel, $prefix . 'link'); + $prev_link->setAttribute('rel', 'previous'); + $prev_link->setAttribute('href', $prev->getURI()); + } + + if ($next instanceof FeedLink) { + $next_link = $this->addTag($doc, $channel, $prefix . 'link'); + $next_link->setAttribute('rel', 'next'); + $next_link->setAttribute('href', $next->getURI()); + } + + foreach ($feed->getEntries() as $item) { + $this->addItem($doc, $channel, $item); + } + + return $doc->saveXML(); + } + + protected function addItem(\DOMDocument $document, \DOMNode $node, FeedEntry $entry) + { + $item = $this->addTag($document, $node, 'item'); + + $link = $entry->getLink(); + + $this->addTag($document, $item, 'title', $entry->getTitle()); + $this->addTag($document, $item, 'description', $entry->getSubtitle()); + + $author = sprintf( + '%s (%s)' + , $entry->getAuthorEmail() + , $entry->getAuthorName() + ); + $created_on = $entry->getCreatedOn()->format(DATE_RFC2822); + + $this->addTag($document, $item, 'author', $author); + $this->addTag($document, $item, 'pubDate', $created_on); + $this->addTag($document, $item, 'guid', $link->getURI()); + $this->addTag($document, $item, 'link', $link->getURI()); + + /** + * Missing : + * + * category Includes the item in one or more categories. More. + * comments URL of a page for comments relating to the item. More. + * enclosure Describes a media object that is attached to the item. More. + * source The RSS channel that the item came from. More. + * + */ + foreach ($entry->getItems() as $content) { + $this->addContent($document, $item, $entry, $content); + } + + return $item; + } +} + diff --git a/lib/Alchemy/Phrasea/Feed/Link/AggregateLinkGenerator.php b/lib/Alchemy/Phrasea/Feed/Link/AggregateLinkGenerator.php new file mode 100644 index 0000000000..22afd10a2e --- /dev/null +++ b/lib/Alchemy/Phrasea/Feed/Link/AggregateLinkGenerator.php @@ -0,0 +1,122 @@ +generator = $generator; + $this->em = $em; + $this->random = $random; + } + + public function generate(FeedInterface $aggregate, \User_Adapter $user, $format, $page = null, $renew = false) + { + if (!$this->supports($aggregate)) { + throw new InvalidArgumentException('AggregateLinkGenerator only support aggregate feeds.'); + } + + switch ($format) { + case self::FORMAT_ATOM: + $params = array('token' => $this->getAggregateToken($user, $renew)->getValue(), + 'format' => 'atom'); + if (null !== $page) { + $params['page'] = $page; + } + return new FeedLink( + $this->generator->generate('feed_user_aggregated', $params, UrlGenerator::ABSOLUTE_URL), + sprintf('%s - %s', $aggregate->getTitle(), 'Atom'), + 'application/atom+xml' + ); + break; + case self::FORMAT_RSS: + $params = array('token' => $this->getAggregateToken($user, $renew)->getValue(), + 'format' => 'rss'); + if (null !== $page) { + $params['page'] = $page; + } + return new FeedLink( + $this->generator->generate('feed_user_aggregated', $params, UrlGenerator::ABSOLUTE_URL), + sprintf('%s - %s', $aggregate->getTitle(), 'RSS'), + 'application/rss+xml' + ); + break; + default: + throw new InvalidArgumentException(sprintf('Format %s is not recognized.', $format)); + } + } + + public function supports(FeedInterface $feed) + { + return $feed instanceof Aggregate; + } + + public function generatePublic(FeedInterface $aggregate, $format, $page = null) + { + if (!$this->supports($aggregate)) { + throw new InvalidArgumentException('AggregateLinkGenerator only support aggregate feeds.'); + } + + switch ($format) { + case self::FORMAT_ATOM: + $params = array('format' => 'atom'); + if (null !== $page) { + $params['page'] = $page; + } + return new FeedLink( + $this->generator->generate('feed_public_aggregated', $params, UrlGenerator::ABSOLUTE_URL), + sprintf('%s - %s', $aggregate->getTitle(), 'Atom'), + 'application/atom+xml' + ); + break; + case self::FORMAT_RSS: + $params = array('format' => 'rss'); + if (null !== $page) { + $params['page'] = $page; + } + return new FeedLink( + $this->generator->generate('feed_public_aggregated', $params, UrlGenerator::ABSOLUTE_URL), + sprintf('%s - %s', $aggregate->getTitle(), 'RSS'), + 'application/rss+xml' + ); + break; + default: + throw new InvalidArgumentException(sprintf('Format %s is not recognized.', $format)); + } + } + + private function getAggregateToken(\User_Adapter $user, $renew = false) + { + $token = $this->em + ->getRepository('Entities\AggregateToken') + ->findByUser($user); + + if (null === $token || true === $renew) { + if (null === $token) { + $token = new AggregateToken(); + $token->setUsrId($user->get_id()); + } + + $token->setValue($this->random->generatePassword(12, \random::LETTERS_AND_NUMBERS)); + $this->em->persist($token); + $this->em->flush(); + } + + return $token; + } +} diff --git a/lib/Alchemy/Phrasea/Feed/Link/FeedLink.php b/lib/Alchemy/Phrasea/Feed/Link/FeedLink.php new file mode 100644 index 0000000000..3d55b2c562 --- /dev/null +++ b/lib/Alchemy/Phrasea/Feed/Link/FeedLink.php @@ -0,0 +1,68 @@ +mimetype = $mimetype; + $this->uri = $uri; + $this->title = $title; + } + + /** + * {@inheritdoc} + */ + public function getMimetype() + { + return $this->mimetype; + } + + /** + * {@inheritdoc} + */ + public function getTitle() + { + return $this->title; + } + + /** + * {@inheritdoc} + */ + public function getURI() + { + return $this->uri; + } +} diff --git a/lib/Alchemy/Phrasea/Feed/Link/FeedLinkGenerator.php b/lib/Alchemy/Phrasea/Feed/Link/FeedLinkGenerator.php new file mode 100644 index 0000000000..aed7972f5d --- /dev/null +++ b/lib/Alchemy/Phrasea/Feed/Link/FeedLinkGenerator.php @@ -0,0 +1,142 @@ +generator = $generator; + $this->em = $em; + $this->random = $random; + } + + public function generate(FeedInterface $feed, \User_Adapter $user, $format, $page = null, $renew = false) + { + if (!$this->supports($feed)) { + throw new InvalidArgumentException('FeedLinkGenerator only support aggregate feeds.'); + } + + switch ($format) { + case self::FORMAT_ATOM: + $params = array('token' => $this->getFeedToken($feed, $user, $renew)->getValue(), + 'id' => $feed->getId(), + 'format' => 'atom'); + if (null !== $page) { + $params['page'] = $page; + } + + return new FeedLink( + $this->generator->generate('feed_user', $params, UrlGenerator::ABSOLUTE_URL), + sprintf('%s - %s', $feed->getTitle(), 'Atom'), + 'application/atom+xml' + ); + break; + case self::FORMAT_RSS: + $params = array('token' => $this->getFeedToken($feed, $user, $renew)->getValue(), + 'id' => $feed->getId(), + 'format' => 'rss'); + if (null !== $page) { + $params['page'] = $page; + } + return new FeedLink( + $this->generator->generate('feed_user', $params, UrlGenerator::ABSOLUTE_URL), + sprintf('%s - %s', $feed->getTitle(), 'RSS'), + 'application/rss+xml' + ); + break; + default: + throw new InvalidArgumentException(sprintf('Format %s is not recognized.', $format)); + } + } + + public function supports(FeedInterface $feed) + { + return $feed instanceof Feed; + } + + public function generatePublic(FeedInterface $feed, $format, $page = null) + { + if (!$this->supports($feed)) { + throw new InvalidArgumentException('FeedLinkGenerator only support aggregate feeds.'); + } + + switch ($format) { + case self::FORMAT_ATOM: + $params = array('id' => $feed->getId(), + 'format' => 'atom'); + if (null !== $page) { + $params['page'] = $page; + } + + return new FeedLink( + $this->generator->generate('feed_public', $params, UrlGenerator::ABSOLUTE_URL), + sprintf('%s - %s', $feed->getTitle(), 'Atom'), + 'application/atom+xml' + ); + break; + case self::FORMAT_RSS: + $params = array('id' => $feed->getId(), + 'format' => 'rss'); + if (null !== $page) { + $params['page'] = $page; + } + + return new FeedLink( + $this->generator->generate('feed_public', $params, UrlGenerator::ABSOLUTE_URL), + sprintf('%s - %s', $feed->getTitle(), 'RSS'), + 'application/rss+xml' + ); + break; + default: + throw new InvalidArgumentException(sprintf('Format %s is not recognized.', $format)); + } + } + + private function getFeedToken(Feed $feed, \User_Adapter $user, $renew = false) + { + $token = $this->em + ->getRepository('Entities\FeedToken') + ->findByFeedAndUser($feed, $user); + + if (null === $token || true === $renew) { + if (null === $token) { + $token = new FeedToken(); + $token->setFeed($feed); + $token->setUsrId($user->get_id()); + $feed->addToken($token); + + $this->em->persist($feed); + } + + $token->setValue($this->random->generatePassword(12, \random::LETTERS_AND_NUMBERS)); + $this->em->persist($token); + $this->em->flush(); + } + + return $token; + } +} diff --git a/lib/Alchemy/Phrasea/Feed/Link/FeedLinkInterface.php b/lib/Alchemy/Phrasea/Feed/Link/FeedLinkInterface.php new file mode 100644 index 0000000000..6e158bdc23 --- /dev/null +++ b/lib/Alchemy/Phrasea/Feed/Link/FeedLinkInterface.php @@ -0,0 +1,30 @@ +generators[] = $generator; + } + + public function generate(FeedInterface $feed, \User_Adapter $user, $format, $page = null, $renew = false) + { + if (null === $generator = $this->findGenerator($feed)) { + throw new InvalidArgumentException(sprintf('Unable to find a valid generator for %s', get_class($feed))); + } + + return $generator->generate($feed, $user, $format, $page); + } + + public function generatePublic(FeedInterface $feed, $format, $page = null) + { + if (null === $generator = $this->findGenerator($feed)) { + throw new InvalidArgumentException(sprintf('Unable to find a valid generator for %s', get_class($feed))); + } + + return $generator->generatePublic($feed, $format, $page); + } + + public function supports(FeedInterface $feed) + { + return null !== $this->findGenerator($feed); + } + + private function findGenerator(FeedInterface $feed) + { + foreach ($this->generators as $generator) { + if ($generator->supports($feed)) { + return $generator; + } + } + + return null; + } +} diff --git a/lib/Alchemy/Phrasea/Feed/Link/LinkGeneratorInterface.php b/lib/Alchemy/Phrasea/Feed/Link/LinkGeneratorInterface.php new file mode 100644 index 0000000000..017b49d035 --- /dev/null +++ b/lib/Alchemy/Phrasea/Feed/Link/LinkGeneratorInterface.php @@ -0,0 +1,32 @@ +entries; + } return $this->entries->slice($offset_start, $how_many); } @@ -434,7 +437,7 @@ class Feed implements FeedInterface public function addEntrie(\Entities\FeedEntry $entries) { $this->entries[] = $entries; - + return $this; } @@ -447,4 +450,12 @@ class Feed implements FeedInterface { $this->entries->removeElement($entries); } + + public function hasPage($page, $pageSize) + { + $count = $this->getCountTotalEntries(); + if ($page >= $count / $pageSize + $pageSize) + return true; + return false; + } } \ No newline at end of file diff --git a/templates/web/admin/publications/fiche.html.twig b/templates/web/admin/publications/fiche.html.twig index e83e21c902..ce47d325a9 100644 --- a/templates/web/admin/publications/fiche.html.twig +++ b/templates/web/admin/publications/fiche.html.twig @@ -89,7 +89,7 @@

- +
diff --git a/templates/web/client/home_inter_pub_basket.html.twig b/templates/web/client/home_inter_pub_basket.html.twig index 225a7e7a99..27e90e55d9 100644 --- a/templates/web/client/home_inter_pub_basket.html.twig +++ b/templates/web/client/home_inter_pub_basket.html.twig @@ -5,24 +5,24 @@
- {% for entry in feeds.get_aggregate().get_entries(0, 5).get_entries() %} + {% for entry in feeds.getEntries(0, 5) %}

- - {{ entry.get_title() }} + + {{ entry.getTitle() }}

- {{ app['date-formatter'].getPrettyString(entry.get_created_on()) }} - {% if entry.get_author_email() %} - - {{ entry.get_author_name() }} + {{ app['date-formatter'].getPrettyString(entry.getCreatedOn()) }} + {% if entry.getAuthorEmail() %} + + {{ entry.getAuthorName() }} - {% if entry.get_updated_on() > entry.get_created_on() %} + {% if entry.getUpdatedOn() > entry.getCreatedOn() %}
- {% trans "publications:: derniere mise a jour" %} {{ app['date-formatter'].getPrettyString(entry.get_updated_on()) }} + {% trans "publications:: derniere mise a jour" %} {{ app['date-formatter'].getPrettyString(entry.getUpdatedOn()) }}

@@ -37,9 +37,9 @@ {% endif %}
-
- {% for item in entry.get_content() %} - {% set record = item.get_record() %} +
+ {% for item in entry.getItems() %} + {% set record = item.getRecord() %} {% set thumbnail = record.get_thumbnail() %} {% set docType = record.get_type() %} {% set duration = "" %} diff --git a/templates/web/lightbox/feed_container.html.twig b/templates/web/lightbox/feed_container.html.twig index 8b86ac19e9..fee39c469f 100644 --- a/templates/web/lightbox/feed_container.html.twig +++ b/templates/web/lightbox/feed_container.html.twig @@ -1,7 +1,7 @@ {% block basket %}
- {% for element in feed_entry.get_content() %} + {% for element in feed_entry.getItems() %}
diff --git a/tests/Alchemy/Tests/Phrasea/Controller/Admin/PublicationTest.php b/tests/Alchemy/Tests/Phrasea/Controller/Admin/PublicationTest.php index ab2ac13d68..2e47c8620c 100644 --- a/tests/Alchemy/Tests/Phrasea/Controller/Admin/PublicationTest.php +++ b/tests/Alchemy/Tests/Phrasea/Controller/Admin/PublicationTest.php @@ -13,73 +13,52 @@ class Module_Admin_Route_PublicationTest extends \PhraseanetWebTestCaseAuthentic $crawler = self::$DI['client']->request('GET', '/admin/publications/list/'); $pageContent = self::$DI['client']->getResponse()->getContent(); $this->assertTrue(self::$DI['client']->getResponse()->isOk()); - $feeds = \Feed_Collection::load_all(self::$DI['app'], self::$DI['user']); + $feeds = self::$DI['app']['EM']->getRepository("Entities\Feed")->getAllForUser(self::$DI['user']); - foreach ($feeds->get_feeds() as $feed) { - $this->assertRegExp('/\/admin\/publications\/feed\/' . $feed->get_id() . '/', $pageContent); - if ($feed->get_collection() != null) - $this->assertRegExp('/' . $feed->get_collection()->get_label(self::$DI['app']['locale.I18n']) . '/', $pageContent); - if ($feed->is_owner(self::$DI['user'])) - $this->assertEquals(1, $crawler->filterXPath("//form[@action='/admin/publications/feed/" . $feed->get_id() . "/delete/']")->count()); + foreach ($feeds as $feed) { + $this->assertRegExp('/\/admin\/publications\/feed\/' . $feed->getId() . '/', $pageContent); + if ($feed->getCollection() != null) + $this->assertRegExp('/' . $feed->getCollection()->get_label(self::$DI['app']['locale.I18n']) . '/', $pageContent); + if ($feed->isOwner(self::$DI['user'])) + $this->assertEquals(1, $crawler->filterXPath("//form[@action='/admin/publications/feed/" . $feed->getId() . "/delete/']")->count()); } } public function testCreate() { - $feeds = \Feed_Collection::load_all(self::$DI['app'], self::$DI['user']); - $count = sizeof($feeds->get_feeds()); + $feeds = self::$DI['app']['EM']->getRepository("Entities\Feed")->getAllForUser(self::$DI['user']); + $count = sizeof($feeds); $crawler = self::$DI['client']->request('POST', '/admin/publications/create/', array("title" => "hello", "subtitle" => "coucou", "base_id" => self::$DI['collection']->get_base_id())); $this->assertTrue(self::$DI['client']->getResponse()->isRedirect('/admin/publications/list/')); - $feeds = \Feed_Collection::load_all(self::$DI['app'], self::$DI['user']); - $count_after = sizeof($feeds->get_feeds()); + $feeds = self::$DI['app']['EM']->getRepository("Entities\Feed")->getAllForUser(self::$DI['user']); + $count_after = sizeof($feeds); $this->assertGreaterThan($count, $count_after); - - $all_feeds = $feeds->get_feeds(); - $feed = array_pop($all_feeds); - - $feed->delete(); } public function testGetFeed() { - $feed = \Feed_Adapter::create(self::$DI['app'], self::$DI['user'], "salut", 'coucou'); - $crawler = self::$DI['client']->request('GET', '/admin/publications/feed/' . $feed->get_id() . '/'); + $feed = $this->insertOneFeed(self::$DI['user'], "salut"); + $crawler = self::$DI['client']->request('GET', '/admin/publications/feed/' . $feed->getId() . '/'); $this->assertTrue(self::$DI['client']->getResponse()->isOk()); - $this->assertEquals(1, $crawler->filterXPath("//form[@action='/admin/publications/feed/" . $feed->get_id() . "/update/']")->count()); + $this->assertEquals(1, $crawler->filterXPath("//form[@action='/admin/publications/feed/" . $feed->getId() . "/update/']")->count()); $this->assertEquals(1, $crawler->filterXPath("//input[@value='salut']")->count()); - $this->assertEquals(1, $crawler->filterXPath("//input[@value='coucou']")->count()); - - $feed->delete(); - } - - public function testUpdateFeedNotOwner() - { - $feed = \Feed_Adapter::create(self::$DI['app'], self::$DI['user_alt1'], "salut", 'coucou'); - self::$DI['client']->request("POST", "/admin/publications/feed/" . $feed->get_id() . "/update/"); - $this->assertTrue(self::$DI['client']->getResponse()->isRedirect(), 'update fails, i\'m redirected'); - $this->assertTrue( - strpos( - self::$DI['client']->getResponse()->headers->get('Location') - , '/admin/publications/feed/' . $feed->get_id() . '/?' - ) === 0); - $feed->delete(); } public function testUpdatedFeedException() { - $feed = \Feed_Adapter::create(self::$DI['app'], self::$DI['user'], "salut", 'coucou'); + $feed = $this->insertOneFeed(self::$DI['user']); - self::$DI['client']->request("POST", "/admin/publications/feed/" . $feed->get_id() . "/update/", array( + self::$DI['client']->request("POST", "/admin/publications/feed/" . $feed->getId() . "/update/", array( 'title' => 'test' , 'subtitle' => 'test' , 'public' => '1' )); - $feed = new \Feed_Adapter(self::$DI['app'], $feed->get_id()); + $feed = self::$DI['app']['EM']->getRepository("Entities\Feed")->findOneBy(array('id' => $feed->getId())); $this->assertTrue( strpos( @@ -87,19 +66,17 @@ class Module_Admin_Route_PublicationTest extends \PhraseanetWebTestCaseAuthentic , '/admin/publications/list/' ) === 0); - $this->assertEquals('test', $feed->get_title()); - $this->assertEquals('test', $feed->get_subtitle()); - $this->assertTrue($feed->is_public()); - $this->assertNull($feed->get_collection()); - - $feed->delete(); + $this->assertEquals('test', $feed->getTitle()); + $this->assertEquals('test', $feed->getSubtitle()); + $this->assertTrue($feed->getPublic()); + $this->assertNull($feed->getCollection(self::$DI['app'])); } public function testUpdatedFeedOwner() { - $feed = \Feed_Adapter::create(self::$DI['app'], self::$DI['user'], "salut", 'coucou'); + $feed = $this->insertOneFeed(self::$DI['user']); - self::$DI['client']->request("POST", "/admin/publications/feed/" . $feed->get_id() . "/update/", array( + self::$DI['client']->request("POST", "/admin/publications/feed/" . $feed->getId() . "/update/", array( 'title' => 'test' , 'subtitle' => 'test' , 'public' => '1' @@ -112,13 +89,13 @@ class Module_Admin_Route_PublicationTest extends \PhraseanetWebTestCaseAuthentic , '/admin/publications/list/' ) === 0); - $feed = new \Feed_Adapter(self::$DI['app'], $feed->get_id()); + $feed = self::$DI['app']['EM']->getRepository("Entities\Feed")->findOneBy(array('id' => $feed->getId())); - $collection = $feed->get_collection(); + $collection = $feed->getCollection(self::$DI['app']); - $this->assertEquals('test', $feed->get_title()); - $this->assertEquals('test', $feed->get_subtitle()); - $this->assertFalse($feed->is_public()); + $this->assertEquals('test', $feed->getTitle()); + $this->assertEquals('test', $feed->getSubtitle()); + $this->assertTrue($feed->getPublic()); $this->assertEquals(self::$DI['collection']->get_base_id(), $collection->get_base_id()); $this->assertTrue( @@ -126,12 +103,12 @@ class Module_Admin_Route_PublicationTest extends \PhraseanetWebTestCaseAuthentic self::$DI['client']->getResponse()->headers->get('Location') , '/admin/publications/list/' ) === 0); - - $feed->delete(); } public function testIconUploadErrorOwner() { + $this->markTestSkipped(); // icon upload being changed + $feed = \Feed_Adapter::create(self::$DI['app'], self::$DI['user_alt1'], "salut", 'coucou'); self::$DI['client']->request("POST", "/admin/publications/feed/" . $feed->get_id() . "/iconupload/", array(), array(), array('HTTP_ACCEPT' => 'application/json')); @@ -149,6 +126,8 @@ class Module_Admin_Route_PublicationTest extends \PhraseanetWebTestCaseAuthentic public function testIconUploadErrorFileData() { + $this->markTestSkipped(); // icon upload being changed + $feed = \Feed_Adapter::create(self::$DI['app'], self::$DI['user'], "salut", 'coucou'); self::$DI['client']->request( @@ -169,6 +148,8 @@ class Module_Admin_Route_PublicationTest extends \PhraseanetWebTestCaseAuthentic public function testIconUploadErrorFileType() { + $this->markTestSkipped(); // icon upload being changed + $feed = \Feed_Adapter::create(self::$DI['app'], self::$DI['user'], "salut", 'coucou'); self::$DI['client']->request( @@ -189,6 +170,8 @@ class Module_Admin_Route_PublicationTest extends \PhraseanetWebTestCaseAuthentic public function testIconUpload() { + $this->markTestSkipped(); // icon upload being changed + $feed = \Feed_Adapter::create(self::$DI['app'], self::$DI['user'], "salut", 'coucou'); $files = array( @@ -221,105 +204,94 @@ class Module_Admin_Route_PublicationTest extends \PhraseanetWebTestCaseAuthentic public function testAddPublisher() { - $feed = \Feed_Adapter::create(self::$DI['app'], self::$DI['user'], "salut", 'coucou'); + $feed = $this->insertOneFeed(self::$DI['user']); - self::$DI['client']->request("POST", "/admin/publications/feed/" . $feed->get_id() . "/addpublisher/", array( + self::$DI['client']->request("POST", "/admin/publications/feed/" . $feed->getId() . "/addpublisher/", array( 'usr_id' => self::$DI['user_alt1']->get_id() )); $response = self::$DI['client']->getResponse(); $this->assertTrue($response->isRedirect()); - $feed = new \Feed_Adapter(self::$DI['app'], $feed->get_id()); - $publishers = $feed->get_publishers(); + $feed = self::$DI['app']['EM']->getRepository("Entities\Feed")->findOneBy(array('id' => $feed->getId())); + $publishers = $feed->getPublishers(); - $this->assertTrue(isset($publishers[self::$DI['user_alt1']->get_id()])); + $this->assertTrue($feed->isPublisher(self::$DI['user_alt1'])); $this->assertTrue( strpos( self::$DI['client']->getResponse()->headers->get('Location') - , '/admin/publications/feed/' . $feed->get_id() . '/' + , '/admin/publications/feed/' . $feed->getId() . '/' ) === 0); - - $feed->delete(); } public function testAddPublisherException() { - $feed = \Feed_Adapter::create(self::$DI['app'], self::$DI['user'], "salut", 'coucou'); + $feed = $this->insertOneFeed(self::$DI['user']); - self::$DI['client']->request("POST", "/admin/publications/feed/" . $feed->get_id() . "/addpublisher/"); + self::$DI['client']->request("POST", "/admin/publications/feed/" . $feed->getId() . "/addpublisher/"); - $feed = new \Feed_Adapter(self::$DI['app'], $feed->get_id()); + $feed = self::$DI['app']['EM']->getRepository("Entities\Feed")->findOneBy(array('id' => $feed->getId())); $response = self::$DI['client']->getResponse(); $this->assertTrue($response->isRedirect()); $this->assertTrue( strpos( self::$DI['client']->getResponse()->headers->get('Location') - , '/admin/publications/feed/' . $feed->get_id() . '/?err' + , '/admin/publications/feed/' . $feed->getId() . '/?err' ) === 0); - - $feed->delete(); } public function testRemovePublisher() { - $feed = \Feed_Adapter::create(self::$DI['app'], self::$DI['user'], "salut", 'coucou'); + $feed = $this->insertOneFeed(self::$DI['user']); - self::$DI['client']->request("POST", "/admin/publications/feed/" . $feed->get_id() . "/removepublisher/", array( + self::$DI['client']->request("POST", "/admin/publications/feed/" . $feed->getId() . "/removepublisher/", array( 'usr_id' => self::$DI['user_alt1']->get_id() )); $response = self::$DI['client']->getResponse(); $this->assertTrue($response->isRedirect()); - $feed = new \Feed_Adapter(self::$DI['app'], $feed->get_id()); - $publishers = $feed->get_publishers(); + $feed = self::$DI['app']['EM']->getRepository("Entities\Feed")->findOneBy(array('id' => $feed->getId())); + $publishers = $feed->getPublishers(); $this->assertFalse(isset($publishers[self::$DI['user_alt1']->get_id()])); $this->assertTrue( strpos( self::$DI['client']->getResponse()->headers->get('Location') - , '/admin/publications/feed/' . $feed->get_id() . '/' + , '/admin/publications/feed/' . $feed->getId() . '/' ) === 0); - - $feed->delete(); } public function testRemovePublisherException() { - $feed = \Feed_Adapter::create(self::$DI['app'], self::$DI['user'], "salut", 'coucou'); + $feed = $this->insertOneFeed(self::$DI['user']); - self::$DI['client']->request("POST", "/admin/publications/feed/" . $feed->get_id() . "/removepublisher/"); + self::$DI['client']->request("POST", "/admin/publications/feed/" . $feed->getId() . "/removepublisher/"); $response = self::$DI['client']->getResponse(); $this->assertTrue($response->isRedirect()); - $feed = new \Feed_Adapter(self::$DI['app'], $feed->get_id()); + $feed = self::$DI['app']['EM']->getRepository("Entities\Feed")->findOneBy(array('id' => $feed->getId())); $this->assertTrue( strpos( self::$DI['client']->getResponse()->headers->get('Location') - , '/admin/publications/feed/' . $feed->get_id() . '/?err' + , '/admin/publications/feed/' . $feed->getId() . '/?err' ) === 0); - - $feed->delete(); } public function testDeleteFeed() { - $feed = \Feed_Adapter::create(self::$DI['app'], self::$DI['user'], "salut", 'coucou'); + $feed = $this->insertOneFeed(self::$DI['user']); - self::$DI['client']->request("POST", "/admin/publications/feed/" . $feed->get_id() . "/delete/"); + self::$DI['client']->request("POST", "/admin/publications/feed/" . $feed->getId() . "/delete/"); $response = self::$DI['client']->getResponse(); $this->assertTrue($response->isRedirect()); - try { - $feed = new \Feed_Adapter(self::$DI['app'], $feed->get_id()); - $feed->delete(); + $feed = self::$DI['app']['EM']->getRepository("Entities\Feed")->findOneBy(array('id' => $feed->getId())); + if (null !== $feed) { $this->fail("fail deleting feed"); - } catch (\Exception $e) { - } } } diff --git a/tests/Alchemy/Tests/Phrasea/Controller/Prod/FeedTest.php b/tests/Alchemy/Tests/Phrasea/Controller/Prod/FeedTest.php index 829b53c7e0..da8e27b91d 100644 --- a/tests/Alchemy/Tests/Phrasea/Controller/Prod/FeedTest.php +++ b/tests/Alchemy/Tests/Phrasea/Controller/Prod/FeedTest.php @@ -75,11 +75,11 @@ class ControllerFeedTest extends \PhraseanetWebTestCaseAuthenticatedAbstract $feed = $this->insertOneFeed(self::$DI['user']); $params = array( - "feed_id" => $feed->getId() + "feed_id" => $feed->getId() , "title" => "salut" , "subtitle" => "coucou" , "author_name" => "robert" - , "author_email" => "robert@kikoo.mail" + , "author_mail" => "robert@kikoo.mail" , 'lst' => self::$DI['record_1']->get_serialize_key() ); @@ -95,11 +95,11 @@ class ControllerFeedTest extends \PhraseanetWebTestCaseAuthenticatedAbstract public function testEntryCreateError() { $params = array( - "feed_id" => 'unknow' + "feed_id" => 'unknow' , "title" => "salut" , "subtitle" => "coucou" , "author_name" => "robert" - , "author_email" => "robert@kikoo.mail" + , "author_mail" => "robert@kikoo.mail" , 'lst' => self::$DI['record_1']->get_serialize_key() ); $crawler = self::$DI['client']->request('POST', '/prod/feeds/entry/create/', $params); @@ -145,7 +145,7 @@ class ControllerFeedTest extends \PhraseanetWebTestCaseAuthenticatedAbstract "title" => "dog", "subtitle" => "cat", "author_name" => "bird", - "author_email" => "mouse", + "author_mail" => "mouse", 'lst' => self::$DI['record_1']->get_serialize_key(), ); @@ -170,7 +170,7 @@ class ControllerFeedTest extends \PhraseanetWebTestCaseAuthenticatedAbstract "title" => "dog", "subtitle" => "cat", "author_name" => "bird", - "author_email" => "mouse", + "author_mail" => "mouse", 'lst' => self::$DI['record_1']->get_serialize_key(), ); $crawler = self::$DI['client']->request('POST', '/prod/feeds/entry/' . $entry->getId() . '/update/', $params); @@ -200,7 +200,7 @@ class ControllerFeedTest extends \PhraseanetWebTestCaseAuthenticatedAbstract "title" => "dog", "subtitle" => "cat", "author_name" => "bird", - "author_email" => "mouse", + "author_mail" => "mouse", 'lst' => self::$DI['record_1']->get_serialize_key(), ); @@ -222,7 +222,7 @@ class ControllerFeedTest extends \PhraseanetWebTestCaseAuthenticatedAbstract "title" => "dog", "subtitle" => "cat", "author_name" => "bird", - "author_email" => "mouse", + "author_mail" => "mouse", 'lst' => self::$DI['record_1']->get_serialize_key(), ); @@ -239,11 +239,11 @@ class ControllerFeedTest extends \PhraseanetWebTestCaseAuthenticatedAbstract { $params = array( - "feed_id" => 9999999 + "feed_id" => 9999999 , "title" => "dog" , "subtitle" => "cat" , "author_name" => "bird" - , "author_email" => "mouse" + , "author_mail" => "mouse" , 'lst' => self::$DI['record_1']->get_serialize_key() ); @@ -265,11 +265,11 @@ class ControllerFeedTest extends \PhraseanetWebTestCaseAuthenticatedAbstract $entry = $this->insertOneFeedEntry(self::$DI['user']); $params = array( - "feed_id" => 9999999 + "feed_id" => 9999999 , "title" => "dog" , "subtitle" => "cat" , "author_name" => "bird" - , "author_email" => "mouse" + , "author_mail" => "mouse" , 'sorted_lst' => self::$DI['record_1']->get_serialize_key() . ";" . self::$DI['record_2']->get_serialize_key() . ";12345;" . "unknow_unknow" ); @@ -299,7 +299,7 @@ class ControllerFeedTest extends \PhraseanetWebTestCaseAuthenticatedAbstract , "title" => "dog" , "subtitle" => "cat" , "author_name" => "bird" - , "author_email" => "mouse" + , "author_mail" => "mouse" , 'lst' => self::$DI['record_1']->get_serialize_key() ); @@ -425,10 +425,10 @@ class ControllerFeedTest extends \PhraseanetWebTestCaseAuthenticatedAbstract { $feed = $this->insertOneFeed(self::$DI['user']); - self::$DI['app']['feed.aggregate-link-generator'] = $this->getMockBuilder('Alchemy\Phrasea\Feed\AggregateLinkGenerator') + self::$DI['app']['feed.aggregate-link-generator'] = $this->getMockBuilder('Alchemy\Phrasea\Feed\Link\AggregateLinkGenerator') ->disableOriginalConstructor() ->getMock(); - $link = $this->getMockBuilder('Alchemy\Phrasea\Feed\FeedLink') + $link = $this->getMockBuilder('Alchemy\Phrasea\Feed\Link\FeedLink') ->disableOriginalConstructor() ->getMock(); $link->expects($this->once()) @@ -459,10 +459,10 @@ class ControllerFeedTest extends \PhraseanetWebTestCaseAuthenticatedAbstract { $feed = $this->insertOneFeed(self::$DI['user']); - self::$DI['app']['feed.user-link-generator'] = $this->getMockBuilder('Alchemy\Phrasea\Feed\LinkGenerator') + self::$DI['app']['feed.user-link-generator'] = $this->getMockBuilder('Alchemy\Phrasea\Feed\Link\FeedLinkGenerator') ->disableOriginalConstructor() ->getMock(); - $link = $this->getMockBuilder('Alchemy\Phrasea\Feed\FeedLink') + $link = $this->getMockBuilder('Alchemy\Phrasea\Feed\Link\FeedLink') ->disableOriginalConstructor() ->getMock(); $link->expects($this->once()) diff --git a/tests/Alchemy/Tests/Phrasea/Controller/Root/RSSFeedTest.php b/tests/Alchemy/Tests/Phrasea/Controller/Root/RSSFeedTest.php index 255e59d30c..0ebbd57551 100644 --- a/tests/Alchemy/Tests/Phrasea/Controller/Root/RSSFeedTest.php +++ b/tests/Alchemy/Tests/Phrasea/Controller/Root/RSSFeedTest.php @@ -5,72 +5,15 @@ namespace Alchemy\Tests\Phrasea\Controller\Root; require_once __DIR__ . '/../../../../../classes/FeedValidator.inc'; use Alchemy\Phrasea\Application; +use Alchemy\Phrasea\Feed\Aggregate; +use Entities\Feed; +use Entities\FeedEntry; +use Entities\FeedItem; +use Alchemy\Phrasea\Feed\FeedLink; use Symfony\Component\HttpFoundation\Response; class RssFeedTest extends \PhraseanetWebTestCaseAbstract { - /** - * - * @var \Feed_Adapter - */ - public static $feed; - - /** - * - * @var \Feed_Adapter_Entry - */ - public static $entry; - public static $publisher; - - /** - * - * @var \Feed_Collection - */ - protected static $public_feeds; - - /** - * - * @var \Feed_Collection - */ - protected static $private_feeds; - - /** - * - * @var \Feed_Adapter - */ - protected static $feed_1_private; - protected static $feed_1_private_title = 'Feed 1 title'; - protected static $feed_1_private_subtitle = 'Feed 1 subtitle'; - protected static $feed_1_entries = array(); - protected static $feed_2_entries = array(); - protected static $feed_3_entries = array(); - protected static $feed_4_entries = array(); - - /** - * - * @var \Feed_Adapter - */ - protected static $feed_2_private; - protected static $feed_2_private_title = 'Feed 2 title'; - protected static $feed_2_private_subtitle = 'Feed 2 subtitle'; - - /** - * - * @var \Feed_Adapter - */ - protected static $feed_3_public; - protected static $feed_3_public_title = 'Feed 3 title'; - protected static $feed_3_public_subtitle = 'Feed 3 subtitle'; - - /** - * - * @var \Feed_Adapter - */ - protected static $feed_4_public; - protected static $feed_4_public_title = 'Feed 4 title'; - protected static $feed_4_public_subtitle = 'Feed 4 subtitle'; - protected $client; - private static $initialized = false; public function setUp() @@ -81,92 +24,7 @@ class RssFeedTest extends \PhraseanetWebTestCaseAbstract @unlink('/tmp/db.sqlite'); copy(__DIR__ . '/../../../../../db-ref.sqlite', '/tmp/db.sqlite'); - - self::$DI['app']['session']->clear(); - self::$DI['app']['session']->set('usr_id', self::$DI['user']->get_id()); - - self::$feed_1_private = \Feed_Adapter::create(self::$DI['app'], self::$DI['user'], self::$feed_1_private_title, self::$feed_1_private_subtitle); - self::$feed_1_private->set_public(false); - self::$feed_1_private->set_icon(__DIR__ . '/../../../../../files/logocoll.gif'); - - self::$feed_2_private = \Feed_Adapter::create(self::$DI['app'], self::$DI['user'], self::$feed_2_private_title, self::$feed_2_private_subtitle); - self::$feed_2_private->set_public(false); - - self::$feed_3_public = \Feed_Adapter::create(self::$DI['app'], self::$DI['user'], self::$feed_3_public_title, self::$feed_3_public_subtitle); - self::$feed_3_public->set_public(true); - self::$feed_3_public->set_icon(__DIR__ . '/../../../../../files/logocoll.gif'); - - self::$feed_4_public = \Feed_Adapter::create(self::$DI['app'], self::$DI['user'], self::$feed_4_public_title, self::$feed_4_public_subtitle); - self::$feed_4_public->set_public(true); - - $publishers = self::$feed_4_public->get_publishers(); - $publisher = array_shift($publishers); - - self::$DI['app']['notification.deliverer'] = $this->getMockBuilder('Alchemy\Phrasea\Notification\Deliverer') - ->disableOriginalConstructor() - ->getMock(); - - self::$DI['app']['notification.deliverer']->expects($this->atLeastOnce()) - ->method('deliver') - ->with($this->isInstanceOf('Alchemy\Phrasea\Notification\Mail\MailInfoNewPublication'), $this->equalTo(null)); - - for ($i = 1; $i != 15; $i++) { - $entry = \Feed_Entry_Adapter::create(self::$DI['app'], self::$feed_4_public, $publisher, 'titre entry', 'soustitre entry', 'Jean-Marie Biggaro', 'author@example.com'); - - $item = \Feed_Entry_Item::create(self::$DI['app']['phraseanet.appbox'], $entry, self::$DI['record_1']); - $item = \Feed_Entry_Item::create(self::$DI['app']['phraseanet.appbox'], $entry, self::$DI['record_6']); - $item = \Feed_Entry_Item::create(self::$DI['app']['phraseanet.appbox'], $entry, self::$DI['record_7']); - $item = \Feed_Entry_Item::create(self::$DI['app']['phraseanet.appbox'], $entry, self::$DI['record_13']); - $item = \Feed_Entry_Item::create(self::$DI['app']['phraseanet.appbox'], $entry, self::$DI['record_15']); - $item = \Feed_Entry_Item::create(self::$DI['app']['phraseanet.appbox'], $entry, self::$DI['record_16']); - - $entry = \Feed_Entry_Adapter::create(self::$DI['app'], self::$feed_1_private, $publisher, 'titre entry', 'soustitre entry', 'Jean-Marie Biggaro', 'author@example.com'); - - $item = \Feed_Entry_Item::create(self::$DI['app']['phraseanet.appbox'], $entry, self::$DI['record_1']); - $item = \Feed_Entry_Item::create(self::$DI['app']['phraseanet.appbox'], $entry, self::$DI['record_6']); - $item = \Feed_Entry_Item::create(self::$DI['app']['phraseanet.appbox'], $entry, self::$DI['record_7']); - $item = \Feed_Entry_Item::create(self::$DI['app']['phraseanet.appbox'], $entry, self::$DI['record_13']); - $item = \Feed_Entry_Item::create(self::$DI['app']['phraseanet.appbox'], $entry, self::$DI['record_15']); - $item = \Feed_Entry_Item::create(self::$DI['app']['phraseanet.appbox'], $entry, self::$DI['record_16']); - - self::$feed_4_entries[] = $entry; - } - - self::$public_feeds = \Feed_Collection::load_public_feeds(self::$DI['app']); - self::$private_feeds = \Feed_Collection::load_all(self::$DI['app'], self::$DI['user']); - self::$DI['app']['session']->clear(); - - self::$initialized = true; } - - self::$DI['app']['notification.deliverer'] = $this->getMockBuilder('Alchemy\Phrasea\Notification\Deliverer') - ->disableOriginalConstructor() - ->getMock(); - - self::$DI['app']['notification.deliverer']->expects($this->atLeastOnce()) - ->method('deliver') - ->with($this->isInstanceOf('Alchemy\Phrasea\Notification\Mail\MailInfoNewPublication'), $this->equalTo(null)); - - self::$feed = \Feed_Adapter::create(self::$DI['app'], self::$DI['user'], 'title', 'subtitle'); - self::$publisher = \Feed_Publisher_Adapter::getPublisher(self::$DI['app']['phraseanet.appbox'], self::$feed, self::$DI['user']); - self::$entry = \Feed_Entry_Adapter::create(self::$DI['app'], self::$feed, self::$publisher, 'title_entry', 'subtitle', 'hello', "test@mail.com"); - \Feed_Entry_Item::create(self::$DI['app']['phraseanet.appbox'], self::$entry, self::$DI['record_1']); - \Feed_Entry_Item::create(self::$DI['app']['phraseanet.appbox'], self::$entry, self::$DI['record_2']); - self::$feed->set_public(true); - } - - public function tearDown() - { - if (self::$publisher instanceof \Feed_Publisher_Adapter) { - self::$publisher->delete(); - } - if (self::$entry instanceof \Feed_Entry_Adapter) { - self::$entry->delete(); - } - if (self::$feed instanceof \Feed_Adapter) { - self::$feed->delete(); - } - parent::tearDown(); } public static function setUpBeforeClass() @@ -179,17 +37,13 @@ class RssFeedTest extends \PhraseanetWebTestCaseAbstract public static function tearDownAfterClass() { - self::$feed_1_private->delete(); - self::$feed_2_private->delete(); - self::$feed_3_public->delete(); - self::$feed_4_public->delete(); - parent::tearDownAfterClass(); } public function testPublicFeedAggregated() { - self::$public_feeds->get_aggregate(); + $this->insertOneFeed(self::$DI['user']); + self::$DI['client']->request('GET', '/feeds/aggregated/atom/'); $response = self::$DI['client']->getResponse(); @@ -234,12 +88,9 @@ class RssFeedTest extends \PhraseanetWebTestCaseAbstract { $this->authenticate(self::$DI['app']); - $link = self::$feed_3_public->get_user_link(self::$DI['app']['phraseanet.registry'], self::$DI['user'], \Feed_Adapter::FORMAT_ATOM)->get_href(); - $link = str_replace(self::$DI['app']['phraseanet.registry']->get('GV_ServerName') . 'feeds/', '/', $link); + $feed = $this->insertOneFeed(self::$DI['user'], "test1", true); - $this->logout(self::$DI['app']); - - self::$DI['client']->request('GET', "/feeds" . $link); + self::$DI['client']->request('GET', "/feeds/feed/" . $feed->getId() . "/atom/"); $response = self::$DI['client']->getResponse(); $this->evaluateResponse200($response); @@ -250,14 +101,15 @@ class RssFeedTest extends \PhraseanetWebTestCaseAbstract public function testUserFeedAggregated() { - $this->authenticate(self::$DI['app']); + $feed = $this->insertOneFeed(self::$DI['user']); - $link = self::$private_feeds->get_aggregate()->get_user_link(self::$DI['app']['phraseanet.registry'], self::$DI['user'], \Feed_Adapter::FORMAT_ATOM)->get_href(); - $link = str_replace(self::$DI['app']['phraseanet.registry']->get('GV_ServerName') . 'feeds/', '/', $link); + $token = $this->insertOneAggregateToken(self::$DI['user']); + + $tokenValue = $token->getValue(); $this->logout(self::$DI['app']); - self::$DI['client']->request('GET', "/feeds" . $link); + self::$DI['client']->request('GET', "/feeds/userfeed/aggregated/$tokenValue/atom/"); $response = self::$DI['client']->getResponse(); $this->evaluateResponse200($response); @@ -270,12 +122,17 @@ class RssFeedTest extends \PhraseanetWebTestCaseAbstract { $this->authenticate(self::$DI['app']); - $link = self::$feed_1_private->get_user_link(self::$DI['app']['phraseanet.registry'], self::$DI['user'], \Feed_Adapter::FORMAT_ATOM)->get_href(); - $link = str_replace(self::$DI['app']['phraseanet.registry']->get('GV_ServerName') . 'feeds/', '/', $link); + $feed = $this->insertOneFeed(self::$DI['user']); + + $id = $feed->getId(); + + $token = $this->insertOneFeedToken($feed, self::$DI['user']); + + $tokenValue = $token->getValue(); $this->logout(self::$DI['app']); - self::$DI['client']->request('GET', "/feeds" . $link); + self::$DI['client']->request('GET', "/feeds/userfeed/$tokenValue/$id/atom/"); $response = self::$DI['client']->getResponse(); $this->evaluateResponse200($response); @@ -286,18 +143,16 @@ class RssFeedTest extends \PhraseanetWebTestCaseAbstract public function testGetFeedFormat() { - $feeds = \Feed_Collection::load_public_feeds(self::$DI['app']); - $all_feeds = $feeds->get_feeds(); - $feed = array_shift($all_feeds); + $feed = $this->insertOneFeed(self::$DI['user'], "test", true); - $crawler = self::$DI['client']->request("GET", "/feeds/feed/" . $feed->get_id() . "/rss/"); + $crawler = self::$DI['client']->request("GET", "/feeds/feed/" . $feed->getId() . "/rss/"); $this->assertEquals("application/rss+xml", self::$DI['client']->getResponse()->headers->get("content-type")); $xml = self::$DI['client']->getResponse()->getContent(); $this->verifyXML($xml); $this->verifyRSS($feed, $xml); - $crawler = self::$DI['client']->request("GET", "/feeds/feed/" . $feed->get_id() . "/atom/"); + $crawler = self::$DI['client']->request("GET", "/feeds/feed/" . $feed->getId() . "/atom/"); $this->assertEquals("application/atom+xml", self::$DI['client']->getResponse()->headers->get("content-type")); $xml = self::$DI['client']->getResponse()->getContent(); $this->verifyXML($xml); @@ -306,6 +161,8 @@ class RssFeedTest extends \PhraseanetWebTestCaseAbstract public function testCooliris() { + $feed = $this->insertOneFeed(self::$DI['user'], "test", true); + $crawler = self::$DI['client']->request("GET", "/feeds/cooliris/"); $this->assertTrue(self::$DI['client']->getResponse()->isOk()); $this->assertEquals("application/rss+xml", self::$DI['client']->getResponse()->headers->get("content-type")); @@ -315,10 +172,13 @@ class RssFeedTest extends \PhraseanetWebTestCaseAbstract public function testAggregatedRss() { - $feeds = \Feed_Collection::load_public_feeds(self::$DI['app']); - $all_feeds = $feeds->get_feeds(); + $this->insertOneFeed(self::$DI['user'], "test1", true); + $this->insertOneFeed(self::$DI['user'], "test2", true); + + $all_feeds = self::$DI['app']['EM']->getRepository("Entities\Feed")->findAllPublic(); + foreach ($all_feeds as $feed) { - $this->assertTrue($feed->is_public()); + $this->assertTrue($feed->getPublic()); } $crawler = self::$DI['client']->request("GET", "/feeds/aggregated/rss/"); $this->assertTrue(self::$DI['client']->getResponse()->isOk()); @@ -329,10 +189,13 @@ class RssFeedTest extends \PhraseanetWebTestCaseAbstract public function testAggregatedAtom() { - $feeds = \Feed_Collection::load_public_feeds(self::$DI['app']); - $all_feeds = $feeds->get_feeds(); + $this->insertOneFeed(self::$DI['user'], "test1", true); + $this->insertOneFeed(self::$DI['user'], "test2", true); + + $all_feeds = self::$DI['app']['EM']->getRepository("Entities\Feed")->findAllPublic(); + foreach ($all_feeds as $feed) { - $this->assertTrue($feed->is_public()); + $this->assertTrue($feed->getPublic()); } $crawler = self::$DI['client']->request("GET", "/feeds/aggregated/atom/"); $this->assertTrue(self::$DI['client']->getResponse()->isOk()); @@ -356,17 +219,15 @@ class RssFeedTest extends \PhraseanetWebTestCaseAbstract public function testGetFeedId() { - $feeds = \Feed_Collection::load_public_feeds(self::$DI['app']); - $all_feeds = $feeds->get_feeds(); - $feed = array_shift($all_feeds); + $feed = $this->insertOneFeed(self::$DI['user'], "test1", true); - $crawler = self::$DI['client']->request("GET", "/feeds/feed/" . $feed->get_id() . "/rss/"); + $crawler = self::$DI['client']->request("GET", "/feeds/feed/" . $feed->getId() . "/rss/"); $this->assertTrue(self::$DI['client']->getResponse()->isOk()); $xml = self::$DI['client']->getResponse()->getContent(); $this->verifyXML($xml); $this->verifyRSS($feed, $xml); - $crawler = self::$DI['client']->request("GET", "/feeds/feed/" . $feed->get_id() . "/atom/"); + $crawler = self::$DI['client']->request("GET", "/feeds/feed/" . $feed->getId() . "/atom/"); $this->assertTrue(self::$DI['client']->getResponse()->isOk()); $xml = self::$DI['client']->getResponse()->getContent(); $this->verifyATOM($feed, $xml); @@ -374,12 +235,11 @@ class RssFeedTest extends \PhraseanetWebTestCaseAbstract public function testPrivateFeedAccess() { - $private_feed = \Feed_Adapter::create(self::$DI['app'], self::$DI['user'], 'title', 'subtitle'); - $private_feed->set_public(false); - self::$DI['client']->request("GET", "/feeds/feed/" . $private_feed->get_id() . "/rss/"); + $feed = $this->insertOneFeed(self::$DI['user'], "test1", false); + + self::$DI['client']->request("GET", "/feeds/feed/" . $feed->getId() . "/rss/"); $this->assertFalse(self::$DI['client']->getResponse()->isOk()); $this->assertEquals(403, self::$DI['client']->getResponse()->getStatusCode()); - $private_feed->delete(); } public function verifyXML($xml) @@ -400,7 +260,7 @@ class RssFeedTest extends \PhraseanetWebTestCaseAbstract } } - public function verifyRSS(\Feed_Adapter $feed, $xml_string) + public function verifyRSS(Feed $feed, $xml_string) { $dom_doc = new \DOMDocument(); $dom_doc->loadXML($xml_string); @@ -413,23 +273,23 @@ class RssFeedTest extends \PhraseanetWebTestCaseAbstract $this->checkRSSEntryNode($xpath, $feed); } - public function checkRSSRootNode(\DOMXPath $xpath, \Feed_Adapter $feed) + public function checkRSSRootNode(\DOMXPath $xpath, Feed $feed) { $channel = $xpath->query("/rss/channel"); foreach ($channel->item(0)->childNodes as $child) { if ($child->nodeType !== XML_TEXT_NODE) { switch ($child->nodeName) { case 'title': - $this->assertEquals($feed->get_title(), $child->nodeValue); + $this->assertEquals($feed->getTitle(), $child->nodeValue); break; case 'dc:title': - $this->assertEquals($feed->get_title(), $child->nodeValue); + $this->assertEquals($feed->getTitle(), $child->nodeValue); break; case 'description': - $this->assertEquals($feed->get_subtitle(), $child->nodeValue); + $this->assertEquals($feed->getSubtitle(), $child->nodeValue); break; case 'link': - $this->assertEquals($feed->get_homepage_link(self::$DI['app']['phraseanet.registry'], \Feed_Adapter::FORMAT_RSS, 1)->get_href(), $child->nodeValue); + $this->assertEquals(self::$DI['app']['feed.user-link-generator']->generatePublic($feed, 'rss', 1)->getURI(), $child->nodeValue); break; case 'pubDate': $this->assertTrue(new \DateTime() >= new \DateTime($child->nodeValue)); @@ -443,7 +303,7 @@ class RssFeedTest extends \PhraseanetWebTestCaseAbstract case 'atom:link': foreach ($child->attributes as $attribute) { if ($attribute->name == "href") { - $this->assertEquals($feed->get_homepage_link(self::$DI['app']['phraseanet.registry'], \Feed_Adapter::FORMAT_RSS, 1)->get_href(), $attribute->value); + $this->assertEquals(self::$DI['app']['feed.user-link-generator']->generatePublic($feed, 'rss', 1)->getURI(), $attribute->value); break; } } @@ -453,58 +313,56 @@ class RssFeedTest extends \PhraseanetWebTestCaseAbstract } } - public function checkRSSEntryNode(\DOMXPath $xpath, \Feed_Adapter $feed) + public function checkRSSEntryNode(\DOMXPath $xpath, Feed $feed) { $list_entries = $xpath->query("/rss/channel/item"); $count = 0; $offset_start = 0; $n_entries = 20; - $collection = $feed->get_entries($offset_start, $n_entries); - $entries = $collection->get_entries(); + $entries = $feed->getEntries($offset_start, $n_entries); foreach ($list_entries as $node) { if (sizeof($entries) == 0) { $offset_start = ($offset_start++) * $n_entries; - $collection = $feed->get_entries($offset_start, $n_entries); - $entries = $collection->get_entries(); + $entries = $feed->getEntries($offset_start, $n_entries); if (sizeof($entries) == 0) //no more break; } $feed_entry = array_shift($entries); switch ($node->nodeName) { case 'title': - $this->assertEquals($feed_entry->get_title(), $node->nodeValue); + $this->assertEquals($feed_entry->getTitle(), $node->nodeValue); break; case 'description': - $this->assertEquals($feed_entry->get_subtitle(), $node->nodeValue); + $this->assertEquals($feed_entry->getSubtitle(), $node->nodeValue); break; case 'author': $author = sprintf( '%s (%s)' - , $feed_entry->get_author_email() - , $feed_entry->get_author_name() + , $feed_entry->getAuthorEmail() + , $feed_entry->getAuthorName() ); $this->assertEquals($author, $node->nodeValue); break; case 'pubDate': - $this->assertEquals($feed_entry->get_created_on()->format(DATE_RFC2822), $node->nodeValue); + $this->assertEquals($feed_entry->getCreatedOn()->format(DATE_RFC2822), $node->nodeValue); break; case 'guid': - $this->assertEquals($feed_entry->get_link()->get_href(), $node->nodeValue); + $this->assertEquals($feed_entry->getLink()->getURI(), $node->nodeValue); break; case 'link': - $this->assertEquals($feed_entry->get_link()->get_href(), $node->nodeValue); + $this->assertEquals($feed_entry->getLink()->getURI(), $node->nodeValue); break; } $count++; $this->checkRSSEntryItemsNode($xpath, $feed_entry, $count); } - $this->assertEquals($feed->get_count_total_entries(), $count); + $this->assertEquals($feed->getCountTotalEntries(), $count); } - public function checkRSSEntryItemsNode(\DOMXPath $xpath, \Feed_Entry_Adapter $entry, $count) + public function checkRSSEntryItemsNode(\DOMXPath $xpath, FeedEntry $entry, $count) { - $content = $entry->get_content(); + $content = $entry->getItems(); $available_medium = array('image', 'audio', 'video'); array_walk($content, $this->removeBadItems($content, $available_medium)); $media_group = $xpath->query("/rss/channel/item[" . $count . "]/media:group"); @@ -516,7 +374,7 @@ class RssFeedTest extends \PhraseanetWebTestCaseAbstract } } - public function verifyMediaItem(\Feed_Entry_Item $item, \DOMNode $node) + public function verifyMediaItem(FeedItem $item, \DOMNode $node) { foreach ($node->childNodes as $node) { if ($node->nodeType !== XML_TEXT_NODE) { @@ -543,11 +401,11 @@ class RssFeedTest extends \PhraseanetWebTestCaseAbstract return $current_attributes; } - public function checkMediaContentAttributes(\Feed_Entry_Item $entry_item, \DOMNode $node) + public function checkMediaContentAttributes(FeedItem $entry_item, \DOMNode $node) { $current_attributes = $this->parseAttributes($node); $is_thumbnail = false; - $record = $entry_item->get_record(); + $record = $entry_item->getRecord(); if (false !== strpos($current_attributes["url"], 'preview')) { $ressource = $record->get_subdef('preview'); @@ -602,7 +460,7 @@ class RssFeedTest extends \PhraseanetWebTestCaseAbstract } } - public function checkOptionnalMediaGroupNode(\DOMNode $node, \Feed_Entry_Item $entry_item) + public function checkOptionnalMediaGroupNode(\DOMNode $node, FeedItem $entry_item) { $fields = array( 'title' => array( @@ -690,7 +548,7 @@ class RssFeedTest extends \PhraseanetWebTestCaseAbstract if ($field["media_field"]["name"] == $node->nodeName && $role != false) { - if ($p4field = $entry_item->get_record()->get_caption()->get_dc_field($field["dc_field"])) { + if ($p4field = $entry_item->getRecord()->get_caption()->get_dc_field($field["dc_field"])) { $this->assertEquals($p4field->get_serialized_values($field["separator"]), $node->nodeValue, sprintf('Asserting good value for DC %s', $field["dc_field"])); if (sizeof($field["media_field"]["attributes"]) > 0) { foreach ($node->attributes as $attribute) { @@ -709,12 +567,12 @@ class RssFeedTest extends \PhraseanetWebTestCaseAbstract public function removeBadItems(Array &$item_entries, Array $available_medium) { $remove = function($entry_item, $key) use (&$item_entries, $available_medium) { - $preview_sd = $entry_item->get_record()->get_subdef('preview'); + $preview_sd = $entry_item->getRecord()->get_subdef('preview'); $url_preview = $preview_sd->get_permalink(); - $thumbnail_sd = $entry_item->get_record()->get_thumbnail(); + $thumbnail_sd = $entry_item->getRecord()->get_thumbnail(); $url_thumb = $thumbnail_sd->get_permalink(); - if (!in_array(strtolower($entry_item->get_record()->get_type()), $available_medium)) { + if (!in_array(strtolower($entry_item->getRecord()->get_type()), $available_medium)) { unset($item_entries[$key]); //remove } @@ -726,7 +584,7 @@ class RssFeedTest extends \PhraseanetWebTestCaseAbstract return $remove; } - public function verifyATOM(\Feed_Adapter $feed, $xml_string) + public function verifyATOM(Feed $feed, $xml_string) { $this->verifyXML($xml_string); $dom_doc = new \DOMDocument(); @@ -739,17 +597,17 @@ class RssFeedTest extends \PhraseanetWebTestCaseAbstract $this->checkATOMRootNode($dom_doc, $xpath, $feed); } - public function checkATOMRootNode(\DOMDocument $dom_doc, \DOMXPath $xpath, \Feed_Adapter $feed) + public function checkATOMRootNode(\DOMDocument $dom_doc, \DOMXPath $xpath, Feed $feed) { $ids = $xpath->query('/Atom:feed/Atom:id'); - $this->assertEquals($feed->get_homepage_link(self::$DI['app']['phraseanet.registry'], \Feed_Adapter::FORMAT_ATOM, 1)->get_href(), $ids->item(0)->nodeValue); + $this->assertEquals(self::$DI['app']['feed.user-link-generator']->generatePublic($feed, 'atom', 1)->getURI(), $ids->item(0)->nodeValue); $titles = $xpath->query('/Atom:feed/Atom:title'); - $this->assertEquals($feed->get_title(), $titles->item(0)->nodeValue); + $this->assertEquals($feed->getTitle(), $titles->item(0)->nodeValue); $subtitles = $xpath->query('/Atom:feed/Atom:subtitle'); if ($subtitles->length > 0) - $this->assertEquals($feed->get_subtitle(), $subtitles->item(0)->nodeValue); + $this->assertEquals($feed->getSubtitle(), $subtitles->item(0)->nodeValue); $updateds = $xpath->query('/Atom:feed/Atom:updated'); $this->assertTrue(new \DateTime() >= new \DateTime($updateds->item(0)->nodeValue)); @@ -759,14 +617,12 @@ class RssFeedTest extends \PhraseanetWebTestCaseAbstract $count = 0; $offset_start = 0; $n_entries = 20; - $collection = $feed->get_entries($offset_start, $n_entries); - $entries = $collection->get_entries(); + $entries = $feed->getEntries($offset_start, $n_entries); foreach ($entries_item as $entry) { if (sizeof($entries) == 0) { $offset_start = ($offset_start++) * $n_entries; - $collection = $feed->get_entries($offset_start, $n_entries); - $entries = $collection->get_entries(); + $entries = $feed->getEntries($offset_start, $n_entries); if (sizeof($entries) == 0) //no more break; } @@ -774,7 +630,7 @@ class RssFeedTest extends \PhraseanetWebTestCaseAbstract $this->checkATOMEntryNode($entry, $xpath, $feed, $feed_entry); $count++; } - $this->assertEquals($feed->get_count_total_entries(), $count); + $this->assertEquals($feed->getCountTotalEntries(), $count); } public function checkATOMEntryNode(\DOMNode $node, \DOMXPath $xpath, \Feed_Adapter $feed, \Feed_Entry_Adapter $entry) @@ -783,12 +639,13 @@ class RssFeedTest extends \PhraseanetWebTestCaseAbstract if ($child->nodeType !== XML_TEXT_NODE) { switch ($child->nodeName) { case 'id': - $this->assertEquals(sprintf('%sentry/%d/', $feed->get_homepage_link(self::$DI['app']['phraseanet.registry'], \Feed_Adapter::FORMAT_ATOM, 1)->get_href(), $entry->get_id()), $child->nodeValue); + + $this->assertEquals(sprintf('%sentry/%d/', self::$DI['app']['feed.user-link-generator']->generatePublic($feed, 'atom', 1)->getURI(), $entry->get_id()), $child->nodeValue); break; case 'link': foreach ($child->attributes as $attribute) { if ($attribute->name == "href") { - $this->assertEquals(sprintf('%sentry/%d/', $feed->get_homepage_link(self::$DI['app']['phraseanet.registry'], \Feed_Adapter::FORMAT_ATOM, 1)->get_href(), $entry->get_id()), $attribute->value); + $this->assertEquals(sprintf('%sentry/%d/', self::$DI['app']['feed.user-link-generator']->generatePublic($feed, 'atom', 1)->getURI(), $entry->get_id()), $attribute->value); break; } } diff --git a/tests/Alchemy/Tests/Phrasea/Feed/AggregateLinkGeneratorTest.php b/tests/Alchemy/Tests/Phrasea/Feed/AggregateLinkGeneratorTest.php index 17d21f31d2..e53f1e52cd 100644 --- a/tests/Alchemy/Tests/Phrasea/Feed/AggregateLinkGeneratorTest.php +++ b/tests/Alchemy/Tests/Phrasea/Feed/AggregateLinkGeneratorTest.php @@ -3,7 +3,7 @@ namespace Alchemy\Tests\Phrasea\Feed; use Alchemy\Phrasea\Feed\Aggregate; -use Alchemy\Phrasea\Feed\AggregateLinkGenerator; +use Alchemy\Phrasea\Feed\Link\AggregateLinkGenerator; use Entities\Feed; use Symfony\Component\Routing\Generator\UrlGenerator; @@ -22,7 +22,7 @@ class AggregateLinkGeneratorTest extends \PhraseanetPHPUnitAbstract $feeds = array($feed, $another_feed); - $aggregate = new Aggregate(self::$DI['app'], $feeds); + $aggregate = new Aggregate(self::$DI['app']['EM'], $feeds); $generator = $this->getMockBuilder('Symfony\Component\Routing\Generator\UrlGenerator') ->disableOriginalConstructor() diff --git a/tests/Alchemy/Tests/Phrasea/Feed/FeedLinkGeneratorTest.php b/tests/Alchemy/Tests/Phrasea/Feed/FeedLinkGeneratorTest.php new file mode 100644 index 0000000000..37c25d4db6 --- /dev/null +++ b/tests/Alchemy/Tests/Phrasea/Feed/FeedLinkGeneratorTest.php @@ -0,0 +1,194 @@ +persist($feed); + self::$DI['app']['EM']->flush(); + + $generator = $this->getMockBuilder('Symfony\Component\Routing\Generator\UrlGenerator') + ->disableOriginalConstructor() + ->getMock(); + + if ($alreadyCreated) { + $token = $this->insertOneFeedToken($feed, $user); + $tokenValue = $token->getValue(); + } + + $capture = null; + $generator->expects($this->once()) + ->method('generate') + ->with('feed_user', $this->isType('array'), UrlGenerator::ABSOLUTE_URL) + ->will($this->returnCallback(function ($name, $data, $option) use (&$capture, $expected) { + $capture = $data; + + return $expected; + })); + + $random = self::$DI['app']['tokens']; + + $linkGenerator = new FeedLinkGenerator($generator, self::$DI['app']['EM'], $random); + + $link = $linkGenerator->generate($feed, $user, $format, $page, $renew); + + $this->assertSame($expected, $link->getUri()); + if ($format == "atom") { + $this->assertSame("application/atom+xml", $link->getMimetype()); + $this->assertSame("Title - Atom", $link->getTitle()); + } + elseif ($format == "rss") { + $this->assertSame("application/rss+xml", $link->getMimetype()); + $this->assertSame("Title - RSS", $link->getTitle()); + } + + if ($alreadyCreated) { + if ($renew) { + $this->assertEquals($feed->getId(), $capture['id']); + $this->assertEquals($format, $capture['format']); + $this->assertNotEquals($tokenValue, $capture['token']); + if (null !== $page) { + $this->assertEquals($page, $capture['page']); + } + + $this->assertCount(0, self::$DI['app']['EM'] + ->getRepository("Entities\FeedToken") + ->findBy(array('value' => $tokenValue))); + $this->assertCount(1, self::$DI['app']['EM'] + ->getRepository("Entities\FeedToken") + ->findBy(array('value' => $capture['token']))); + } else { + $expectedParams = array( + 'token' => $tokenValue, + 'id' => $feed->getId(), + 'format' => $format, + ); + + if ($page !== null) { + $expectedParams['page'] = $page; + } + + $this->assertEquals($expectedParams, $capture); + + $this->assertCount(1, self::$DI['app']['EM'] + ->getRepository("Entities\FeedToken") + ->findBy(array('value' => $tokenValue))); + } + } else { + if (null !== $page) { + $this->assertEquals($page, $capture['page']); + } + $this->assertEquals($feed->getId(), $capture['id']); + $this->assertEquals($format, $capture['format']); + $this->assertEquals(12, strlen($capture['token'])); + + $this->assertCount(1, self::$DI['app']['EM'] + ->getRepository("Entities\FeedToken") + ->findBy(array('value' => $capture['token']))); + } + $token = self::$DI['app']['EM'] + ->getRepository('Entities\FeedToken') + ->findByFeedAndUser($feed, $user); + self::$DI['app']['EM']->remove($token); + self::$DI['app']['EM']->flush(); + } + + /** + * @dataProvider provideGenerationDataPublic + */ + public function testGeneratePublic($expected, $format, $feed, $page) + { + self::$DI['app']['EM']->persist($feed); + self::$DI['app']['EM']->flush(); + + $generator = $this->getMockBuilder('Symfony\Component\Routing\Generator\UrlGenerator') + ->disableOriginalConstructor() + ->getMock(); + + $capture = null; + $generator->expects($this->once()) + ->method('generate') + ->with('feed_public', $this->isType('array'), UrlGenerator::ABSOLUTE_URL) + ->will($this->returnCallback(function ($name, $data, $option) use (&$capture, $expected) { + $capture = $data; + + return $expected; + })); + + $random = self::$DI['app']['tokens']; + + $linkGenerator = new FeedLinkGenerator($generator, self::$DI['app']['EM'], $random); + + $link = $linkGenerator->generatePublic($feed, $format, $page); + + $this->assertSame($expected, $link->getUri()); + if ($format == "atom") { + $this->assertSame("application/atom+xml", $link->getMimetype()); + $this->assertSame("Title - Atom", $link->getTitle()); + } + elseif ($format == "rss") { + $this->assertSame("application/rss+xml", $link->getMimetype()); + $this->assertSame("Title - RSS", $link->getTitle()); + } + + if (null !== $page) { + $this->assertEquals($page, $capture['page']); + } + $this->assertEquals($feed->getId(), $capture['id']); + $this->assertEquals($format, $capture['format']); + } + + public function provideGenerationData() + { + $user = $this->getMockBuilder('User_Adapter') + ->disableOriginalConstructor() + ->getMock(); + + $user->expects($this->any()) + ->method('get_id') + ->will($this->returnValue(42)); + + $feed = new \Entities\Feed(); + $feed->setTitle('Title'); + + return array( + array('doliprane', 'atom', $feed, $user, null, false, false), + array('doliprane', 'atom', $feed, $user, null, false, true), + array('doliprane', 'atom', $feed, $user, null, true, false), + array('doliprane', 'atom', $feed, $user, null, true, true), + array('doliprane', 'atom', $feed, $user, 1, false, false), + array('doliprane', 'atom', $feed, $user, 1, false, true), + array('doliprane', 'atom', $feed, $user, 1, true, false), + array('doliprane', 'atom', $feed, $user, 1, true, true), + array('doliprane', 'rss', $feed, $user, null, false, false), + array('doliprane', 'rss', $feed, $user, null, false, true), + array('doliprane', 'rss', $feed, $user, null, true, false), + array('doliprane', 'rss', $feed, $user, null, true, true), + array('doliprane', 'rss', $feed, $user, 1, false, false), + array('doliprane', 'rss', $feed, $user, 1, false, true), + array('doliprane', 'rss', $feed, $user, 1, true, false), + array('doliprane', 'rss', $feed, $user, 1, true, true), + ); + } + + public function provideGenerationDataPublic() + { + $feed = new \Entities\Feed(); + $feed->setTitle('Title'); + + return array( + array('doliprane', 'atom', $feed, null), + array('doliprane', 'atom', $feed, 1), + array('doliprane', 'rss', $feed, null), + array('doliprane', 'rss', $feed, 1) + ); + } +} diff --git a/tests/classes/PhraseanetPHPUnitAbstract.php b/tests/classes/PhraseanetPHPUnitAbstract.php index 6aa28dc264..8efcbc6b93 100644 --- a/tests/classes/PhraseanetPHPUnitAbstract.php +++ b/tests/classes/PhraseanetPHPUnitAbstract.php @@ -331,7 +331,7 @@ abstract class PhraseanetPHPUnitAbstract extends WebTestCase * * @return \Entities\Feed */ - protected function insertOneFeed(\User_Adapter $user, $title = null) + protected function insertOneFeed(\User_Adapter $user, $title = null, $public = null) { try { $feedFixture = new PhraseaFixture\Feed\LoadOneFeed(); @@ -341,6 +341,10 @@ abstract class PhraseanetPHPUnitAbstract extends WebTestCase $feedFixture->setTitle($title); } + if ($public !== null) { + $feedFixture->setPublic($public); + } + $loader = new Loader(); $loader->addFixture($feedFixture); @@ -397,7 +401,10 @@ abstract class PhraseanetPHPUnitAbstract extends WebTestCase $token->setFeed($feed); $token->setUsrId($user->get_id()); + $feed->addToken($token); + self::$DI['app']['EM']->persist($token); + self::$DI['app']['EM']->persist($feed); self::$DI['app']['EM']->flush(); } catch (\Exception $e) { $this->fail('Fail to load one FeedToken : ' . $e->getMessage()); From eb1f9b57dd04b947cf32b04f415fae39c7c2c54b Mon Sep 17 00:00:00 2001 From: Andrey Date: Tue, 11 Jun 2013 11:17:56 +0200 Subject: [PATCH 09/67] fixed IE6 templates --- .../web/lightbox/IE6/feed_container.html.twig | 14 +++++++------- .../web/lightbox/IE6/feed_options_box.html.twig | 2 +- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/templates/web/lightbox/IE6/feed_container.html.twig b/templates/web/lightbox/IE6/feed_container.html.twig index 0c74835877..fee39c469f 100644 --- a/templates/web/lightbox/IE6/feed_container.html.twig +++ b/templates/web/lightbox/IE6/feed_container.html.twig @@ -1,16 +1,16 @@ {% block basket %}
- {% for element in feed_entry.get_content() %} + {% for element in feed_entry.getItems() %}
- - diff --git a/templates/web/lightbox/IE6/feed_options_box.html.twig b/templates/web/lightbox/IE6/feed_options_box.html.twig index 174b50637a..028fb4006c 100644 --- a/templates/web/lightbox/IE6/feed_options_box.html.twig +++ b/templates/web/lightbox/IE6/feed_options_box.html.twig @@ -22,7 +22,7 @@
- +
| {% endif %} From bc5b69fae4662ec98845eaf749e897220a634c3a Mon Sep 17 00:00:00 2001 From: Andrey Date: Tue, 11 Jun 2013 11:31:23 +0200 Subject: [PATCH 10/67] Fixed codestyle --- .../Phrasea/Controller/Admin/Publications.php | 2 +- lib/Alchemy/Phrasea/Controller/Lightbox.php | 3 --- lib/Alchemy/Phrasea/Controller/Prod/Feed.php | 4 ++-- lib/Alchemy/Phrasea/Controller/Prod/Root.php | 3 --- lib/Alchemy/Phrasea/Feed/AggregateToken.php | 2 +- .../Feed/Formatter/FeedFormatterInterface.php | 2 +- .../Feed/Link/LinkGeneratorInterface.php | 2 +- lib/Doctrine/Entities/Feed.php | 2 +- lib/Doctrine/Entities/FeedEntry.php | 2 +- lib/Doctrine/Entities/FeedItem.php | 2 +- lib/Doctrine/Entities/FeedPublisher.php | 24 +++++++++---------- lib/Doctrine/Entities/FeedToken.php | 2 +- .../Doctrine/Entities.AggregateToken.dcm.yml | 1 - 13 files changed, 22 insertions(+), 29 deletions(-) diff --git a/lib/Alchemy/Phrasea/Controller/Admin/Publications.php b/lib/Alchemy/Phrasea/Controller/Admin/Publications.php index 850183cb08..48829ac11c 100644 --- a/lib/Alchemy/Phrasea/Controller/Admin/Publications.php +++ b/lib/Alchemy/Phrasea/Controller/Admin/Publications.php @@ -107,7 +107,7 @@ class Publications implements ControllerProviderInterface return $app->redirectPath('admin_feeds_list'); })->before(function(Request $request) use ($app) { - $feed = $app["EM"]->getRepository("Entities\Feed")->findOneBy(array("id" => $request->attributes->get('id'))); + $feed = $app["EM"]->getRepository("Entities\Feed")->findOneBy(array("id" => $request->attributes->get('id'))); if (!$feed->getOwner($app['authentication']->getUser())) { return $app->redirectPath('admin_feeds_feed', array('id' => $request->attributes->get('id'), 'error' => _('You are not the owner of this feed, you can not edit it'))); diff --git a/lib/Alchemy/Phrasea/Controller/Lightbox.php b/lib/Alchemy/Phrasea/Controller/Lightbox.php index 5fcbf35441..28dae0b327 100644 --- a/lib/Alchemy/Phrasea/Controller/Lightbox.php +++ b/lib/Alchemy/Phrasea/Controller/Lightbox.php @@ -160,9 +160,7 @@ class Lightbox implements ControllerProviderInterface $controllers->get('/ajax/LOAD_FEED_ITEM/{entry_id}/{item_id}/', function(SilexApplication $app, $entry_id, $item_id) { -// $entry = \Feed_Entry_Adapter::load_from_id($app, $entry_id); $entry = $app['EM']->getRepository("Entities\FeedEntry")->find($entry_id); -// $item = new \Feed_Entry_Item($app['phraseanet.appbox'], $entry, $item_id); $item = $entry->getItems()->getItem($item_id); if ($app['browser']->isMobile()) { @@ -315,7 +313,6 @@ class Lightbox implements ControllerProviderInterface return $app->redirectPath('logout'); } -// $feed_entry = \Feed_Entry_Adapter::load_from_id($app, $entry_id); $feed_entry = $app['EM']->getEntity("Entities\FeedEntry")->find($entry_id); $template = 'lightbox/feed.html.twig'; diff --git a/lib/Alchemy/Phrasea/Controller/Prod/Feed.php b/lib/Alchemy/Phrasea/Controller/Prod/Feed.php index 8ede6dfdd6..f58b69f2d4 100644 --- a/lib/Alchemy/Phrasea/Controller/Prod/Feed.php +++ b/lib/Alchemy/Phrasea/Controller/Prod/Feed.php @@ -271,7 +271,7 @@ class Feed implements ControllerProviderInterface $output = array( 'texte' => '

' . _('publication::Voici votre fil RSS personnel. Il vous permettra d\'etre tenu au courrant des publications.') . '

' . _('publications::Ne le partagez pas, il est strictement confidentiel') . '

-
', +
', 'titre' => _('publications::votre rss personnel') ); @@ -288,7 +288,7 @@ class Feed implements ControllerProviderInterface $output = array( 'texte' => '

' . _('publication::Voici votre fil RSS personnel. Il vous permettra d\'etre tenu au courrant des publications.') . '

' . _('publications::Ne le partagez pas, il est strictement confidentiel') . '

-
', +
', 'titre' => _('publications::votre rss personnel') ); diff --git a/lib/Alchemy/Phrasea/Controller/Prod/Root.php b/lib/Alchemy/Phrasea/Controller/Prod/Root.php index dee619260b..607d403f39 100644 --- a/lib/Alchemy/Phrasea/Controller/Prod/Root.php +++ b/lib/Alchemy/Phrasea/Controller/Prod/Root.php @@ -73,10 +73,7 @@ class Root implements ControllerProviderInterface $cssfile = '000000'; } -// $user_feeds = \Feed_Collection::load_all($app, $app['authentication']->getUser()); -// $feeds = array_merge(array($user_feeds->get_aggregate()), $user_feeds->get_feeds()); $feeds = $app["EM"]->getRepository("Entities\Feed")->getAllForUser($app['authentication']->getUser()); -// $aggregate = new Aggregate($app, $user_feeds); $thjslist = ""; diff --git a/lib/Alchemy/Phrasea/Feed/AggregateToken.php b/lib/Alchemy/Phrasea/Feed/AggregateToken.php index 6ef2a26227..d19c4f807d 100644 --- a/lib/Alchemy/Phrasea/Feed/AggregateToken.php +++ b/lib/Alchemy/Phrasea/Feed/AggregateToken.php @@ -108,4 +108,4 @@ class AggregateToken { return $this->value; } -} \ No newline at end of file +} diff --git a/lib/Alchemy/Phrasea/Feed/Formatter/FeedFormatterInterface.php b/lib/Alchemy/Phrasea/Feed/Formatter/FeedFormatterInterface.php index 7ac7185652..7d6a8ecaeb 100644 --- a/lib/Alchemy/Phrasea/Feed/Formatter/FeedFormatterInterface.php +++ b/lib/Alchemy/Phrasea/Feed/Formatter/FeedFormatterInterface.php @@ -17,4 +17,4 @@ interface FeedFormatterInterface * @return string */ public function format(FeedInterface $feed, $page, \User_Adapter $user = null, $generator = 'Phraseanet'); -} \ No newline at end of file +} diff --git a/lib/Alchemy/Phrasea/Feed/Link/LinkGeneratorInterface.php b/lib/Alchemy/Phrasea/Feed/Link/LinkGeneratorInterface.php index 017b49d035..b701f0dcae 100644 --- a/lib/Alchemy/Phrasea/Feed/Link/LinkGeneratorInterface.php +++ b/lib/Alchemy/Phrasea/Feed/Link/LinkGeneratorInterface.php @@ -29,4 +29,4 @@ interface LinkGeneratorInterface public function generatePublic(FeedInterface $feed, $format, $page = null); public function supports(FeedInterface $feed); -} \ No newline at end of file +} diff --git a/lib/Doctrine/Entities/Feed.php b/lib/Doctrine/Entities/Feed.php index 1e52d82717..17f400e5f1 100644 --- a/lib/Doctrine/Entities/Feed.php +++ b/lib/Doctrine/Entities/Feed.php @@ -458,4 +458,4 @@ class Feed implements FeedInterface return true; return false; } -} \ No newline at end of file +} diff --git a/lib/Doctrine/Entities/FeedEntry.php b/lib/Doctrine/Entities/FeedEntry.php index 62c1ce0a2c..81ffb1dc36 100644 --- a/lib/Doctrine/Entities/FeedEntry.php +++ b/lib/Doctrine/Entities/FeedEntry.php @@ -314,4 +314,4 @@ class FeedEntry return null; } -} \ No newline at end of file +} diff --git a/lib/Doctrine/Entities/FeedItem.php b/lib/Doctrine/Entities/FeedItem.php index 1ec74e792d..b277e5cd2a 100644 --- a/lib/Doctrine/Entities/FeedItem.php +++ b/lib/Doctrine/Entities/FeedItem.php @@ -196,4 +196,4 @@ class FeedItem { $this->setOrd($this->getEntry()->getItems()->count() + 1); } -} \ No newline at end of file +} diff --git a/lib/Doctrine/Entities/FeedPublisher.php b/lib/Doctrine/Entities/FeedPublisher.php index 0bb630813a..4b8d3b5dfe 100644 --- a/lib/Doctrine/Entities/FeedPublisher.php +++ b/lib/Doctrine/Entities/FeedPublisher.php @@ -39,7 +39,7 @@ class FeedPublisher /** * Get id * - * @return integer + * @return integer */ public function getId() { @@ -55,14 +55,14 @@ class FeedPublisher public function setUsrId($usrId) { $this->usr_id = $usrId; - + return $this; } /** * Get usr_id * - * @return integer + * @return integer */ public function getUsrId() { @@ -78,14 +78,14 @@ class FeedPublisher public function setOwner($owner) { $this->owner = $owner; - + return $this; } /** * Get owner * - * @return boolean + * @return boolean */ public function getOwner() { @@ -101,24 +101,24 @@ class FeedPublisher public function setFeed(\Entities\Feed $feed = null) { $this->feed = $feed; - + return $this; } /** * Get feed * - * @return \Entities\Feed + * @return \Entities\Feed */ public function getFeed() { return $this->feed; } - + public function getUser(Application $app) { $user = \User_Adapter::getInstance($this->getUsrId(), $app); - + return $user; } @@ -131,17 +131,17 @@ class FeedPublisher public function setCreatedOn($createdOn) { $this->created_on = $createdOn; - + return $this; } /** * Get created_on * - * @return \DateTime + * @return \DateTime */ public function getCreatedOn() { return $this->created_on; } -} \ No newline at end of file +} diff --git a/lib/Doctrine/Entities/FeedToken.php b/lib/Doctrine/Entities/FeedToken.php index 9b1f35c72e..7b84961c92 100644 --- a/lib/Doctrine/Entities/FeedToken.php +++ b/lib/Doctrine/Entities/FeedToken.php @@ -105,4 +105,4 @@ class FeedToken { return $this->value; } -} \ No newline at end of file +} diff --git a/lib/conf.d/Doctrine/Entities.AggregateToken.dcm.yml b/lib/conf.d/Doctrine/Entities.AggregateToken.dcm.yml index 43eb71ae75..67851464a5 100644 --- a/lib/conf.d/Doctrine/Entities.AggregateToken.dcm.yml +++ b/lib/conf.d/Doctrine/Entities.AggregateToken.dcm.yml @@ -17,4 +17,3 @@ Entities\AggregateToken: type: string length: 12 nullable: true - \ No newline at end of file From dec41aeb4f6a25069bb56df757d99f231f4ac144 Mon Sep 17 00:00:00 2001 From: Andrey Date: Tue, 11 Jun 2013 18:02:38 +0200 Subject: [PATCH 11/67] Fixed codestyle --- .../Phrasea/Controller/Admin/Publications.php | 59 +++--- lib/Alchemy/Phrasea/Controller/Lightbox.php | 4 +- lib/Alchemy/Phrasea/Controller/Prod/Feed.php | 182 ++++++++---------- lib/Alchemy/Phrasea/Controller/Prod/Root.php | 2 +- .../Phrasea/Controller/Root/RSSFeeds.php | 18 +- lib/Alchemy/Phrasea/Feed/Aggregate.php | 2 +- lib/Doctrine/Entities/Feed.php | 14 +- lib/Doctrine/Entities/FeedPublisher.php | 10 +- .../Controller/Admin/PublicationTest.php | 20 +- .../Phrasea/Controller/Prod/FeedTest.php | 66 ++----- .../Phrasea/Controller/Root/RSSFeedTest.php | 4 +- .../Core/Provider/FeedServiceProviderTest.php | 4 +- .../Feed/AggregateLinkGeneratorTest.php | 8 +- .../Phrasea/Feed/FeedLinkGeneratorTest.php | 8 +- 14 files changed, 176 insertions(+), 225 deletions(-) diff --git a/lib/Alchemy/Phrasea/Controller/Admin/Publications.php b/lib/Alchemy/Phrasea/Controller/Admin/Publications.php index 48829ac11c..49c55fe43b 100644 --- a/lib/Alchemy/Phrasea/Controller/Admin/Publications.php +++ b/lib/Alchemy/Phrasea/Controller/Admin/Publications.php @@ -38,7 +38,7 @@ class Publications implements ControllerProviderInterface $controllers->get('/list/', function(PhraseaApplication $app) { - $feeds = $app["EM"]->getRepository("Entities\Feed")->getAllForUser( + $feeds = $app['EM']->getRepository('Entities\Feed')->getAllForUser( $app['authentication']->getUser() ); @@ -54,11 +54,12 @@ class Publications implements ControllerProviderInterface $publisher->setFeed($feed); $publisher->setUsrId($app['authentication']->getUser()->get_id()); - $publisher->setOwner(true); + $publisher->setIsOwner(true); $feed->addPublisher($publisher); $feed->setTitle($request->request->get('title')); $feed->setSubtitle($request->request->get('subtitle')); + $feed->setIconUrl(false); if ($request->request->get('public') == '1') { $feed->setPublic(true); @@ -68,16 +69,16 @@ class Publications implements ControllerProviderInterface $publisher->setFeed($feed); - $app["EM"]->persist($feed); - $app["EM"]->persist($publisher); + $app['EM']->persist($feed); + $app['EM']->persist($publisher); - $app["EM"]->flush(); + $app['EM']->flush(); return $app->redirectPath('admin_feeds_list'); })->bind('admin_feeds_create'); $controllers->get('/feed/{id}/', function(PhraseaApplication $app, Request $request, $id) { - $feed = $app["EM"]->getRepository("Entities\Feed")->findOneBy(array("id" => $id)); + $feed = $app["EM"]->find('Entities\Feed', $id); return $app['twig'] ->render('admin/publications/fiche.html.twig', array('feed' => $feed, 'error' => $app['request']->query->get('error'))); @@ -87,27 +88,27 @@ class Publications implements ControllerProviderInterface $controllers->post('/feed/{id}/update/', function(PhraseaApplication $app, Request $request, $id) { - $feed = $app["EM"]->getRepository("Entities\Feed")->findOneBy(array("id" => $id)); + $feed = $app["EM"]->find('Entities\Feed', $id); try { $collection = \collection::get_from_base_id($app, $request->request->get('base_id')); } catch (\Exception $e) { $collection = null; } - if (null !== $request->request->get('title')) { - $feed->setTitle($request->request->get('title')); + if (null !== $title = $request->request->get('title')) { + $feed->setTitle($title); } - if (null !== $request->request->get('subtitle')) { - $feed->setSubtitle($request->request->get('subtitle')); + if (null !== $subtitle = $request->request->get('subtitle')) { + $feed->setSubtitle($subtitle); } $feed->setCollection($collection); $feed->setPublic($request->request->get('public') === '1' ? true : false); - $app["EM"]->persist($feed); - $app["EM"]->flush(); + $app['EM']->persist($feed); + $app['EM']->flush(); return $app->redirectPath('admin_feeds_list'); })->before(function(Request $request) use ($app) { - $feed = $app["EM"]->getRepository("Entities\Feed")->findOneBy(array("id" => $request->attributes->get('id'))); + $feed = $app["EM"]->find('Entities\Feed', $request->attributes->get('id')); if (!$feed->getOwner($app['authentication']->getUser())) { return $app->redirectPath('admin_feeds_feed', array('id' => $request->attributes->get('id'), 'error' => _('You are not the owner of this feed, you can not edit it'))); @@ -121,7 +122,7 @@ class Publications implements ControllerProviderInterface 'success' => false, 'message' => '', ); - $feed = $app["EM"]->getRepository("Entities\Feed")->findOneBy(array("id" => $id)); + $feed = $app["EM"]->find('Entities\Feed', $id); $request = $app["request"]; @@ -173,7 +174,7 @@ class Publications implements ControllerProviderInterface $datas['success'] = true; } catch (\Exception $e) { - $datas['message'] = _('Unable to add file to Phraseanet'); + $datas['message'] = _('Unable to add file to Phraseanet') . $e->getMessage(); } return $app->json($datas); @@ -186,19 +187,19 @@ class Publications implements ControllerProviderInterface try { $request = $app['request']; $user = \User_Adapter::getInstance($request->request->get('usr_id'), $app); - $feed = $app["EM"]->getRepository("Entities\Feed")->findOneBy(array("id" => $id)); + $feed = $app["EM"]->find('Entities\Feed', $id); $publisher = new FeedPublisher(); $publisher->setUsrId($user->get_id()); - $publisher->setOwner(false); + $publisher->setIsOwner(false); $publisher->setFeed($feed); $feed->addPublisher($publisher); - $app["EM"]->persist($feed); - $app["EM"]->persist($publisher); + $app['EM']->persist($feed); + $app['EM']->persist($publisher); - $app["EM"]->flush(); + $app['EM']->flush(); } catch (\Exception $e) { $error = $e->getMessage(); } @@ -212,9 +213,9 @@ class Publications implements ControllerProviderInterface try { $request = $app['request']; - $feed = $app["EM"]->getRepository("Entities\Feed")->findOneBy(array("id" => $id)); + $feed = $app["EM"]->find('Entities\Feed', $id); - $publisher = $app["EM"]->getRepository("Entities\FeedPublisher")->findOneBy(array("id" => $request->request->get('publisher_id'))); + $publisher = $app["EM"]->find('Entities\FeedPublisher', $request->request->get('publisher_id')); if (null === $publisher) { throw new \Exception_Feed_PublisherNotFound(); } @@ -223,8 +224,8 @@ class Publications implements ControllerProviderInterface if ($feed->isPublisher($user) === true && $feed->isOwner($user) === false) { $feed->removePublisher($publisher); - $app["EM"]->remove($publisher); - $app["EM"]->flush(); + $app['EM']->remove($publisher); + $app['EM']->flush(); } } catch (\Exception $e) { $error = $e->getMessage(); @@ -236,13 +237,13 @@ class Publications implements ControllerProviderInterface ->assert('id', '\d+'); $controllers->post('/feed/{id}/delete/', function(PhraseaApplication $app, $id) { - $feed = $app["EM"]->getRepository("Entities\Feed")->findOneBy(array("id" => $id)); + $feed = $app["EM"]->find('Entities\Feed', $id); $publishers = $feed->getPublishers(); foreach ($publishers as $publisher) { - $app["EM"]->remove($publisher); + $app['EM']->remove($publisher); } - $app["EM"]->remove($feed); - $app["EM"]->flush(); + $app['EM']->remove($feed); + $app['EM']->flush(); return $app->redirectPath('admin_feeds_list'); }) diff --git a/lib/Alchemy/Phrasea/Controller/Lightbox.php b/lib/Alchemy/Phrasea/Controller/Lightbox.php index 28dae0b327..56c966e2c0 100644 --- a/lib/Alchemy/Phrasea/Controller/Lightbox.php +++ b/lib/Alchemy/Phrasea/Controller/Lightbox.php @@ -160,7 +160,7 @@ class Lightbox implements ControllerProviderInterface $controllers->get('/ajax/LOAD_FEED_ITEM/{entry_id}/{item_id}/', function(SilexApplication $app, $entry_id, $item_id) { - $entry = $app['EM']->getRepository("Entities\FeedEntry")->find($entry_id); + $entry = $app['EM']->getRepository('Entities\FeedEntry')->find($entry_id); $item = $entry->getItems()->getItem($item_id); if ($app['browser']->isMobile()) { @@ -313,7 +313,7 @@ class Lightbox implements ControllerProviderInterface return $app->redirectPath('logout'); } - $feed_entry = $app['EM']->getEntity("Entities\FeedEntry")->find($entry_id); + $feed_entry = $app['EM']->getEntity('Entities\FeedEntry')->find($entry_id); $template = 'lightbox/feed.html.twig'; diff --git a/lib/Alchemy/Phrasea/Controller/Prod/Feed.php b/lib/Alchemy/Phrasea/Controller/Prod/Feed.php index f58b69f2d4..4f905eacdf 100644 --- a/lib/Alchemy/Phrasea/Controller/Prod/Feed.php +++ b/lib/Alchemy/Phrasea/Controller/Prod/Feed.php @@ -44,7 +44,7 @@ class Feed implements ControllerProviderInterface * I got a selection of docs, which publications are available forthese docs ? */ $controllers->post('/requestavailable/', function(Application $app, Request $request) { - $feeds = $app["EM"]->getRepository("Entities\Feed")->getAllForUser($app['authentication']->getUser()); + $feeds = $app['EM']->getRepository('Entities\Feed')->getAllForUser($app['authentication']->getUser()); $publishing = RecordsRequest::fromRequest($app, $request, true, array(), array('bas_chupub')); return $app['twig']->render('prod/actions/publish/publish.html.twig', array('publishing' => $publishing, 'feeds' => $feeds)); @@ -55,8 +55,8 @@ class Feed implements ControllerProviderInterface */ $controllers->post('/entry/create/', function(Application $app, Request $request) { try { - $feed = $app["EM"]->getRepository("Entities\Feed")->find($request->request->get('feed_id')); - $publisher = $app["EM"]->getRepository("Entities\FeedPublisher")->findByUser($feed, $app['authentication']->getUser()); + $feed = $app['EM']->getRepository('Entities\Feed')->find($request->request->get('feed_id')); + $publisher = $app['EM']->getRepository('Entities\FeedPublisher')->findByUser($feed, $app['authentication']->getUser()); $title = $request->request->get('title'); $subtitle = $request->request->get('subtitle'); $author_name = $request->request->get('author_name'); @@ -79,12 +79,12 @@ class Feed implements ControllerProviderInterface $item->setRecordId($record->get_record_id()); $item->setSbasId($record->get_sbas_id()); $entry->addItem($item); - $app["EM"]->persist($item); + $app['EM']->persist($item); } - $app["EM"]->persist($entry); - $app["EM"]->persist($feed); - $app["EM"]->flush(); + $app['EM']->persist($entry); + $app['EM']->persist($feed); + $app['EM']->flush(); $app['events-manager']->trigger('__FEED_ENTRY_CREATE__', array('entry_id' => $entry->getId()), $entry); @@ -101,13 +101,13 @@ class Feed implements ControllerProviderInterface }); $controllers->get('/entry/{id}/edit/', function(Application $app, Request $request, $id) { - $entry = $app["EM"]->getRepository("Entities\FeedEntry")->find($id); + $entry = $app['EM']->getRepository('Entities\FeedEntry')->find($id); if (!$entry->isPublisher($app['authentication']->getUser())) { throw new AccessDeniedHttpException(); } - $feeds = $app["EM"]->getRepository("Entities\Feed")->findAll(); + $feeds = $app['EM']->getRepository('Entities\Feed')->findAll(); $datas = $app['twig']->render('prod/actions/publish/publish_edit.html.twig', array('entry' => $entry, 'feeds' => $feeds)); @@ -121,75 +121,62 @@ class Feed implements ControllerProviderInterface $controllers->post('/entry/{id}/update/', function(Application $app, Request $request, $id) { $datas = array('error' => true, 'message' => '', 'datas' => ''); - try { - $entry = $app["EM"]->getRepository("Entities\FeedEntry")->find($id); + $entry = $app['EM']->getRepository('Entities\FeedEntry')->find($id); - if (null === $entry) { - throw new NotFoundHttpException(); - } - if (!$entry->isPublisher($app['authentication']->getUser())) { - throw new AccessDeniedHttpException(); - } - - $title = $request->request->get('title'); - $subtitle = $request->request->get('subtitle'); - $author_name = $request->request->get('author_name'); - $author_mail = $request->request->get('author_mail'); - - $entry->setAuthorEmail($author_mail) - ->setAuthorName($author_name) - ->setTitle($title) - ->setSubtitle($subtitle); - - $current_feed_id = $entry->getFeed()->getId(); - $new_feed_id = $request->request->get('feed_id', $current_feed_id); - if ($current_feed_id != $new_feed_id) { - try { - $new_feed = $app["EM"]->getRepository("Entities\Feed")->loadWithUser($app, $app['authentication']->getUser(), $new_feed_id); - } catch (NotFoundHttpException $e) { - throw new AccessDeniedHttpException('You have no access to this feed'); - } - - if ($new_feed === null) { - throw new NotFoundHttpException(); - } - - if (!$new_feed->isPublisher($app['authentication']->getUser())) { - throw new \Exception_Forbidden('You are not publisher of this feed'); - } - $entry->setFeed($new_feed); - } - - $items = explode(';', $request->request->get('sorted_lst')); - - foreach ($items as $item_sort) { - $item_sort_datas = explode('_', $item_sort); - if (count($item_sort_datas) != 2) { - continue; - } - - $item = new FeedItem($entry, $item_sort_datas[0]); - $item->setEntry($entry); - $entry->addItem($item); - $item->setOrd($item_sort_datas[1]); - $app["EM"]->persist($item); - } - - $app["EM"]->persist($entry); - $app["EM"]->flush(); - - $entry = $app['twig']->render('prod/feeds/entry.html.twig', array('entry' => $entry)); - - $datas = array('error' => false, 'message' => 'succes', 'datas' => $entry); - } catch (\Exception_Feed_EntryNotFound $e) { - $datas['message'] = _('Feed entry not found'); - } catch (NotFoundHttpException $e) { - $datas['message'] = _('Feed not found'); - } catch (AccessDeniedHttpException $e) { - $datas['message'] = _('You are not authorized to access this feed'); - } catch (\Exception $e) { - $datas['message'] = $e->getMessage(); + if (null === $entry) { + $app->abort(404, 'Entry not found'); } + if (!$entry->isPublisher($app['authentication']->getUser())) { + $app->abort(403, 'Unathorized action'); + } + + $title = $request->request->get('title'); + $subtitle = $request->request->get('subtitle'); + $author_name = $request->request->get('author_name'); + $author_mail = $request->request->get('author_mail'); + + $entry->setAuthorEmail($author_mail) + ->setAuthorName($author_name) + ->setTitle($title) + ->setSubtitle($subtitle); + + $current_feed_id = $entry->getFeed()->getId(); + $new_feed_id = $request->request->get('feed_id', $current_feed_id); + if ($current_feed_id != $new_feed_id) { + + $new_feed = $app['EM']->getRepository('Entities\Feed')->find($new_feed_id); + + if ($new_feed === null) { + $app->abort(404, 'Feed not found'); + } + + if (!$new_feed->isPublisher($app['authentication']->getUser())) { + $app->abort(403, 'You are not publisher of this feed'); + } + $entry->setFeed($new_feed); + } + + $items = explode(';', $request->request->get('sorted_lst')); + + foreach ($items as $item_sort) { + $item_sort_datas = explode('_', $item_sort); + if (count($item_sort_datas) != 2) { + continue; + } + + $item = new FeedItem($entry, $item_sort_datas[0]); + $item->setEntry($entry); + $entry->addItem($item); + $item->setOrd($item_sort_datas[1]); + $app['EM']->persist($item); + } + + $app['EM']->persist($entry); + $app['EM']->flush(); + + $entry = $app['twig']->render('prod/feeds/entry.html.twig', array('entry' => $entry)); + + $datas = array('error' => false, 'message' => 'succes', 'datas' => $entry); return $app->json($datas); }) @@ -200,25 +187,20 @@ class Feed implements ControllerProviderInterface $controllers->post('/entry/{id}/delete/', function(Application $app, Request $request, $id) { $datas = array('error' => true, 'message' => ''); - try { - $entry = $app["EM"]->getRepository("Entities\FeedEntry")->find($id); + + $entry = $app['EM']->getRepository('Entities\FeedEntry')->find($id); - if (null === $entry) { - throw new NotFoundHttpException(); - } - if (!$entry->isPublisher($app['authentication']->getUser()) && $entry->getFeed()->isOwner($app['authentication']->getUser()) === false) { - throw new AccessDeniedHttpException(_('Action Forbidden : You are not the publisher')); - } - - $app["EM"]->remove($entry); - $app["EM"]->flush(); - - $datas = array('error' => false, 'message' => 'succes'); - } catch (NotFoundHttpException $e) { - $datas['message'] = _('Feed entry not found'); - } catch (\Exception $e) { - $datas['message'] = $e->getMessage(); + if (null === $entry) { + $app->abort(404, 'Entry not found'); } + if (!$entry->isPublisher($app['authentication']->getUser()) && $entry->getFeed()->isOwner($app['authentication']->getUser()) === false) { + $app->abort(403, _('Action Forbidden : You are not the publisher')); + } + + $app['EM']->remove($entry); + $app['EM']->flush(); + + $datas = array('error' => false, 'message' => 'succes'); return $app->json($datas); }) @@ -232,12 +214,12 @@ class Feed implements ControllerProviderInterface $page = (int) $request->query->get('page'); $page = $page > 0 ? $page : 1; - $feeds = $app["EM"]->getRepository("Entities\Feed")->findAll(); + $feeds = $app['EM']->getRepository('Entities\Feed')->findAll(); $datas = $app['twig']->render('prod/feeds/feeds.html.twig' , array( 'feeds' => $feeds - , 'feed' => new Aggregate($app["EM"], $feeds) + , 'feed' => new Aggregate($app['EM'], $feeds) , 'page' => $page ) ); @@ -249,8 +231,8 @@ class Feed implements ControllerProviderInterface $page = (int) $request->query->get('page'); $page = $page > 0 ? $page : 1; - $feed = $app["EM"]->getRepository("Entities\Feed")->loadWithUser($app, $app['authentication']->getUser(), $id); - $feeds = $app["EM"]->getRepository("Entities\Feed")->findAll(); + $feed = $app['EM']->getRepository('Entities\Feed')->loadWithUser($app, $app['authentication']->getUser(), $id); + $feeds = $app['EM']->getRepository('Entities\Feed')->findAll(); $datas = $app['twig']->render('prod/feeds/feeds.html.twig', array('feed' => $feed, 'feeds' => $feeds, 'page' => $page)); @@ -262,9 +244,9 @@ class Feed implements ControllerProviderInterface $controllers->get('/subscribe/aggregated/', function(Application $app, Request $request) { $renew = ($request->query->get('renew') === 'true'); - $feeds = $app["EM"]->getRepository("Entities\Feed")->findAll(); + $feeds = $app['EM']->getRepository('Entities\Feed')->findAll(); - $aggregate = new Aggregate($app["EM"], $feeds); + $aggregate = new Aggregate($app['EM'], $feeds); $link = $app['feed.aggregate-link-generator']->generate($aggregate, $app['authentication']->getUser(), AggregateLinkGenerator::FORMAT_RSS, null, $renew); @@ -281,7 +263,7 @@ class Feed implements ControllerProviderInterface $controllers->get('/subscribe/{id}/', function(Application $app, Request $request, $id) { $renew = ($request->query->get('renew') === 'true'); - $feed = $app["EM"]->getRepository("Entities\Feed")->loadWithUser($app, $app['authentication']->getUser(), $id); + $feed = $app['EM']->getRepository('Entities\Feed')->loadWithUser($app, $app['authentication']->getUser(), $id); $link = $app['feed.user-link-generator']->generate($feed, $app['authentication']->getUser(), FeedLinkGenerator::FORMAT_RSS, null, $renew); diff --git a/lib/Alchemy/Phrasea/Controller/Prod/Root.php b/lib/Alchemy/Phrasea/Controller/Prod/Root.php index 607d403f39..39222da584 100644 --- a/lib/Alchemy/Phrasea/Controller/Prod/Root.php +++ b/lib/Alchemy/Phrasea/Controller/Prod/Root.php @@ -73,7 +73,7 @@ class Root implements ControllerProviderInterface $cssfile = '000000'; } - $feeds = $app["EM"]->getRepository("Entities\Feed")->getAllForUser($app['authentication']->getUser()); + $feeds = $app['EM']->getRepository('Entities\Feed')->getAllForUser($app['authentication']->getUser()); $thjslist = ""; diff --git a/lib/Alchemy/Phrasea/Controller/Root/RSSFeeds.php b/lib/Alchemy/Phrasea/Controller/Root/RSSFeeds.php index 02870affb5..e4c22e3ed2 100644 --- a/lib/Alchemy/Phrasea/Controller/Root/RSSFeeds.php +++ b/lib/Alchemy/Phrasea/Controller/Root/RSSFeeds.php @@ -30,7 +30,7 @@ class RSSFeeds implements ControllerProviderInterface $controllers = $app['controllers_factory']; $controllers->get('/feed/{id}/{format}/', function(Application $app, $id, $format) { - $feed = $app["EM"]->getRepository("Entities\Feed")->find($id); + $feed = $app['EM']->getRepository('Entities\Feed')->find($id); if (!$feed) { return new Response('Not Found', 404); @@ -52,7 +52,7 @@ class RSSFeeds implements ControllerProviderInterface ->assert('format', '(rss|atom)'); $controllers->get('/userfeed/{token}/{id}/{format}/', function(Application $app, $token, $id, $format) { - $token = $app["EM"]->getRepository("Entities\FeedToken")->findOneBy(array("id" => $id)); + $token = $app["EM"]->find('Entities\FeedToken', $id); $feed = $token->getFeed(); $usrId = $token->getUsrId(); @@ -70,14 +70,14 @@ class RSSFeeds implements ControllerProviderInterface ->assert('format', '(rss|atom)'); $controllers->get('/userfeed/aggregated/{token}/{format}/', function(Application $app, $token, $format) { - $token = $app["EM"]->getRepository("Entities\AggregateToken")->findOneBy(array("value" => $token)); + $token = $app['EM']->getRepository('Entities\AggregateToken')->findOneBy(array("value" => $token)); $usrId = $token->getUsrId(); $user = \User_Adapter::getInstance($usrId, $app); - $feeds = $app["EM"]->getRepository('Entities\Feed')->getAllForUser($user); + $feeds = $app['EM']->getRepository('Entities\Feed')->getAllForUser($user); - $aggregate = new Aggregate($app["EM"], $feeds, $token); + $aggregate = new Aggregate($app['EM'], $feeds, $token); $request = $app['request']; @@ -90,8 +90,8 @@ class RSSFeeds implements ControllerProviderInterface ->assert('format', '(rss|atom)'); $controllers->get('/aggregated/{format}/', function(Application $app, $format) { - $feeds = $app["EM"]->getRepository("Entities\Feed")->findAllPublic(); - $feed = new Aggregate($app["EM"], $feeds); + $feeds = $app['EM']->getRepository('Entities\Feed')->findAllPublic(); + $feed = new Aggregate($app['EM'], $feeds); $request = $app['request']; $page = (int) $request->query->get('page'); @@ -103,8 +103,8 @@ class RSSFeeds implements ControllerProviderInterface ->assert('format', '(rss|atom)'); $controllers->get('/cooliris/', function(Application $app) { - $feeds = $app["EM"]->getRepository("Entities\Feed")->findAllPublic(); - $feed = new Aggregate($app["EM"], $feeds); + $feeds = $app['EM']->getRepository('Entities\Feed')->findAllPublic(); + $feed = new Aggregate($app['EM'], $feeds); $request = $app['request']; $page = (int) $request->query->get('page'); diff --git a/lib/Alchemy/Phrasea/Feed/Aggregate.php b/lib/Alchemy/Phrasea/Feed/Aggregate.php index 03d90e979a..75ca82667d 100644 --- a/lib/Alchemy/Phrasea/Feed/Aggregate.php +++ b/lib/Alchemy/Phrasea/Feed/Aggregate.php @@ -145,7 +145,7 @@ class Aggregate implements FeedInterface public function getCountTotalEntries() { if (count($this->feeds) > 0) { - return count($this->em->getRepository("Entities\FeedEntry")->findByFeeds($this->feeds)); + return count($this->em->getRepository('Entities\FeedEntry')->findByFeeds($this->feeds)); } return 0; } diff --git a/lib/Doctrine/Entities/Feed.php b/lib/Doctrine/Entities/Feed.php index 17f400e5f1..7b4bd64d5e 100644 --- a/lib/Doctrine/Entities/Feed.php +++ b/lib/Doctrine/Entities/Feed.php @@ -22,7 +22,7 @@ class Feed implements FeedInterface private $public = false; /** - * @var string + * @var boolean */ private $icon_url = false; @@ -111,7 +111,7 @@ class Feed implements FeedInterface /** * Set icon_url * - * @param string $iconUrl + * @param boolean $iconUrl * @return Feed */ public function setIconUrl($iconUrl) @@ -124,15 +124,11 @@ class Feed implements FeedInterface /** * Get icon_url * - * @return string + * @return boolean */ public function getIconUrl() { - if (!$this->icon_url) { - return '/skins/icons/rss32.gif'; - } - - return '/www/custom/feed_' . $this->getId() . '.jpg'; + return $this->icon_url; } /** @@ -253,7 +249,7 @@ class Feed implements FeedInterface public function getOwner() { foreach ($this->getPublishers() as $publisher) { - if ($publisher->getOwner()) { + if ($publisher->isOwner()) { return $publisher; } } diff --git a/lib/Doctrine/Entities/FeedPublisher.php b/lib/Doctrine/Entities/FeedPublisher.php index 4b8d3b5dfe..ea72984973 100644 --- a/lib/Doctrine/Entities/FeedPublisher.php +++ b/lib/Doctrine/Entities/FeedPublisher.php @@ -75,7 +75,7 @@ class FeedPublisher * @param boolean $owner * @return FeedPublisher */ - public function setOwner($owner) + public function setIsOwner($owner) { $this->owner = $owner; @@ -87,7 +87,7 @@ class FeedPublisher * * @return boolean */ - public function getOwner() + public function isOwner() { return $this->owner; } @@ -115,6 +115,12 @@ class FeedPublisher return $this->feed; } + + /** + * Get user + * + * @return \User_Adapter + */ public function getUser(Application $app) { $user = \User_Adapter::getInstance($this->getUsrId(), $app); diff --git a/tests/Alchemy/Tests/Phrasea/Controller/Admin/PublicationTest.php b/tests/Alchemy/Tests/Phrasea/Controller/Admin/PublicationTest.php index 2e47c8620c..6a6371ee0e 100644 --- a/tests/Alchemy/Tests/Phrasea/Controller/Admin/PublicationTest.php +++ b/tests/Alchemy/Tests/Phrasea/Controller/Admin/PublicationTest.php @@ -13,7 +13,7 @@ class Module_Admin_Route_PublicationTest extends \PhraseanetWebTestCaseAuthentic $crawler = self::$DI['client']->request('GET', '/admin/publications/list/'); $pageContent = self::$DI['client']->getResponse()->getContent(); $this->assertTrue(self::$DI['client']->getResponse()->isOk()); - $feeds = self::$DI['app']['EM']->getRepository("Entities\Feed")->getAllForUser(self::$DI['user']); + $feeds = self::$DI['app']['EM']->getRepository('Entities\Feed')->getAllForUser(self::$DI['user']); foreach ($feeds as $feed) { $this->assertRegExp('/\/admin\/publications\/feed\/' . $feed->getId() . '/', $pageContent); @@ -26,14 +26,14 @@ class Module_Admin_Route_PublicationTest extends \PhraseanetWebTestCaseAuthentic public function testCreate() { - $feeds = self::$DI['app']['EM']->getRepository("Entities\Feed")->getAllForUser(self::$DI['user']); + $feeds = self::$DI['app']['EM']->getRepository('Entities\Feed')->getAllForUser(self::$DI['user']); $count = sizeof($feeds); $crawler = self::$DI['client']->request('POST', '/admin/publications/create/', array("title" => "hello", "subtitle" => "coucou", "base_id" => self::$DI['collection']->get_base_id())); $this->assertTrue(self::$DI['client']->getResponse()->isRedirect('/admin/publications/list/')); - $feeds = self::$DI['app']['EM']->getRepository("Entities\Feed")->getAllForUser(self::$DI['user']); + $feeds = self::$DI['app']['EM']->getRepository('Entities\Feed')->getAllForUser(self::$DI['user']); $count_after = sizeof($feeds); $this->assertGreaterThan($count, $count_after); } @@ -58,7 +58,7 @@ class Module_Admin_Route_PublicationTest extends \PhraseanetWebTestCaseAuthentic , 'public' => '1' )); - $feed = self::$DI['app']['EM']->getRepository("Entities\Feed")->findOneBy(array('id' => $feed->getId())); + $feed = self::$DI['app']['EM']->find('Entities\Feed', $feed->getId()); $this->assertTrue( strpos( @@ -89,7 +89,7 @@ class Module_Admin_Route_PublicationTest extends \PhraseanetWebTestCaseAuthentic , '/admin/publications/list/' ) === 0); - $feed = self::$DI['app']['EM']->getRepository("Entities\Feed")->findOneBy(array('id' => $feed->getId())); + $feed = self::$DI['app']['EM']->find('Entities\Feed', $feed->getId()); $collection = $feed->getCollection(self::$DI['app']); @@ -213,7 +213,7 @@ class Module_Admin_Route_PublicationTest extends \PhraseanetWebTestCaseAuthentic $response = self::$DI['client']->getResponse(); $this->assertTrue($response->isRedirect()); - $feed = self::$DI['app']['EM']->getRepository("Entities\Feed")->findOneBy(array('id' => $feed->getId())); + $feed = self::$DI['app']['EM']->find('Entities\Feed', $feed->getId()); $publishers = $feed->getPublishers(); $this->assertTrue($feed->isPublisher(self::$DI['user_alt1'])); @@ -230,7 +230,7 @@ class Module_Admin_Route_PublicationTest extends \PhraseanetWebTestCaseAuthentic self::$DI['client']->request("POST", "/admin/publications/feed/" . $feed->getId() . "/addpublisher/"); - $feed = self::$DI['app']['EM']->getRepository("Entities\Feed")->findOneBy(array('id' => $feed->getId())); + $feed = self::$DI['app']['EM']->find('Entities\Feed', $feed->getId()); $response = self::$DI['client']->getResponse(); $this->assertTrue($response->isRedirect()); $this->assertTrue( @@ -251,7 +251,7 @@ class Module_Admin_Route_PublicationTest extends \PhraseanetWebTestCaseAuthentic $response = self::$DI['client']->getResponse(); $this->assertTrue($response->isRedirect()); - $feed = self::$DI['app']['EM']->getRepository("Entities\Feed")->findOneBy(array('id' => $feed->getId())); + $feed = self::$DI['app']['EM']->find('Entities\Feed', $feed->getId()); $publishers = $feed->getPublishers(); $this->assertFalse(isset($publishers[self::$DI['user_alt1']->get_id()])); @@ -271,7 +271,7 @@ class Module_Admin_Route_PublicationTest extends \PhraseanetWebTestCaseAuthentic $response = self::$DI['client']->getResponse(); $this->assertTrue($response->isRedirect()); - $feed = self::$DI['app']['EM']->getRepository("Entities\Feed")->findOneBy(array('id' => $feed->getId())); + $feed = self::$DI['app']['EM']->find('Entities\Feed', $feed->getId()); $this->assertTrue( strpos( @@ -289,7 +289,7 @@ class Module_Admin_Route_PublicationTest extends \PhraseanetWebTestCaseAuthentic $response = self::$DI['client']->getResponse(); $this->assertTrue($response->isRedirect()); - $feed = self::$DI['app']['EM']->getRepository("Entities\Feed")->findOneBy(array('id' => $feed->getId())); + $feed = self::$DI['app']['EM']->find('Entities\Feed', $feed->getId()); if (null !== $feed) { $this->fail("fail deleting feed"); } diff --git a/tests/Alchemy/Tests/Phrasea/Controller/Prod/FeedTest.php b/tests/Alchemy/Tests/Phrasea/Controller/Prod/FeedTest.php index da8e27b91d..2845ae2f8b 100644 --- a/tests/Alchemy/Tests/Phrasea/Controller/Prod/FeedTest.php +++ b/tests/Alchemy/Tests/Phrasea/Controller/Prod/FeedTest.php @@ -5,7 +5,7 @@ namespace Alchemy\Tests\Phrasea\Controller\Prod; use Alchemy\Phrasea\Application; use Symfony\Component\CssSelector\CssSelector; -class ControllerFeedTest extends \PhraseanetWebTestCaseAuthenticatedAbstract +class FeedTest extends \PhraseanetWebTestCaseAuthenticatedAbstract { /** * @@ -55,7 +55,7 @@ class ControllerFeedTest extends \PhraseanetWebTestCaseAuthenticatedAbstract $crawler = self::$DI['client']->request('POST', '/prod/feeds/requestavailable/'); $this->assertTrue(self::$DI['client']->getResponse()->isOk()); - $feeds = self::$DI['app']["EM"]->getRepository("\Entities\Feed")->getAllForUser(self::$DI['user']); + $feeds = self::$DI['app']['EM']->getRepository('Entities\Feed')->getAllForUser(self::$DI['user']); foreach ($feeds as $one_feed) { if ($one_feed->isPublisher(self::$DI['user'])) { $this->assertEquals(1, $crawler->filterXPath("//input[@value='" . $one_feed->getId() . "']")->count()); @@ -183,17 +183,17 @@ class ControllerFeedTest extends \PhraseanetWebTestCaseAuthenticatedAbstract $this->assertTrue(is_string($pageContent->datas)); $this->assertRegExp("/entry_" . $entry->getId() . "/", $pageContent->datas); - $retrievedentry = self::$DI['app']["EM"]->getRepository("\Entities\FeedEntry")->find($entry->getId()); + $retrievedentry = self::$DI['app']['EM']->getRepository('Entities\FeedEntry')->find($entry->getId()); $this->assertEquals($newfeed->getId(), $retrievedentry->getFeed()->getId()); } public function testEntryUpdateChangeFeedNoAccess() { $entry = $this->insertOneFeedEntry(self::$DI['user']); - $newfeed = $this->insertOneFeed(self::$DI['user'], "test2"); + $newfeed = $this->insertOneFeed(self::$DI['user_alt1'], "test2"); $newfeed->setCollection(self::$DI['collection_no_access']); - self::$DI['app']["EM"]->persist($newfeed); - self::$DI['app']["EM"]->flush(); + self::$DI['app']['EM']->persist($newfeed); + self::$DI['app']['EM']->flush(); $params = array( "feed_id" => $newfeed->getId(), @@ -205,12 +205,7 @@ class ControllerFeedTest extends \PhraseanetWebTestCaseAuthenticatedAbstract ); $crawler = self::$DI['client']->request('POST', '/prod/feeds/entry/' . $entry->getId() . '/update/', $params); - $this->assertTrue(self::$DI['client']->getResponse()->isOk()); - $this->assertEquals("application/json", self::$DI['client']->getResponse()->headers->get("content-type")); - $pageContent = json_decode(self::$DI['client']->getResponse()->getContent()); - $this->assertTrue(is_object($pageContent)); - $this->assertTrue($pageContent->error); - $this->assertTrue(is_string($pageContent->message)); + $this->assertEquals(403, self::$DI['client']->getResponse()->getStatusCode()); } public function testEntryUpdateChangeFeedInvalidFeed() @@ -227,12 +222,7 @@ class ControllerFeedTest extends \PhraseanetWebTestCaseAuthenticatedAbstract ); $crawler = self::$DI['client']->request('POST', '/prod/feeds/entry/' . $entry->getId() . '/update/', $params); - $this->assertTrue(self::$DI['client']->getResponse()->isOk()); - $this->assertEquals("application/json", self::$DI['client']->getResponse()->headers->get("content-type")); - $pageContent = json_decode(self::$DI['client']->getResponse()->getContent()); - $this->assertTrue(is_object($pageContent)); - $this->assertTrue($pageContent->error); - $this->assertTrue(is_string($pageContent->message)); + $this->assertEquals(404, self::$DI['client']->getResponse()->getStatusCode()); } public function testEntryUpdateNotFound() @@ -253,11 +243,7 @@ class ControllerFeedTest extends \PhraseanetWebTestCaseAuthenticatedAbstract $pageContent = json_decode($response->getContent()); - $this->assertTrue($response->isOk()); - $this->assertEquals("application/json", $response->headers->get("content-type")); - $this->assertTrue(is_object($pageContent)); - $this->assertTrue($pageContent->error); - $this->assertTrue(is_string($pageContent->message)); + $this->assertEquals(404, self::$DI['client']->getResponse()->getStatusCode()); } public function testEntryUpdateFailed() @@ -277,13 +263,7 @@ class ControllerFeedTest extends \PhraseanetWebTestCaseAuthenticatedAbstract $response = self::$DI['client']->getResponse(); - $this->assertTrue($response->isOk()); - $pageContent = json_decode($response->getContent()); - - $this->assertEquals("application/json", $response->headers->get("content-type")); - $this->assertTrue(is_object($pageContent)); - $this->assertTrue($pageContent->error); - $this->assertTrue(is_string($pageContent->message)); + $this->assertEquals(404, self::$DI['client']->getResponse()->getStatusCode()); } public function testEntryUpdateUnauthorized() @@ -307,13 +287,7 @@ class ControllerFeedTest extends \PhraseanetWebTestCaseAuthenticatedAbstract $response = self::$DI['client']->getResponse(); - $this->assertTrue($response->isOk()); - $pageContent = json_decode($response->getContent()); - - $this->assertEquals("application/json", $response->headers->get("content-type")); - $this->assertTrue(is_object($pageContent)); - $this->assertTrue($pageContent->error); - $this->assertTrue(is_string($pageContent->message)); + $this->assertEquals(403, self::$DI['client']->getResponse()->getStatusCode());; } public function testDelete() @@ -332,7 +306,7 @@ class ControllerFeedTest extends \PhraseanetWebTestCaseAuthenticatedAbstract $this->assertTrue(is_string($pageContent->message)); try { - self::$DI["app"]["EM"]->getRepository("\Entities\FeedEntry")->find($entry->getId()); + self::$DI["app"]['EM']->getRepository('Entities\FeedEntry')->find($entry->getId()); $this->fail("Failed to delete entry"); } catch (\Exception $e) { @@ -348,11 +322,7 @@ class ControllerFeedTest extends \PhraseanetWebTestCaseAuthenticatedAbstract $pageContent = json_decode(self::$DI['client']->getResponse()->getContent()); - $this->assertTrue($response->isOk()); - $this->assertEquals("application/json", $response->headers->get("content-type")); - $this->assertTrue(is_object($pageContent)); - $this->assertTrue($pageContent->error); - $this->assertTrue(is_string($pageContent->message)); + $this->assertEquals(404, self::$DI['client']->getResponse()->getStatusCode()); } public function testDeleteUnauthorized() @@ -368,11 +338,7 @@ class ControllerFeedTest extends \PhraseanetWebTestCaseAuthenticatedAbstract $pageContent = json_decode(self::$DI['client']->getResponse()->getContent()); - $this->assertTrue($response->isOk()); - $this->assertEquals("application/json", $response->headers->get("content-type")); - $this->assertTrue(is_object($pageContent)); - $this->assertTrue($pageContent->error); - $this->assertTrue(is_string($pageContent->message)); + $this->assertEquals(403, self::$DI['client']->getResponse()->getStatusCode()); } public function testRoot() @@ -384,7 +350,7 @@ class ControllerFeedTest extends \PhraseanetWebTestCaseAuthenticatedAbstract $this->assertTrue(self::$DI['client']->getResponse()->isOk()); - $feeds = self::$DI['app']["EM"]->getRepository("\Entities\Feed")->getAllForUser(self::$DI['user']); + $feeds = self::$DI['app']['EM']->getRepository('Entities\Feed')->getAllForUser(self::$DI['user']); foreach ($feeds as $one_feed) { @@ -404,7 +370,7 @@ class ControllerFeedTest extends \PhraseanetWebTestCaseAuthenticatedAbstract $feed = $this->insertOneFeed(self::$DI['user']); - $feeds = self::$DI['app']["EM"]->getRepository("\Entities\Feed")->getAllForUser(self::$DI['user']); + $feeds = self::$DI['app']['EM']->getRepository('Entities\Feed')->getAllForUser(self::$DI['user']); $crawler = self::$DI['client']->request('GET', '/prod/feeds/feed/' . $feed->getId() . "/"); $pageContent = self::$DI['client']->getResponse()->getContent(); diff --git a/tests/Alchemy/Tests/Phrasea/Controller/Root/RSSFeedTest.php b/tests/Alchemy/Tests/Phrasea/Controller/Root/RSSFeedTest.php index 0ebbd57551..7cbbbee057 100644 --- a/tests/Alchemy/Tests/Phrasea/Controller/Root/RSSFeedTest.php +++ b/tests/Alchemy/Tests/Phrasea/Controller/Root/RSSFeedTest.php @@ -175,7 +175,7 @@ class RssFeedTest extends \PhraseanetWebTestCaseAbstract $this->insertOneFeed(self::$DI['user'], "test1", true); $this->insertOneFeed(self::$DI['user'], "test2", true); - $all_feeds = self::$DI['app']['EM']->getRepository("Entities\Feed")->findAllPublic(); + $all_feeds = self::$DI['app']['EM']->getRepository('Entities\Feed')->findAllPublic(); foreach ($all_feeds as $feed) { $this->assertTrue($feed->getPublic()); @@ -192,7 +192,7 @@ class RssFeedTest extends \PhraseanetWebTestCaseAbstract $this->insertOneFeed(self::$DI['user'], "test1", true); $this->insertOneFeed(self::$DI['user'], "test2", true); - $all_feeds = self::$DI['app']['EM']->getRepository("Entities\Feed")->findAllPublic(); + $all_feeds = self::$DI['app']['EM']->getRepository('Entities\Feed')->findAllPublic(); foreach ($all_feeds as $feed) { $this->assertTrue($feed->getPublic()); diff --git a/tests/Alchemy/Tests/Phrasea/Core/Provider/FeedServiceProviderTest.php b/tests/Alchemy/Tests/Phrasea/Core/Provider/FeedServiceProviderTest.php index 0f160ae1c4..3dfd282d4b 100644 --- a/tests/Alchemy/Tests/Phrasea/Core/Provider/FeedServiceProviderTest.php +++ b/tests/Alchemy/Tests/Phrasea/Core/Provider/FeedServiceProviderTest.php @@ -3,9 +3,9 @@ namespace Alchemy\Tests\Phrasea\Core\Provider; /** - * @covers Alchemy\Phrasea\Core\Provider\GeonamesServiceProvider + * @covers Alchemy\Phrasea\Core\Provider\FeedServiceProvider */ -class GeonamesServiceProvidertest extends ServiceProviderTestCase +class FeedServiceProviderTest extends ServiceProviderTestCase { public function provideServiceDescription() { diff --git a/tests/Alchemy/Tests/Phrasea/Feed/AggregateLinkGeneratorTest.php b/tests/Alchemy/Tests/Phrasea/Feed/AggregateLinkGeneratorTest.php index e53f1e52cd..ad5e7424cc 100644 --- a/tests/Alchemy/Tests/Phrasea/Feed/AggregateLinkGeneratorTest.php +++ b/tests/Alchemy/Tests/Phrasea/Feed/AggregateLinkGeneratorTest.php @@ -67,10 +67,10 @@ class AggregateLinkGeneratorTest extends \PhraseanetPHPUnitAbstract $this->assertNotEquals($tokenValue, $capture['token']); $this->assertCount(0, self::$DI['app']['EM'] - ->getRepository("Entities\AggregateToken") + ->getRepository('Entities\AggregateToken') ->findBy(array('value' => $tokenValue))); $this->assertCount(1, self::$DI['app']['EM'] - ->getRepository("Entities\AggregateToken") + ->getRepository('Entities\AggregateToken') ->findBy(array('value' => $capture['token']))); } else { $expectedParams = array( @@ -85,7 +85,7 @@ class AggregateLinkGeneratorTest extends \PhraseanetPHPUnitAbstract $this->assertEquals($expectedParams, $capture); $this->assertCount(1, self::$DI['app']['EM'] - ->getRepository("Entities\AggregateToken") + ->getRepository('Entities\AggregateToken') ->findBy(array('value' => $tokenValue))); } } else { @@ -96,7 +96,7 @@ class AggregateLinkGeneratorTest extends \PhraseanetPHPUnitAbstract $this->assertEquals(12, strlen($capture['token'])); $this->assertCount(1, self::$DI['app']['EM'] - ->getRepository("Entities\AggregateToken") + ->getRepository('Entities\AggregateToken') ->findBy(array('value' => $capture['token']))); } $token = self::$DI['app']['EM'] diff --git a/tests/Alchemy/Tests/Phrasea/Feed/FeedLinkGeneratorTest.php b/tests/Alchemy/Tests/Phrasea/Feed/FeedLinkGeneratorTest.php index 37c25d4db6..90e417a925 100644 --- a/tests/Alchemy/Tests/Phrasea/Feed/FeedLinkGeneratorTest.php +++ b/tests/Alchemy/Tests/Phrasea/Feed/FeedLinkGeneratorTest.php @@ -60,10 +60,10 @@ class FeedLinkGeneratorTest extends \PhraseanetPHPUnitAbstract } $this->assertCount(0, self::$DI['app']['EM'] - ->getRepository("Entities\FeedToken") + ->getRepository('Entities\FeedToken') ->findBy(array('value' => $tokenValue))); $this->assertCount(1, self::$DI['app']['EM'] - ->getRepository("Entities\FeedToken") + ->getRepository('Entities\FeedToken') ->findBy(array('value' => $capture['token']))); } else { $expectedParams = array( @@ -79,7 +79,7 @@ class FeedLinkGeneratorTest extends \PhraseanetPHPUnitAbstract $this->assertEquals($expectedParams, $capture); $this->assertCount(1, self::$DI['app']['EM'] - ->getRepository("Entities\FeedToken") + ->getRepository('Entities\FeedToken') ->findBy(array('value' => $tokenValue))); } } else { @@ -91,7 +91,7 @@ class FeedLinkGeneratorTest extends \PhraseanetPHPUnitAbstract $this->assertEquals(12, strlen($capture['token'])); $this->assertCount(1, self::$DI['app']['EM'] - ->getRepository("Entities\FeedToken") + ->getRepository('Entities\FeedToken') ->findBy(array('value' => $capture['token']))); } $token = self::$DI['app']['EM'] From ec5a38d5f5664881fa0d733960c8ae19767916dc Mon Sep 17 00:00:00 2001 From: Andrey Date: Tue, 11 Jun 2013 18:11:52 +0200 Subject: [PATCH 12/67] Fixed 404 and 403 responses --- lib/Alchemy/Phrasea/Controller/Root/RSSFeeds.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/lib/Alchemy/Phrasea/Controller/Root/RSSFeeds.php b/lib/Alchemy/Phrasea/Controller/Root/RSSFeeds.php index e4c22e3ed2..68e41056ab 100644 --- a/lib/Alchemy/Phrasea/Controller/Root/RSSFeeds.php +++ b/lib/Alchemy/Phrasea/Controller/Root/RSSFeeds.php @@ -33,11 +33,11 @@ class RSSFeeds implements ControllerProviderInterface $feed = $app['EM']->getRepository('Entities\Feed')->find($id); if (!$feed) { - return new Response('Not Found', 404); + $app->abort(404, 'Feed not found'); } if (!$feed->getPublic()) { - return new Response('Forbidden', 403); + $app->abort(403, 'Forbidden'); } $request = $app['request']; From 9a5baff4a0f80eded116efa527ea40ab62189f8c Mon Sep 17 00:00:00 2001 From: Andrey Date: Wed, 12 Jun 2013 11:29:41 +0200 Subject: [PATCH 13/67] Fixed iconurl integration --- .../Phrasea/Controller/Admin/Publications.php | 21 +++++++--- .../web/admin/publications/fiche.html.twig | 8 +++- .../web/admin/publications/list.html.twig | 6 ++- .../Controller/Admin/PublicationTest.php | 40 +++++-------------- 4 files changed, 36 insertions(+), 39 deletions(-) diff --git a/lib/Alchemy/Phrasea/Controller/Admin/Publications.php b/lib/Alchemy/Phrasea/Controller/Admin/Publications.php index 49c55fe43b..9cc1d585fd 100644 --- a/lib/Alchemy/Phrasea/Controller/Admin/Publications.php +++ b/lib/Alchemy/Phrasea/Controller/Admin/Publications.php @@ -124,12 +124,14 @@ class Publications implements ControllerProviderInterface ); $feed = $app["EM"]->find('Entities\Feed', $id); + if (null === $feed) { + $app->abort(404, "Feed not found"); + } + $request = $app["request"]; - if (!$feed->getOwner($app['authentication']->getUser())) { - $datas['message'] = 'You are not allowed to do that'; - - return $app->json($datas); + if (!$feed->isOwner($app['authentication']->getUser())) { + $app->abort(403, "Access Forbidden"); } try { @@ -170,6 +172,15 @@ class Publications implements ControllerProviderInterface unset($media); + $feed->setIconUrl(true); + $app['EM']->persist($feed); + $app['EM']->flush(); + + $baseDir = realpath(__DIR__ . '/../../../../../'); + + $app['filesystem']->copy($tmpname, $baseDir . '/config/feed_' . $feed->getId() . '.jpg'); + $app['filesystem']->copy($tmpname, 'custom/feed_' . $feed->getId() . '.jpg'); + $app['filesystem']->remove($tmpname); $datas['success'] = true; @@ -217,7 +228,7 @@ class Publications implements ControllerProviderInterface $publisher = $app["EM"]->find('Entities\FeedPublisher', $request->request->get('publisher_id')); if (null === $publisher) { - throw new \Exception_Feed_PublisherNotFound(); + $app->abort(404, "Feed Publisher not found"); } $user = $publisher->getUser($app); diff --git a/templates/web/admin/publications/fiche.html.twig b/templates/web/admin/publications/fiche.html.twig index ce47d325a9..75ea22fc7c 100644 --- a/templates/web/admin/publications/fiche.html.twig +++ b/templates/web/admin/publications/fiche.html.twig @@ -11,7 +11,11 @@
- +
@@ -145,7 +149,7 @@ {{ publisher.getUser(app).get_email() }} - {% if publisher.getOwner() == true %} + {% if publisher.isOwner() == true %} X {% else %}
diff --git a/templates/web/admin/publications/list.html.twig b/templates/web/admin/publications/list.html.twig index f5cfde8d94..522b44bc71 100644 --- a/templates/web/admin/publications/list.html.twig +++ b/templates/web/admin/publications/list.html.twig @@ -64,7 +64,11 @@ diff --git a/tests/Alchemy/Tests/Phrasea/Controller/Admin/PublicationTest.php b/tests/Alchemy/Tests/Phrasea/Controller/Admin/PublicationTest.php index 6a6371ee0e..5245b96978 100644 --- a/tests/Alchemy/Tests/Phrasea/Controller/Admin/PublicationTest.php +++ b/tests/Alchemy/Tests/Phrasea/Controller/Admin/PublicationTest.php @@ -107,32 +107,22 @@ class Module_Admin_Route_PublicationTest extends \PhraseanetWebTestCaseAuthentic public function testIconUploadErrorOwner() { - $this->markTestSkipped(); // icon upload being changed + $feed = $this->insertOneFeed(self::$DI['user_alt1']); - $feed = \Feed_Adapter::create(self::$DI['app'], self::$DI['user_alt1'], "salut", 'coucou'); - - self::$DI['client']->request("POST", "/admin/publications/feed/" . $feed->get_id() . "/iconupload/", array(), array(), array('HTTP_ACCEPT' => 'application/json')); + self::$DI['client']->request("POST", "/admin/publications/feed/" . $feed->getId() . "/iconupload/", array(), array(), array('HTTP_ACCEPT' => 'application/json')); $response = self::$DI['client']->getResponse(); - $this->assertTrue($response->isOk()); - - $content = json_decode($response->getContent()); - - $this->assertFalse($content->success); - - $feed->delete(); + $this->assertEquals(403, $response->getStatusCode()); } public function testIconUploadErrorFileData() { - $this->markTestSkipped(); // icon upload being changed - - $feed = \Feed_Adapter::create(self::$DI['app'], self::$DI['user'], "salut", 'coucou'); + $feed = $this->insertOneFeed(self::$DI['user']); self::$DI['client']->request( "POST" - , "/admin/publications/feed/" . $feed->get_id() . "/iconupload/" + , "/admin/publications/feed/" . $feed->getId() . "/iconupload/" , array() , array('Filedata' => array('error' => 1)) ); @@ -142,19 +132,15 @@ class Module_Admin_Route_PublicationTest extends \PhraseanetWebTestCaseAuthentic $content = json_decode($response->getContent()); $this->assertFalse($content->success); - - $feed->delete(); } public function testIconUploadErrorFileType() { - $this->markTestSkipped(); // icon upload being changed - - $feed = \Feed_Adapter::create(self::$DI['app'], self::$DI['user'], "salut", 'coucou'); + $feed = $this->insertOneFeed(self::$DI['user']); self::$DI['client']->request( "POST" - , "/admin/publications/feed/" . $feed->get_id() . "/iconupload/" + , "/admin/publications/feed/" . $feed->getId() . "/iconupload/" , array() , array('Filedata' => array('error' => 0, 'tmp_name' => __DIR__ . '/../../../../../files/test007.ppt')) ); @@ -164,15 +150,11 @@ class Module_Admin_Route_PublicationTest extends \PhraseanetWebTestCaseAuthentic $content = json_decode($response->getContent()); $this->assertFalse($content->success); - - $feed->delete(); } public function testIconUpload() { - $this->markTestSkipped(); // icon upload being changed - - $feed = \Feed_Adapter::create(self::$DI['app'], self::$DI['user'], "salut", 'coucou'); + $feed = $this->insertOneFeed(self::$DI['user']); $files = array( 'files' => array( @@ -184,7 +166,7 @@ class Module_Admin_Route_PublicationTest extends \PhraseanetWebTestCaseAuthentic self::$DI['client']->request( "POST" - , "/admin/publications/feed/" . $feed->get_id() . "/iconupload/" + , "/admin/publications/feed/" . $feed->getId() . "/iconupload/" , array() , $files ); @@ -196,10 +178,6 @@ class Module_Admin_Route_PublicationTest extends \PhraseanetWebTestCaseAuthentic $content = json_decode($response->getContent()); $this->assertTrue($content->success); - - $feed = new \Feed_Adapter(self::$DI['app'], $feed->get_id()); - - $feed->delete(); } public function testAddPublisher() From 84300f3c92d9f14d159cbe961eef06d703149a00 Mon Sep 17 00:00:00 2001 From: Andrey Date: Wed, 12 Jun 2013 17:54:36 +0200 Subject: [PATCH 14/67] Replaced remaining occurrences of Feed_ classes, updated tests --- .../Phrasea/Controller/Admin/Publications.php | 4 +- lib/Alchemy/Phrasea/Controller/Lightbox.php | 17 ++-- .../Phrasea/Controller/Root/RSSFeeds.php | 4 +- .../Phrasea/Feed/Formatter/AtomFormatter.php | 3 +- .../Feed/Formatter/CoolirisFormatter.php | 27 +++--- .../Feed/Formatter/FeedFormatterAbstract.php | 12 ++- .../Feed/Formatter/FeedFormatterInterface.php | 2 +- .../Phrasea/Feed/Formatter/RssFormatter.php | 3 +- lib/Doctrine/Entities/Feed.php | 4 +- lib/Doctrine/Entities/FeedItem.php | 7 +- .../Repositories/SessionRepository.php | 2 +- lib/classes/API/V1/adapter.php | 83 ++++++++-------- lib/classes/eventsmanager/notify/feed.php | 2 +- lib/classes/record/preview.php | 24 ++--- .../PhraseaFixture/Feed/LoadOneFeed.php | 95 +++++++++++++++++++ templates/mobile/lightbox/feed.html.twig | 18 ++-- .../mobile/lightbox/feed_element.html.twig | 6 +- .../web/admin/publications/fiche.html.twig | 4 +- .../web/admin/publications/list.html.twig | 2 +- templates/web/lightbox/IE6/feed.html.twig | 20 ++-- .../web/lightbox/IE6/feed_container.html.twig | 4 +- .../lightbox/IE6/feed_options_box.html.twig | 2 +- templates/web/lightbox/feed.html.twig | 20 ++-- .../web/lightbox/feed_container.html.twig | 4 +- .../web/lightbox/feed_options_box.html.twig | 2 +- .../prod/actions/publish/publish.html.twig | 2 +- .../Tests/Phrasea/Application/ApiAbstract.php | 91 ++++++------------ .../Phrasea/Application/LightboxTest.php | 30 +++--- .../Controller/Admin/PublicationTest.php | 4 +- .../Phrasea/Controller/Prod/FeedTest.php | 35 +------ .../Phrasea/Controller/Prod/RecordsTest.php | 39 +------- .../Phrasea/Controller/Root/RSSFeedTest.php | 26 ++--- tests/classes/PhraseanetPHPUnitAbstract.php | 8 +- 33 files changed, 310 insertions(+), 296 deletions(-) create mode 100644 lib/conf.d/PhraseaFixture/Feed/LoadOneFeed.php diff --git a/lib/Alchemy/Phrasea/Controller/Admin/Publications.php b/lib/Alchemy/Phrasea/Controller/Admin/Publications.php index 9cc1d585fd..e19bf9d6df 100644 --- a/lib/Alchemy/Phrasea/Controller/Admin/Publications.php +++ b/lib/Alchemy/Phrasea/Controller/Admin/Publications.php @@ -62,7 +62,7 @@ class Publications implements ControllerProviderInterface $feed->setIconUrl(false); if ($request->request->get('public') == '1') { - $feed->setPublic(true); + $feed->setIsPublic(true); } elseif ($request->request->get('base_id')) { $feed->setCollection(\collection::get_from_base_id($app, $request->request->get('base_id'))); } @@ -102,7 +102,7 @@ class Publications implements ControllerProviderInterface $feed->setSubtitle($subtitle); } $feed->setCollection($collection); - $feed->setPublic($request->request->get('public') === '1' ? true : false); + $feed->setIsPublic($request->request->get('public') === '1' ? true : false); $app['EM']->persist($feed); $app['EM']->flush(); diff --git a/lib/Alchemy/Phrasea/Controller/Lightbox.php b/lib/Alchemy/Phrasea/Controller/Lightbox.php index 56c966e2c0..440be22108 100644 --- a/lib/Alchemy/Phrasea/Controller/Lightbox.php +++ b/lib/Alchemy/Phrasea/Controller/Lightbox.php @@ -161,12 +161,12 @@ class Lightbox implements ControllerProviderInterface $controllers->get('/ajax/LOAD_FEED_ITEM/{entry_id}/{item_id}/', function(SilexApplication $app, $entry_id, $item_id) { $entry = $app['EM']->getRepository('Entities\FeedEntry')->find($entry_id); - $item = $entry->getItems()->getItem($item_id); + $item = $entry->getItem($item_id); if ($app['browser']->isMobile()) { $output = $app['twig']->render('lightbox/feed_element.html.twig', array( 'feed_element' => $item, - 'module_name' => $item->getRecord()->get_title() + 'module_name' => $item->getRecord($app)->get_title() ) ); @@ -181,12 +181,12 @@ class Lightbox implements ControllerProviderInterface } $ret = array(); - $ret['number'] = $item->get_record()->get_number(); - $ret['title'] = $item->get_record()->get_title(); + $ret['number'] = $item->getRecord($app)->get_number(); + $ret['title'] = $item->getRecord($app)->get_title(); - $ret['preview'] = $app['twig']->render($template_preview, array('record' => $item->get_record(), 'not_wrapped' => true)); + $ret['preview'] = $app['twig']->render($template_preview, array('record' => $item->getRecord($app), 'not_wrapped' => true)); $ret['options_html'] = $app['twig']->render($template_options, array('feed_element' => $item)); - $ret['caption'] = $app['twig']->render($template_caption, array('view' => 'preview', 'record' => $item->get_record())); + $ret['caption'] = $app['twig']->render($template_caption, array('view' => 'preview', 'record' => $item->getRecord($app))); $ret['agreement_html'] = $ret['selector_html'] = $ret['note_html'] = ''; @@ -313,7 +313,7 @@ class Lightbox implements ControllerProviderInterface return $app->redirectPath('logout'); } - $feed_entry = $app['EM']->getEntity('Entities\FeedEntry')->find($entry_id); + $feed_entry = $app['EM']->getRepository('Entities\FeedEntry')->find($entry_id); $template = 'lightbox/feed.html.twig'; @@ -322,10 +322,11 @@ class Lightbox implements ControllerProviderInterface } $content = $feed_entry->getItems(); + $first = $content->first(); $output = $app['twig']->render($template, array( 'feed_entry' => $feed_entry, - 'first_item' => array_shift($content), + 'first_item' => $first, 'local_title' => $feed_entry->getTitle(), 'module' => 'lightbox', 'module_name' => _('admin::monitor: module validation') diff --git a/lib/Alchemy/Phrasea/Controller/Root/RSSFeeds.php b/lib/Alchemy/Phrasea/Controller/Root/RSSFeeds.php index 68e41056ab..705cd18e36 100644 --- a/lib/Alchemy/Phrasea/Controller/Root/RSSFeeds.php +++ b/lib/Alchemy/Phrasea/Controller/Root/RSSFeeds.php @@ -36,7 +36,7 @@ class RSSFeeds implements ControllerProviderInterface $app->abort(404, 'Feed not found'); } - if (!$feed->getPublic()) { + if (!$feed->isPublic()) { $app->abort(403, 'Forbidden'); } @@ -110,7 +110,7 @@ class RSSFeeds implements ControllerProviderInterface $page = (int) $request->query->get('page'); $page = $page < 1 ? 1 : $page; - return $app[$this->getFormater('cooliris')]->createResponse($feed, $page); + return $app[$this->getFormater('cooliris')]->createResponse($feed, $page, null, 'Phraseanet', $app); }) ->bind('feed_public_cooliris'); diff --git a/lib/Alchemy/Phrasea/Feed/Formatter/AtomFormatter.php b/lib/Alchemy/Phrasea/Feed/Formatter/AtomFormatter.php index c207d47eab..c81a6d70a7 100644 --- a/lib/Alchemy/Phrasea/Feed/Formatter/AtomFormatter.php +++ b/lib/Alchemy/Phrasea/Feed/Formatter/AtomFormatter.php @@ -11,6 +11,7 @@ namespace Alchemy\Phrasea\Feed\Formatter; +use Alchemy\Phrasea\Application; use Alchemy\Phrasea\Feed\FeedInterface; use Alchemy\Phrasea\Feed\Link\FeedLink; use Alchemy\Phrasea\Feed\Link\LinkGeneratorCollection; @@ -34,7 +35,7 @@ class AtomFormatter extends FeedFormatterAbstract implements FeedFormatterInterf return $response; } - public function format(FeedInterface $feed, $page, \User_Adapter $user = null, $generator = 'Phraseanet') + public function format(FeedInterface $feed, $page, \User_Adapter $user = null, $generator = 'Phraseanet', $app = null) { $title = $feed->getTitle(); $subtitle = $feed->getSubtitle(); diff --git a/lib/Alchemy/Phrasea/Feed/Formatter/CoolirisFormatter.php b/lib/Alchemy/Phrasea/Feed/Formatter/CoolirisFormatter.php index 74fbc4c734..c7db287a10 100644 --- a/lib/Alchemy/Phrasea/Feed/Formatter/CoolirisFormatter.php +++ b/lib/Alchemy/Phrasea/Feed/Formatter/CoolirisFormatter.php @@ -11,6 +11,7 @@ namespace Alchemy\Phrasea\Feed\Formatter; +use Alchemy\Phrasea\Application; use Alchemy\Phrasea\Feed\FeedInterface; use Alchemy\Phrasea\Feed\Link\LinkGeneratorCollection; use Symfony\Component\HttpFoundation\Response; @@ -26,15 +27,15 @@ class CoolirisFormatter extends FeedFormatterAbstract implements FeedFormatterIn $this->linkGenerator = $generator; } - public function createResponse(FeedInterface $feed, $page, \User_Adapter $user = null, $generator = 'Phraseanet') + public function createResponse(FeedInterface $feed, $page, \User_Adapter $user = null, $generator = 'Phraseanet', $app = null) { - $content = $this->format($feed, $page, $user, $generator); + $content = $this->format($feed, $page, $user, $generator, $app); $response = new Response($content, 200, array('Content-Type' => 'application/rss+xml')); $response->setCharset('UTF-8'); return $response; } - public function format(FeedInterface $feed, $page, \User_Adapter $user = null, $generator = 'Phraseanet') + public function format(FeedInterface $feed, $page, \User_Adapter $user = null, $generator = 'Phraseanet', $app = null) { $title = $feed->getTitle(); $subtitle = $feed->getSubtitle(); @@ -158,28 +159,28 @@ class CoolirisFormatter extends FeedFormatterAbstract implements FeedFormatterIn } foreach ($feed->getEntries() as $item) { - $this->addItem($doc, $channel, $item); + $this->addItem($app, $doc, $channel, $item); } return $doc->saveXML(); } - protected function addItem(\DOMDocument $document, \DOMNode $feed, FeedEntry $entry) + protected function addItem(Application $app, \DOMDocument $document, \DOMNode $feed, FeedEntry $entry) { foreach ($entry->get_content() as $content) { - $this->addContent($document, $feed, $entry, $content); + $this->addContent($app, $document, $feed, $entry, $content); } } - protected function addContent(\DOMDocument $document, \DOMNode $node, FeedItem $content) + protected function addContent(Application $app, \DOMDocument $document, \DOMNode $node, FeedItem $content) { - $preview_sd = $content->getRecord()->get_subdef('preview'); + $preview_sd = $content->getRecord($app)->get_subdef('preview'); $preview_permalink = $preview_sd->get_permalink(); - $thumbnail_sd = $content->getRecord()->get_thumbnail(); + $thumbnail_sd = $content->getRecord($app)->get_thumbnail(); $thumbnail_permalink = $thumbnail_sd->get_permalink(); - $medium = strtolower($content->getRecord()->get_type()); + $medium = strtolower($content->getRecord($app)->get_type()); if ( ! in_array($medium, array('image', 'audio', 'video'))) { return $this; @@ -192,13 +193,13 @@ class CoolirisFormatter extends FeedFormatterAbstract implements FeedFormatterIn //add item node to channel node $item = $this->addTag($document, $node, 'item'); - $caption = $content->getRecord()->get_caption(); + $caption = $content->getRecord($app)->get_caption(); $title_field = $caption->get_dc_field(databox_Field_DCESAbstract::Title); if ($title_field) { $str_title = $title_field->get_serialized_values(' '); } else { - $str_title = $content->getRecord()->get_title(); + $str_title = $content->getRecord($app)->get_title(); } //attach tile node to item node @@ -214,7 +215,7 @@ class CoolirisFormatter extends FeedFormatterAbstract implements FeedFormatterIn //attach desc node to item node $desc = $this->addTag($document, $item, 'description', $str_desc); - $duration = $content->getRecord()->get_duration(); + $duration = $content->getRecord($app)->get_duration(); if ($preview_permalink) { $preview = $this->addTag($document, $item, 'media:content'); diff --git a/lib/Alchemy/Phrasea/Feed/Formatter/FeedFormatterAbstract.php b/lib/Alchemy/Phrasea/Feed/Formatter/FeedFormatterAbstract.php index 97974f2729..3f87da30cb 100644 --- a/lib/Alchemy/Phrasea/Feed/Formatter/FeedFormatterAbstract.php +++ b/lib/Alchemy/Phrasea/Feed/Formatter/FeedFormatterAbstract.php @@ -11,6 +11,8 @@ namespace Alchemy\Phrasea\Feed\Formatter; +use Alchemy\Phrasea\Application; + abstract class FeedFormatterAbstract { const PAGE_SIZE = 20; @@ -41,14 +43,14 @@ abstract class FeedFormatterAbstract * @param FeedItem $content * @return FeedFormaterInterface */ - protected function addContent(\DOMDocument $document, \DOMNode $item, FeedItem $content) + protected function addContent(Application $app, \DOMDocument $document, \DOMNode $item, FeedItem $content) { - $preview_sd = $content->getRecord()->get_subdef('preview'); + $preview_sd = $content->getRecord($app)->get_subdef('preview'); $preview_permalink = $preview_sd->get_permalink(); - $thumbnail_sd = $content->getRecord()->get_thumbnail(); + $thumbnail_sd = $content->getRecord($app)->get_thumbnail(); $thumbnail_permalink = $thumbnail_sd->get_permalink(); - $medium = strtolower($content->getRecord()->get_type()); + $medium = strtolower($content->getRecord($app)->get_type()); if ( ! in_array($medium, array('image', 'audio', 'video'))) { return $this; @@ -60,7 +62,7 @@ abstract class FeedFormatterAbstract $group = $this->addTag($document, $item, 'media:group'); - $caption = $content->getRecord()->get_caption(); + $caption = $content->getRecord($app)->get_caption(); $title_field = $caption->get_dc_field(databox_Field_DCESAbstract::Title); if ($title_field) { diff --git a/lib/Alchemy/Phrasea/Feed/Formatter/FeedFormatterInterface.php b/lib/Alchemy/Phrasea/Feed/Formatter/FeedFormatterInterface.php index 7d6a8ecaeb..a028f73333 100644 --- a/lib/Alchemy/Phrasea/Feed/Formatter/FeedFormatterInterface.php +++ b/lib/Alchemy/Phrasea/Feed/Formatter/FeedFormatterInterface.php @@ -16,5 +16,5 @@ interface FeedFormatterInterface * * @return string */ - public function format(FeedInterface $feed, $page, \User_Adapter $user = null, $generator = 'Phraseanet'); + public function format(FeedInterface $feed, $page, \User_Adapter $user = null, $generator = 'Phraseanet', $app = null); } diff --git a/lib/Alchemy/Phrasea/Feed/Formatter/RssFormatter.php b/lib/Alchemy/Phrasea/Feed/Formatter/RssFormatter.php index 34f504427b..859fadfbdf 100644 --- a/lib/Alchemy/Phrasea/Feed/Formatter/RssFormatter.php +++ b/lib/Alchemy/Phrasea/Feed/Formatter/RssFormatter.php @@ -11,6 +11,7 @@ namespace Alchemy\Phrasea\Feed\Formatter; +use Alchemy\Phrasea\Application; use Alchemy\Phrasea\Feed\FeedInterface; use Alchemy\Phrasea\Feed\Link\FeedLink; use Alchemy\Phrasea\Feed\Link\LinkGeneratorCollection; @@ -35,7 +36,7 @@ class RssFormatter extends FeedFormatterAbstract implements FeedFormatterInterfa return $response; } - public function format(FeedInterface $feed, $page, \User_Adapter $user = null, $generator = 'Phraseanet') + public function format(FeedInterface $feed, $page, \User_Adapter $user = null, $generator = 'Phraseanet', $app = null) { $title = $feed->getTitle(); $subtitle = $feed->getSubtitle(); diff --git a/lib/Doctrine/Entities/Feed.php b/lib/Doctrine/Entities/Feed.php index 7b4bd64d5e..8c778d02f6 100644 --- a/lib/Doctrine/Entities/Feed.php +++ b/lib/Doctrine/Entities/Feed.php @@ -91,7 +91,7 @@ class Feed implements FeedInterface * @param boolean $public * @return Feed */ - public function setPublic($public) + public function setIsPublic($public) { $this->public = $public; @@ -103,7 +103,7 @@ class Feed implements FeedInterface * * @return boolean */ - public function getPublic() + public function isPublic() { return $this->public; } diff --git a/lib/Doctrine/Entities/FeedItem.php b/lib/Doctrine/Entities/FeedItem.php index b277e5cd2a..552660728f 100644 --- a/lib/Doctrine/Entities/FeedItem.php +++ b/lib/Doctrine/Entities/FeedItem.php @@ -2,7 +2,7 @@ namespace Entities; -use Doctrine\ORM\Mapping as ORM; +use Alchemy\Phrasea\Application; /** * FeedItem @@ -196,4 +196,9 @@ class FeedItem { $this->setOrd($this->getEntry()->getItems()->count() + 1); } + + public function getRecord(Application $app) + { + return new \record_adapter($app, $this->getSbasId(), $this->getRecordId(), $this->getOrd()); + } } diff --git a/lib/Doctrine/Repositories/SessionRepository.php b/lib/Doctrine/Repositories/SessionRepository.php index a3ca1b71e0..93487f3287 100644 --- a/lib/Doctrine/Repositories/SessionRepository.php +++ b/lib/Doctrine/Repositories/SessionRepository.php @@ -57,7 +57,7 @@ class SessionRepository extends EntityRepository $feed = $this->find($id); if ($feed) { $coll = $feed->getCollection($app); - if ($feed->getPublic() + if ($feed->isPublic() || $coll === null || in_array($coll->get_base_id(), array_keys($user->ACL()->get_granted_base()))) { return $feed; diff --git a/lib/classes/API/V1/adapter.php b/lib/classes/API/V1/adapter.php index 773c5d6eb5..92e4bbbf2b 100644 --- a/lib/classes/API/V1/adapter.php +++ b/lib/classes/API/V1/adapter.php @@ -9,11 +9,16 @@ * file that was distributed with this source code. */ +use Alchemy\Phrasea\Feed\Aggregate; +use Alchemy\Phrasea\Feed\FeedInterface; use Alchemy\Phrasea\SearchEngine\SearchEngineOptions; use Alchemy\Phrasea\Application; use Alchemy\Phrasea\Border\File; use Alchemy\Phrasea\Border\Attribute\Status; use Alchemy\Phrasea\Border\Manager as BorderManager; +use Entities\Feed; +use Entities\FeedEntry; +use Entities\FeedItem; use Entities\UserQuery; use Symfony\Component\HttpFoundation\Request; use Symfony\Component\HttpKernel\Exception\NotFoundHttpException; @@ -1479,10 +1484,10 @@ class API_V1_adapter extends API_V1_Abstract { $result = new API_V1_result($this->app, $request, $this); - $coll = Feed_Collection::load_all($this->app, $user); + $coll = $this->app['EM']->getRepository('Entities\Feed')->getAllForUser($user); $datas = array(); - foreach ($coll->get_feeds() as $feed) { + foreach ($coll as $feed) { $datas[] = $this->list_publication($feed, $user); } @@ -1512,7 +1517,7 @@ class API_V1_adapter extends API_V1_Abstract { $result = new API_V1_result($this->app, $request, $this); - $feed = Feed_Adapter::load_with_user($this->app, $user, $publication_id); + $feed = $this->app['EM']->getRepository('Entities\Feed')->loadWithUser($this->app, $user, $publication_id); $offset_start = (int) ($request->get('offset_start') ? : 0); $per_page = (int) ($request->get('per_page') ? : 5); @@ -1535,7 +1540,7 @@ class API_V1_adapter extends API_V1_Abstract { $result = new API_V1_result($this->app, $request, $this); - $feed = Feed_Aggregate::load_with_user($this->app, $user); + $feed = Aggregate::createFromUser($this->app['EM'], $user); $offset_start = (int) ($request->get('offset_start') ? : 0); $per_page = (int) ($request->get('per_page') ? : 5); @@ -1543,7 +1548,7 @@ class API_V1_adapter extends API_V1_Abstract $per_page = (($per_page >= 1) && ($per_page <= 20)) ? $per_page : 5; $datas = array( - 'total_entries' => $feed->get_count_total_entries(), + 'total_entries' => $feed->getCountTotalEntries(), 'offset_start' => $offset_start, 'per_page' => $per_page, 'entries' => $this->list_publications_entries($feed, $offset_start, $per_page), @@ -1558,9 +1563,9 @@ class API_V1_adapter extends API_V1_Abstract { $result = new API_V1_result($this->app, $request, $this); - $entry = Feed_Entry_Adapter::load_from_id($this->app, $entry_id); + $entry = $this->app['EM']->getRepository('Entities\FeedEntry')->find($entry_id); - $collection = $entry->get_feed()->get_collection(); + $collection = $entry->getFeed()->getCollection($this->app); if (null !== $collection && !$user->ACL()->has_access_to_base($collection->get_base_id())) { throw new \API_V1_exception_forbidden('You have not access to the parent feed'); @@ -1578,38 +1583,38 @@ class API_V1_adapter extends API_V1_Abstract /** * Retrieve detailled informations about one feed * - * @param Feed_Adapter $feed + * @param Feed $feed * @param type $user * @return array */ - protected function list_publication(Feed_Adapter $feed, $user) + protected function list_publication(Feed $feed, $user) { return array( - 'id' => $feed->get_id(), - 'title' => $feed->get_title(), - 'subtitle' => $feed->get_subtitle(), - 'total_entries' => $feed->get_count_total_entries(), - 'icon' => $feed->get_icon_url(), - 'public' => $feed->is_public(), - 'readonly' => !$feed->is_publisher($user), - 'deletable' => $feed->is_owner($user), - 'created_on' => $feed->get_created_on()->format(DATE_ATOM), - 'updated_on' => $feed->get_updated_on()->format(DATE_ATOM), + 'id' => $feed->getId(), + 'title' => $feed->getTitle(), + 'subtitle' => $feed->getSubtitle(), + 'total_entries' => $feed->getCountTotalEntries(), + 'icon' => $feed->getIconUrl(), + 'public' => $feed->isPublic(), + 'readonly' => !$feed->isPublisher($user), + 'deletable' => $feed->isOwner($user), + 'created_on' => $feed->getCreatedOn()->format(DATE_ATOM), + 'updated_on' => $feed->getUpdatedOn()->format(DATE_ATOM), ); } /** * Retrieve all entries of one feed * - * @param Feed_Adapter $feed + * @param FeedInterface $feed * @param int $offset_start * @param int $how_many * @return array */ - protected function list_publications_entries(Feed_Abstract $feed, $offset_start = 0, $how_many = 5) + protected function list_publications_entries(FeedInterface $feed, $offset_start = 0, $how_many = 5) { - $entries = $feed->get_entries($offset_start, $how_many)->get_entries(); + $entries = $feed->getEntries($offset_start, $how_many); $out = array(); foreach ($entries as $entry) { @@ -1622,42 +1627,42 @@ class API_V1_adapter extends API_V1_Abstract /** * Retrieve detailled information about one feed entry * - * @param Feed_Entry_Adapter $entry + * @param FeedEntry $entry * @return array */ - protected function list_publication_entry(Feed_Entry_Adapter $entry) + protected function list_publication_entry(FeedEntry $entry) { $items = array(); - foreach ($entry->get_content() as $item) { + foreach ($entry->getItems() as $item) { $items[] = $this->list_publication_entry_item($item); } return array( - 'id' => $entry->get_id(), - 'author_email' => $entry->get_author_email(), - 'author_name' => $entry->get_author_name(), - 'created_on' => $entry->get_created_on()->format(DATE_ATOM), - 'updated_on' => $entry->get_updated_on()->format(DATE_ATOM), - 'title' => $entry->get_title(), - 'subtitle' => $entry->get_subtitle(), + 'id' => $entry->getId(), + 'author_email' => $entry->getAuthorEmail(), + 'author_name' => $entry->getAuthorName(), + 'created_on' => $entry->getCreatedOn()->format(DATE_ATOM), + 'updated_on' => $entry->getUpdatedOn()->format(DATE_ATOM), + 'title' => $entry->getTitle(), + 'subtitle' => $entry->getSubtitle(), 'items' => $items, - 'feed_id' => $entry->get_feed()->get_id(), - 'feed_url' => '/feeds/' . $entry->get_feed()->get_id() . '/content/', - 'url' => '/feeds/entry/' . $entry->get_id() . '/', + 'feed_id' => $entry->getFeed()->getId(), + 'feed_url' => '/feeds/' . $entry->getFeed()->getId() . '/content/', + 'url' => '/feeds/entry/' . $entry->getId() . '/', ); } /** * Retrieve detailled informations about one feed entry item * - * @param Feed_Entry_Item $item + * @param FeedItem $item * @return array */ - protected function list_publication_entry_item(Feed_Entry_Item $item) + protected function list_publication_entry_item(FeedItem $item) { $datas = array( - 'item_id' => $item->get_id() - , 'record' => $this->list_record($item->get_record()) + 'item_id' => $item->getId() + , 'record' => $this->list_record($item->getRecord($this->app)) ); return $datas; diff --git a/lib/classes/eventsmanager/notify/feed.php b/lib/classes/eventsmanager/notify/feed.php index 55783d5bb8..ec521f6e0f 100644 --- a/lib/classes/eventsmanager/notify/feed.php +++ b/lib/classes/eventsmanager/notify/feed.php @@ -140,7 +140,7 @@ class eventsmanager_notify_feed extends eventsmanager_notifyAbstract $sx = simplexml_load_string($datas); try { - $entry = $this->app['EM']->getRepository("Entities\FeedEntry")->find((int) $sx->entry_id); + $entry = $this->app['EM']->getRepository('Entities\FeedEntry')->find((int) $sx->entry_id); } catch (\Exception $e) { return array(); } diff --git a/lib/classes/record/preview.php b/lib/classes/record/preview.php index 49a60c2461..2d94004888 100644 --- a/lib/classes/record/preview.php +++ b/lib/classes/record/preview.php @@ -175,30 +175,30 @@ class record_preview extends record_adapter } break; case "FEED": - $entry = Feed_Entry_Adapter::load_from_id($app, $contId); + $entry = $app['EM']->getRepository('Entities\FeedEntry')->find($contId); $this->container = $entry; - $this->total = count($entry->get_content()); + $this->total = count($entry->getItems()); $i = 0; $first = true; - foreach ($entry->get_content() as $element) { + foreach ($entry->getItems() as $element) { $i ++; if ($first) { - $sbas_id = $element->get_record()->get_sbas_id(); - $record_id = $element->get_record()->get_record_id(); + $sbas_id = $element->getRecord()->get_sbas_id(); + $record_id = $element->getRecord()->get_record_id(); $this->original_item = $element; - $this->name = $entry->get_title(); - $number = $element->get_ord(); + $this->name = $entry->getTitle(); + $number = $element->getOrd(); } $first = false; - if ($element->get_ord() == $pos) { - $sbas_id = $element->get_record()->get_sbas_id(); - $record_id = $element->get_record()->get_record_id(); + if ($element->getOrd() == $pos) { + $sbas_id = $element->getRecord()->get_sbas_id(); + $record_id = $element->getRecord()->get_record_id(); $this->original_item = $element; - $this->name = $entry->get_title(); - $number = $element->get_ord(); + $this->name = $entry->getTitle(); + $number = $element->getOrd(); } } break; diff --git a/lib/conf.d/PhraseaFixture/Feed/LoadOneFeed.php b/lib/conf.d/PhraseaFixture/Feed/LoadOneFeed.php new file mode 100644 index 0000000000..dcdd8a97fc --- /dev/null +++ b/lib/conf.d/PhraseaFixture/Feed/LoadOneFeed.php @@ -0,0 +1,95 @@ +user) { + throw new \LogicException('Fill a user to store a new feed'); + } + + $feed = new Feed(); + + $publisher = new \Entities\FeedPublisher(); + $publisher->setUsrId($this->user->get_id()); + $publisher->setIsOwner(true); + $publisher->setFeed($feed); + + $feed->addPublisher($publisher); + if (isset($this->title) && $this->title !== null) { + $feed->setTitle($this->title); + } + else { + $feed->setTitle("test"); + } + + if (isset($this->public) && $this->public !== null) { + $feed->setIsPublic($this->public); + } + + $feed->setSubtitle("description"); + + $manager->persist($feed); + $manager->persist($publisher); + $manager->flush(); + + $this->feed = $feed; + + $this->addReference('one-feed', $feed); + } + + public function setUser(\User_Adapter $user) + { + $this->user = $user; + } + + public function getUser() + { + return $this->user; + } + + public function setTitle($title) + { + $this->title = $title; + } + + public function getTitle() + { + return $this->title; + } + + public function setPublic($public) + { + $this->public = $public; + } + + public function getPublic() + { + return $this->public; + } +} diff --git a/templates/mobile/lightbox/feed.html.twig b/templates/mobile/lightbox/feed.html.twig index c3eeeb2006..526d323729 100644 --- a/templates/mobile/lightbox/feed.html.twig +++ b/templates/mobile/lightbox/feed.html.twig @@ -12,26 +12,26 @@ {% block content %}
-

{{feed_entry.get_title()}}

+

{{feed_entry.getTitle()}}

{% trans 'Home' %}

- {{feed_entry.get_subtitle()|nl2br|raw}} + {{feed_entry.getSubtitle()|nl2br|raw}}

- {% set author = feed_entry.get_author_name() %} + {% set author = feed_entry.getAuthorName() %} {% trans %}Par {{ author }}{% endtrans %} - {% set entry_length = feed_entry.get_content()|length %} + {% set entry_length = feed_entry.getItems()|length %} {% trans %}{{entry_length}} documents{% endtrans %}

diff --git a/templates/mobile/lightbox/feed_element.html.twig b/templates/mobile/lightbox/feed_element.html.twig index 66006c3a6f..870e3c4697 100644 --- a/templates/mobile/lightbox/feed_element.html.twig +++ b/templates/mobile/lightbox/feed_element.html.twig @@ -11,11 +11,11 @@ {% endblock %} {% block content %} - {% set record = feed_element.get_record() %} + {% set record = feed_element.getRecord(app) %}
- Back -

{{feed_element.get_ord()}} - {{record.get_title()}}

+ Back +

{{feed_element.getOrd()}} - {{record.getTitle()}}

Home
diff --git a/templates/web/admin/publications/fiche.html.twig b/templates/web/admin/publications/fiche.html.twig index 75ea22fc7c..57e0c65dcd 100644 --- a/templates/web/admin/publications/fiche.html.twig +++ b/templates/web/admin/publications/fiche.html.twig @@ -99,7 +99,7 @@
- {% for databox in app['authentication'].getUser().ACL().get_granted_sbas('bas_chupub') %} @@ -114,7 +114,7 @@
diff --git a/templates/web/admin/publications/list.html.twig b/templates/web/admin/publications/list.html.twig index 522b44bc71..b9414b0f73 100644 --- a/templates/web/admin/publications/list.html.twig +++ b/templates/web/admin/publications/list.html.twig @@ -85,7 +85,7 @@ {% endif %} - {% if feed.getPublic() %} + {% if feed.isPublic() %} {% endif %} diff --git a/templates/web/lightbox/IE6/feed.html.twig b/templates/web/lightbox/IE6/feed.html.twig index 654cdd89f3..c961530e19 100644 --- a/templates/web/lightbox/IE6/feed.html.twig +++ b/templates/web/lightbox/IE6/feed.html.twig @@ -18,11 +18,11 @@ -
{% if first_item %}{{first_item.get_ord()}}{% endif %}
+
{% if first_item %}{{first_item.getOrd()}}{% endif %}
-
- {% if first_item %}{{first_item.get_record().get_title}}{% endif %} +
+ {% if first_item %}{{first_item.getRecord(app).get_title}}{% endif %}
@@ -34,10 +34,10 @@
{% if first_item %} - {% if app['authentication'].getUser().ACL().has_access_to_subdef(first_item.get_record(), 'preview') %} - {% set preview = first_item.get_record().get_preview() %} + {% if app['authentication'].getUser().ACL().has_access_to_subdef(first_item.getRecord(app), 'preview') %} + {% set preview = first_item.getRecord(app).get_preview() %} {% else %} - {% set preview = first_item.get_record().get_thumbnail() %} + {% set preview = first_item.getRecord(app).get_thumbnail() %} {% endif %} {{thumbnail.format(preview, preview.get_width(), preview.get_height(),'', false, false)}} {% endif %} @@ -52,8 +52,8 @@
-
- {% if first_item %}{{first_item.get_record().get_title}}{% endif %} +
+ {% if first_item %}{{first_item.getRecord(app).get_title}}{% endif %}
@@ -81,9 +81,9 @@
- {% set business = app['authentication'].getUser().ACL().has_right_on_base(first_item.get_record().get_base_id(), 'canmodifrecord') %} + {% set business = app['authentication'].getUser().ACL().has_right_on_base(first_item.getRecord(app).get_base_id(), 'canmodifrecord') %} {% if first_item %} - {{caption.format_caption(first_item.get_record(), '', null, business)}} + {{caption.format_caption(first_item.getRecord(app), '', null, business)}} {% endif %}
diff --git a/templates/web/lightbox/IE6/feed_container.html.twig b/templates/web/lightbox/IE6/feed_container.html.twig index fee39c469f..2dd1f08a7f 100644 --- a/templates/web/lightbox/IE6/feed_container.html.twig +++ b/templates/web/lightbox/IE6/feed_container.html.twig @@ -6,9 +6,9 @@
{{element.getOrd()}}
- {{thumbnail.format(element.getRecord().get_thumbnail() ,114,85, '', true, false)}} + {{thumbnail.format(element.getRecord(app).get_thumbnail() ,114,85, '', true, false)}} - +
diff --git a/templates/web/lightbox/IE6/feed_options_box.html.twig b/templates/web/lightbox/IE6/feed_options_box.html.twig index 028fb4006c..c14867b0f7 100644 --- a/templates/web/lightbox/IE6/feed_options_box.html.twig +++ b/templates/web/lightbox/IE6/feed_options_box.html.twig @@ -22,7 +22,7 @@
- +
| {% endif %} diff --git a/templates/web/lightbox/feed.html.twig b/templates/web/lightbox/feed.html.twig index 42afbaa452..29d9ad466e 100644 --- a/templates/web/lightbox/feed.html.twig +++ b/templates/web/lightbox/feed.html.twig @@ -24,11 +24,11 @@ -
{% if first_item %}{{first_item.get_ord()}}{% endif %}
+
{% if first_item %}{{first_item.getOrd()}}{% endif %}
-
- {% if first_item %}{{first_item.get_record().getTitle|raw}}{% endif %} +
+ {% if first_item %}{{first_item.getRecord(app).get_title|raw}}{% endif %}
@@ -42,10 +42,10 @@
{% if first_item %} - {% if app['authentication'].getUser().ACL().has_access_to_subdef(first_item.get_record(), 'preview') %} - {% set bask_prev = first_item.getRecord().get_preview() %} + {% if app['authentication'].getUser().ACL().has_access_to_subdef(first_item.getRecord(app), 'preview') %} + {% set bask_prev = first_item.getRecord(app).get_preview() %} {% else %} - {% set bask_prev = first_item.getRecord().get_thumbnail() %} + {% set bask_prev = first_item.getRecord(app).get_thumbnail() %} {% endif %} {{thumbnail.format(bask_prev,bask_prev.get_width(),bask_prev.get_height(),'', false, false)}} {% endif %} @@ -60,8 +60,8 @@
-
- {% if first_item %}{{first_item.getRecord().get_title}}{% endif %} +
+ {% if first_item %}{{first_item.getRecord(app).get_title}}{% endif %}
@@ -81,9 +81,9 @@
- {% set business = app['authentication'].getUser().ACL().has_right_on_base(first_item.get_record().get_base_id(), 'canmodifrecord') %} + {% set business = app['authentication'].getUser().ACL().has_right_on_base(first_item.getRecord(app).get_base_id(), 'canmodifrecord') %} {% if first_item %} - {{caption.format_caption(first_item.getRecord(), '', null, business)}} + {{caption.format_caption(first_item.getRecord(app), '', null, business)}} {% endif %}
diff --git a/templates/web/lightbox/feed_container.html.twig b/templates/web/lightbox/feed_container.html.twig index fee39c469f..2dd1f08a7f 100644 --- a/templates/web/lightbox/feed_container.html.twig +++ b/templates/web/lightbox/feed_container.html.twig @@ -6,9 +6,9 @@
{{element.getOrd()}}
- {{thumbnail.format(element.getRecord().get_thumbnail() ,114,85, '', true, false)}} + {{thumbnail.format(element.getRecord(app).get_thumbnail() ,114,85, '', true, false)}}
diff --git a/templates/web/lightbox/feed_options_box.html.twig b/templates/web/lightbox/feed_options_box.html.twig index 79f89f04ce..ef0e3b63ef 100644 --- a/templates/web/lightbox/feed_options_box.html.twig +++ b/templates/web/lightbox/feed_options_box.html.twig @@ -22,7 +22,7 @@
- +
| {% endif %} diff --git a/templates/web/prod/actions/publish/publish.html.twig b/templates/web/prod/actions/publish/publish.html.twig index f9df778eac..9fe747c77a 100644 --- a/templates/web/prod/actions/publish/publish.html.twig +++ b/templates/web/prod/actions/publish/publish.html.twig @@ -57,7 +57,7 @@ {% if feed.isPublisher(app['authentication'].getUser()) %}
{{ feed.getTitle() }} - {% if feed.getPublic() %} + {% if feed.isPublic() %} {% endif %} diff --git a/tests/Alchemy/Tests/Phrasea/Application/ApiAbstract.php b/tests/Alchemy/Tests/Phrasea/Application/ApiAbstract.php index abd90e29cc..3bbffdcb56 100644 --- a/tests/Alchemy/Tests/Phrasea/Application/ApiAbstract.php +++ b/tests/Alchemy/Tests/Phrasea/Application/ApiAbstract.php @@ -1673,9 +1673,8 @@ abstract class ApiAbstract extends \PhraseanetWebTestCaseAbstract public function testFeedList() { $title = 'Yellow title'; - $subtitle = 'Trololololo !'; - $created_feed = \Feed_Adapter::create(self::$DI['app'], self::$DI['user'], $title, $subtitle); + $created_feed = $this->insertOneFeed(self::$DI['user'], $title); $this->setToken(self::$token); $route = '/api/v1/feeds/list/'; @@ -1695,15 +1694,12 @@ abstract class ApiAbstract extends \PhraseanetWebTestCaseAbstract $this->evaluateGoodFeed($feed); - if ($feed['id'] == $created_feed->get_id()) { + if ($feed['id'] == $created_feed->getId()) { $found = true; $this->assertEquals($title, $feed['title']); - $this->assertEquals($subtitle, $feed['subtitle']); } } - $created_feed->delete(); - if (!$found) { $this->fail('feed not found !'); } @@ -1722,10 +1718,6 @@ abstract class ApiAbstract extends \PhraseanetWebTestCaseAbstract ->disableOriginalConstructor() ->getMock(); - self::$DI['app']['notification.deliverer']->expects($this->atLeastOnce()) - ->method('deliver') - ->with($this->isInstanceOf('Alchemy\Phrasea\Notification\Mail\MailInfoNewPublication'), $this->equalTo(null)); - $title = 'Yellow title'; $subtitle = 'Trololololo !'; $entry_title = 'Superman'; @@ -1733,11 +1725,14 @@ abstract class ApiAbstract extends \PhraseanetWebTestCaseAbstract $author = "W. Shakespeare"; $author_email = "gontran.bonheur@gmail.com"; - $created_feed = \Feed_Adapter::create(self::$DI['app'], self::$DI['user'], $title, $subtitle); - $publisher = \Feed_Publisher_Adapter::getPublisher(self::$DI['app']['phraseanet.appbox'], $created_feed, self::$DI['user']); - - $created_entry = \Feed_Entry_Adapter::create(self::$DI['app'], $created_feed, $publisher, $entry_title, $entry_subtitle, $author, $author_email); - $created_item = \Feed_Entry_Item::create(self::$DI['app']['phraseanet.appbox'], $created_entry, self::$DI['record_1']); + $created_item = $this->insertOneFeedItem(self::$DI['user']); + $created_entry = $created_item->getEntry(); + $created_entry->setAuthorEmail($author_email); + $created_entry->setAuthorName($author); + $created_entry->setTitle($entry_title); + $created_entry->setSubtitle($entry_subtitle); + self::$DI['app']['EM']->persist($created_entry); + self::$DI['app']['EM']->flush(); $this->setToken(self::$token); $route = '/api/v1/feeds/content/'; @@ -1760,7 +1755,7 @@ abstract class ApiAbstract extends \PhraseanetWebTestCaseAbstract foreach ($content['response']['entries'] as $entry) { $this->assertGoodEntry($entry); - if ($entry['id'] == $created_entry->get_id()) { + if ($entry['id'] == $created_entry->getId()) { $found = true; $this->assertEquals($author_email, $entry['author_email']); $this->assertEquals($author, $entry['author_name']); @@ -1769,8 +1764,6 @@ abstract class ApiAbstract extends \PhraseanetWebTestCaseAbstract } } - $created_feed->delete(); - if (!$found) { $this->fail('entry not found !'); } @@ -1786,10 +1779,6 @@ abstract class ApiAbstract extends \PhraseanetWebTestCaseAbstract ->disableOriginalConstructor() ->getMock(); - self::$DI['app']['notification.deliverer']->expects($this->atLeastOnce()) - ->method('deliver') - ->with($this->isInstanceOf('Alchemy\Phrasea\Notification\Mail\MailInfoNewPublication'), $this->equalTo(null)); - $title = 'Yellow title'; $subtitle = 'Trololololo !'; $entry_title = 'Superman'; @@ -1797,14 +1786,11 @@ abstract class ApiAbstract extends \PhraseanetWebTestCaseAbstract $author = "W. Shakespeare"; $author_email = "gontran.bonheur@gmail.com"; - $created_feed = \Feed_Adapter::create(self::$DI['app'], self::$DI['user'], $title, $subtitle); - $publisher = \Feed_Publisher_Adapter::getPublisher(self::$DI['app']['phraseanet.appbox'], $created_feed, self::$DI['user']); - - $created_entry = \Feed_Entry_Adapter::create(self::$DI['app'], $created_feed, $publisher, $entry_title, $entry_subtitle, $author, $author_email); - $created_item = \Feed_Entry_Item::create(self::$DI['app']['phraseanet.appbox'], $created_entry, self::$DI['record_1']); + $created_item = $this->insertOneFeedItem(self::$DI['user']); + $created_entry = $created_item->getEntry(); $this->setToken(self::$token); - $route = '/api/v1/feeds/entry/' . $created_entry->get_id() . '/'; + $route = '/api/v1/feeds/entry/' . $created_entry->getId() . '/'; $this->evaluateMethodNotAllowedRoute($route, array('POST', 'PUT', 'DELETE')); @@ -1817,9 +1803,8 @@ abstract class ApiAbstract extends \PhraseanetWebTestCaseAbstract $this->assertArrayHasKey('entry', $content['response']); $this->assertGoodEntry($content['response']['entry']); - $this->assertEquals($created_entry->get_id(), $content['response']['entry']['id']); + $this->assertEquals($created_entry->getId(), $content['response']['entry']['id']); - $created_feed->delete(); } /** @@ -1832,10 +1817,6 @@ abstract class ApiAbstract extends \PhraseanetWebTestCaseAbstract ->disableOriginalConstructor() ->getMock(); - self::$DI['app']['notification.deliverer']->expects($this->atLeastOnce()) - ->method('deliver') - ->with($this->isInstanceOf('Alchemy\Phrasea\Notification\Mail\MailInfoNewPublication'), $this->equalTo(null)); - $title = 'Yellow title'; $subtitle = 'Trololololo !'; $entry_title = 'Superman'; @@ -1843,16 +1824,14 @@ abstract class ApiAbstract extends \PhraseanetWebTestCaseAbstract $author = "W. Shakespeare"; $author_email = "gontran.bonheur@gmail.com"; - $created_feed = \Feed_Adapter::create(self::$DI['app'], self::$DI['user'], $title, $subtitle); - $publisher = \Feed_Publisher_Adapter::getPublisher(self::$DI['app']['phraseanet.appbox'], $created_feed, self::$DI['user']); + $created_item = $this->insertOneFeedItem(self::$DI['user']); + $created_entry = $created_item->getEntry(); + $created_feed = $created_entry->getFeed(); - $created_entry = \Feed_Entry_Adapter::create(self::$DI['app'], $created_feed, $publisher, $entry_title, $entry_subtitle, $author, $author_email); - $created_item = \Feed_Entry_Item::create(self::$DI['app']['phraseanet.appbox'], $created_entry, self::$DI['record_1']); - - $created_feed->set_collection(self::$DI['collection_no_access']); + $created_feed->setCollection(self::$DI['collection_no_access']); $this->setToken(self::$adminToken); - $route = '/api/v1/feeds/entry/' . $created_entry->get_id() . '/'; + $route = '/api/v1/feeds/entry/' . $created_entry->getId() . '/'; $this->evaluateMethodNotAllowedRoute($route, array('POST', 'PUT', 'DELETE')); @@ -1876,25 +1855,19 @@ abstract class ApiAbstract extends \PhraseanetWebTestCaseAbstract ->disableOriginalConstructor() ->getMock(); - self::$DI['app']['notification.deliverer']->expects($this->atLeastOnce()) - ->method('deliver') - ->with($this->isInstanceOf('Alchemy\Phrasea\Notification\Mail\MailInfoNewPublication'), $this->equalTo(null)); - - $title = 'Yellow title'; - $subtitle = 'Trololololo !'; $entry_title = 'Superman'; $entry_subtitle = 'Wonder Woman'; - $author = "W. Shakespeare"; - $author_email = "gontran.bonheur@gmail.com"; - $created_feed = \Feed_Adapter::create(self::$DI['app'], self::$DI['user'], $title, $subtitle); - $publisher = \Feed_Publisher_Adapter::getPublisher(self::$DI['app']['phraseanet.appbox'], $created_feed, self::$DI['user']); - - $created_entry = \Feed_Entry_Adapter::create(self::$DI['app'], $created_feed, $publisher, $entry_title, $entry_subtitle, $author, $author_email); - $created_item = \Feed_Entry_Item::create(self::$DI['app']['phraseanet.appbox'], $created_entry, self::$DI['record_1']); + $created_item = $this->insertOneFeedItem(self::$DI['user']); + $created_entry = $created_item->getEntry(); + $created_feed = $created_entry->getFeed(); + $created_entry->setTitle($entry_title); + $created_entry->setSubtitle($entry_subtitle); + self::$DI['app']['EM']->persist($created_entry); + self::$DI['app']['EM']->flush(); $this->setToken(self::$token); - $route = '/api/v1/feeds/' . $created_feed->get_id() . '/content/'; + $route = '/api/v1/feeds/' . $created_feed->getId() . '/content/'; $this->evaluateMethodNotAllowedRoute($route, array('POST', 'PUT', 'DELETE')); @@ -1912,16 +1885,14 @@ abstract class ApiAbstract extends \PhraseanetWebTestCaseAbstract foreach ($content['response']['entries'] as $entry) { $this->assertGoodEntry($entry); - if ($entry['id'] == $created_entry->get_id()) { + if ($entry['id'] == $created_entry->getId()) { $this->assertEquals($entry_title, $entry['title']); $this->assertEquals($entry_subtitle, $entry['subtitle']); $found = true; } } - $this->assertEquals($created_feed->get_id(), $content['response']['feed']['id']); - - $created_feed->delete(); + $this->assertEquals($created_feed->getId(), $content['response']['feed']['id']); if (!$found) { $this->fail('Entry not found'); @@ -2037,7 +2008,7 @@ abstract class ApiAbstract extends \PhraseanetWebTestCaseAbstract $this->assertInternalType('string', $feed['title']); $this->assertInternalType('string', $feed['subtitle']); $this->assertInternalType('integer', $feed['total_entries']); - $this->assertInternalType('string', $feed['icon']); + $this->assertInternalType('boolean', $feed['icon']); $this->assertInternalType('boolean', $feed['public']); $this->assertInternalType('boolean', $feed['readonly']); $this->assertInternalType('boolean', $feed['deletable']); diff --git a/tests/Alchemy/Tests/Phrasea/Application/LightboxTest.php b/tests/Alchemy/Tests/Phrasea/Application/LightboxTest.php index ce73c17d19..b8a087e5ad 100644 --- a/tests/Alchemy/Tests/Phrasea/Application/LightboxTest.php +++ b/tests/Alchemy/Tests/Phrasea/Application/LightboxTest.php @@ -18,22 +18,10 @@ class ApplicationLightboxTest extends \PhraseanetWebTestCaseAuthenticatedAbstrac self::$DI['app']['notification.deliverer'] = $this->getMockBuilder('Alchemy\Phrasea\Notification\Deliverer') ->disableOriginalConstructor() ->getMock(); - - self::$DI['app']['notification.deliverer']->expects($this->atLeastOnce()) - ->method('deliver') - ->with($this->isInstanceOf('Alchemy\Phrasea\Notification\Mail\MailInfoNewPublication'), $this->equalTo(null)); - - $this->feed = \Feed_Adapter::create(self::$DI['app'], self::$DI['user'], "salut", 'coucou'); - $publishers = $this->feed->get_publishers(); - $publisher = array_shift($publishers); - $this->entry = \Feed_Entry_Adapter::create(self::$DI['app'], $this->feed, $publisher, 'title', "sub Titkle", " jean pierre", "jp@test.com"); - $this->item = \Feed_Entry_Item::create(self::$DI['app']['phraseanet.appbox'], $this->entry, self::$DI['record_1']); } public function tearDown() { - if ($this->feed instanceof \Feed_Adapter) - $this->feed->delete(); parent::tearDown(); } @@ -148,7 +136,10 @@ class ApplicationLightboxTest extends \PhraseanetWebTestCaseAuthenticatedAbstrac { $this->set_user_agent(self::USER_AGENT_FIREFOX8MAC, self::$DI['app']); - $crawler = self::$DI['client']->request('GET', '/lightbox/ajax/LOAD_FEED_ITEM/' . $this->entry->get_id() . '/' . $this->item->get_id() . '/'); + $item = $this->insertOneFeedItem(self::$DI['user']); + $entry = $item->getEntry(); + + $crawler = self::$DI['client']->request('GET', '/lightbox/ajax/LOAD_FEED_ITEM/' . $entry->getId() . '/' . $item->getId() . '/'); $this->assertEquals(200, self::$DI['client']->getResponse()->getStatusCode()); $this->assertEquals('application/json', self::$DI['client']->getResponse()->headers->get('Content-type')); $datas = json_decode(self::$DI['client']->getResponse()->getContent()); @@ -164,7 +155,7 @@ class ApplicationLightboxTest extends \PhraseanetWebTestCaseAuthenticatedAbstrac $this->set_user_agent(self::USER_AGENT_IE6, self::$DI['app']); - $crawler = self::$DI['client']->request('GET', '/lightbox/ajax/LOAD_FEED_ITEM/' . $this->entry->get_id() . '/' . $this->item->get_id() . '/'); + $crawler = self::$DI['client']->request('GET', '/lightbox/ajax/LOAD_FEED_ITEM/' . $entry->getId() . '/' . $item->getId() . '/'); $this->assertEquals(200, self::$DI['client']->getResponse()->getStatusCode()); $this->assertEquals('application/json', self::$DI['client']->getResponse()->headers->get('Content-type')); $datas = json_decode(self::$DI['client']->getResponse()->getContent()); @@ -180,7 +171,7 @@ class ApplicationLightboxTest extends \PhraseanetWebTestCaseAuthenticatedAbstrac $this->set_user_agent(self::USER_AGENT_IPHONE, self::$DI['app']); - $crawler = self::$DI['client']->request('GET', '/lightbox/ajax/LOAD_FEED_ITEM/' . $this->entry->get_id() . '/' . $this->item->get_id() . '/'); + $crawler = self::$DI['client']->request('GET', '/lightbox/ajax/LOAD_FEED_ITEM/' . $entry->getId() . '/' . $item->getId() . '/'); $this->assertEquals(200, self::$DI['client']->getResponse()->getStatusCode()); $this->assertNotEquals('application/json', self::$DI['client']->getResponse()->headers->get('Content-type')); } @@ -241,19 +232,22 @@ class ApplicationLightboxTest extends \PhraseanetWebTestCaseAuthenticatedAbstrac $this->set_user_agent(self::USER_AGENT_FIREFOX8MAC, self::$DI['app']); - $crawler = self::$DI['client']->request('GET', '/lightbox/feeds/entry/' . $this->entry->get_id() . '/'); + $item = $this->insertOneFeedItem(self::$DI['user']); + $entry = $item->getEntry(); + + $crawler = self::$DI['client']->request('GET', '/lightbox/feeds/entry/' . $entry->getId() . '/'); $this->assertEquals(200, self::$DI['client']->getResponse()->getStatusCode()); $this->assertEquals('UTF-8', self::$DI['client']->getResponse()->getCharset()); $this->set_user_agent(self::USER_AGENT_IE6, self::$DI['app']); - $crawler = self::$DI['client']->request('GET', '/lightbox/feeds/entry/' . $this->entry->get_id() . '/'); + $crawler = self::$DI['client']->request('GET', '/lightbox/feeds/entry/' . $entry->getId() . '/'); $this->assertEquals(200, self::$DI['client']->getResponse()->getStatusCode()); $this->assertEquals('UTF-8', self::$DI['client']->getResponse()->getCharset()); $this->set_user_agent(self::USER_AGENT_IPHONE, self::$DI['app']); - $crawler = self::$DI['client']->request('GET', '/lightbox/feeds/entry/' . $this->entry->get_id() . '/'); + $crawler = self::$DI['client']->request('GET', '/lightbox/feeds/entry/' . $entry->getId() . '/'); $this->assertEquals(200, self::$DI['client']->getResponse()->getStatusCode()); $this->assertEquals('UTF-8', self::$DI['client']->getResponse()->getCharset()); } diff --git a/tests/Alchemy/Tests/Phrasea/Controller/Admin/PublicationTest.php b/tests/Alchemy/Tests/Phrasea/Controller/Admin/PublicationTest.php index 5245b96978..ef2f01b15a 100644 --- a/tests/Alchemy/Tests/Phrasea/Controller/Admin/PublicationTest.php +++ b/tests/Alchemy/Tests/Phrasea/Controller/Admin/PublicationTest.php @@ -68,7 +68,7 @@ class Module_Admin_Route_PublicationTest extends \PhraseanetWebTestCaseAuthentic $this->assertEquals('test', $feed->getTitle()); $this->assertEquals('test', $feed->getSubtitle()); - $this->assertTrue($feed->getPublic()); + $this->assertTrue($feed->isPublic()); $this->assertNull($feed->getCollection(self::$DI['app'])); } @@ -95,7 +95,7 @@ class Module_Admin_Route_PublicationTest extends \PhraseanetWebTestCaseAuthentic $this->assertEquals('test', $feed->getTitle()); $this->assertEquals('test', $feed->getSubtitle()); - $this->assertTrue($feed->getPublic()); + $this->assertTrue($feed->isPublic()); $this->assertEquals(self::$DI['collection']->get_base_id(), $collection->get_base_id()); $this->assertTrue( diff --git a/tests/Alchemy/Tests/Phrasea/Controller/Prod/FeedTest.php b/tests/Alchemy/Tests/Phrasea/Controller/Prod/FeedTest.php index 2845ae2f8b..9caa3fa0d6 100644 --- a/tests/Alchemy/Tests/Phrasea/Controller/Prod/FeedTest.php +++ b/tests/Alchemy/Tests/Phrasea/Controller/Prod/FeedTest.php @@ -7,37 +7,6 @@ use Symfony\Component\CssSelector\CssSelector; class FeedTest extends \PhraseanetWebTestCaseAuthenticatedAbstract { - /** - * - * @var \Feed_Adapter - */ - protected $feed; - - /** - * - * @var \Feed_Entry_Adapter - */ - protected $entry; - - /** - * - * @var \Feed_Entry_Item - */ - protected $item; - - /** - * - * @var \Feed_Publisher_Adapter - */ - protected $publisher; - protected $client; - protected $feed_title = 'feed title'; - protected $feed_subtitle = 'feed subtitle'; - protected $entry_title = 'entry title'; - protected $entry_subtitle = 'entry subtitle'; - protected $entry_authorname = 'author name'; - protected $entry_authormail = 'author.mail@example.com'; - public static function setUpBeforeClass() { parent::setUpBeforeClass(); @@ -360,7 +329,7 @@ class FeedTest extends \PhraseanetWebTestCaseAuthenticatedAbstract if ($one_feed->has_access(self::$DI['user'])) { $this->assertEquals(1, $crawler->filterXPath($path)->count(), $msg); } else { - $this->fail('Feed_collection::load_all should return feed where I got access'); + $this->fail('FeedRepository::getAllForUser should return feeds I am allowed to access'); } } } @@ -382,7 +351,7 @@ class FeedTest extends \PhraseanetWebTestCaseAuthenticatedAbstract if ($one_feed->hasAccess(self::$DI['user'], self::$DI['app'])) { $this->assertEquals(1, $crawler->filterXPath($path)->count(), $msg); } else { - $this->fail('Feed_collection::load_all should return feed where I got access'); + $this->fail('FeedRepository::getAllForUser should return feeds I am allowed to access'); } } } diff --git a/tests/Alchemy/Tests/Phrasea/Controller/Prod/RecordsTest.php b/tests/Alchemy/Tests/Phrasea/Controller/Prod/RecordsTest.php index 60cd4da6d5..7160907a52 100644 --- a/tests/Alchemy/Tests/Phrasea/Controller/Prod/RecordsTest.php +++ b/tests/Alchemy/Tests/Phrasea/Controller/Prod/RecordsTest.php @@ -11,14 +11,9 @@ use Alchemy\Phrasea\SearchEngine\SearchEngineOptions; class RecordsTest extends \PhraseanetWebTestCaseAuthenticatedAbstract { protected $client; - protected static $feed; public static function tearDownAfterClass() { - if (self::$feed instanceof \Feed_Adapter) { - self::$feed->delete(); - } - parent::tearDownAfterClass(); } @@ -193,46 +188,18 @@ class RecordsTest extends \PhraseanetWebTestCaseAuthenticatedAbstract { self::$DI['app']['authentication']->openAccount(self::$DI['user']); - self::$feed = \Feed_Adapter::create( - self::$DI['app'], - self::$DI['user'], - 'titi', - 'toto' - ); - self::$DI['app']['notification.deliverer'] = $this->getMockBuilder('Alchemy\Phrasea\Notification\Deliverer') ->disableOriginalConstructor() ->getMock(); - self::$DI['app']['notification.deliverer']->expects($this->atLeastOnce()) - ->method('deliver') - ->with($this->isInstanceOf('Alchemy\Phrasea\Notification\Mail\MailInfoNewPublication'), $this->equalTo(null)); - - $feedEntry = \Feed_Entry_Adapter::create( - self::$DI['app'], - self::$feed, - \Feed_Publisher_Adapter::getPublisher( - self::$DI['app']['phraseanet.appbox'], - self::$feed, - self::$DI['user'] - ), - 'titi', - 'toto', - 'tata', - 'tutu@test.fr' - ); - - \Feed_Entry_Item::create( - self::$DI['app']['phraseanet.appbox'], - $feedEntry, - self::$DI['record_1'] - ); + $item = $this->insertOneFeedItem(self::$DI['user']); + $feedEntry = $item->getEntry(); $this->XMLHTTPRequest('POST', '/prod/records/', array( 'env' => 'FEED', 'pos' => 0, 'query' => '', - 'cont' => $feedEntry->get_id() + 'cont' => $feedEntry->getId() )); $response = self::$DI['client']->getResponse(); diff --git a/tests/Alchemy/Tests/Phrasea/Controller/Root/RSSFeedTest.php b/tests/Alchemy/Tests/Phrasea/Controller/Root/RSSFeedTest.php index 7cbbbee057..e1f680d3f1 100644 --- a/tests/Alchemy/Tests/Phrasea/Controller/Root/RSSFeedTest.php +++ b/tests/Alchemy/Tests/Phrasea/Controller/Root/RSSFeedTest.php @@ -178,7 +178,7 @@ class RssFeedTest extends \PhraseanetWebTestCaseAbstract $all_feeds = self::$DI['app']['EM']->getRepository('Entities\Feed')->findAllPublic(); foreach ($all_feeds as $feed) { - $this->assertTrue($feed->getPublic()); + $this->assertTrue($feed->isPublic()); } $crawler = self::$DI['client']->request("GET", "/feeds/aggregated/rss/"); $this->assertTrue(self::$DI['client']->getResponse()->isOk()); @@ -195,7 +195,7 @@ class RssFeedTest extends \PhraseanetWebTestCaseAbstract $all_feeds = self::$DI['app']['EM']->getRepository('Entities\Feed')->findAllPublic(); foreach ($all_feeds as $feed) { - $this->assertTrue($feed->getPublic()); + $this->assertTrue($feed->isPublic()); } $crawler = self::$DI['client']->request("GET", "/feeds/aggregated/atom/"); $this->assertTrue(self::$DI['client']->getResponse()->isOk()); @@ -633,48 +633,48 @@ class RssFeedTest extends \PhraseanetWebTestCaseAbstract $this->assertEquals($feed->getCountTotalEntries(), $count); } - public function checkATOMEntryNode(\DOMNode $node, \DOMXPath $xpath, \Feed_Adapter $feed, \Feed_Entry_Adapter $entry) + public function checkATOMEntryNode(\DOMNode $node, \DOMXPath $xpath, Feed $feed, FeedEntry $entry) { foreach ($node->childNodes as $child) { if ($child->nodeType !== XML_TEXT_NODE) { switch ($child->nodeName) { case 'id': - $this->assertEquals(sprintf('%sentry/%d/', self::$DI['app']['feed.user-link-generator']->generatePublic($feed, 'atom', 1)->getURI(), $entry->get_id()), $child->nodeValue); + $this->assertEquals(sprintf('%sentry/%d/', self::$DI['app']['feed.user-link-generator']->generatePublic($feed, 'atom', 1)->getURI(), $entry->getId()), $child->nodeValue); break; case 'link': foreach ($child->attributes as $attribute) { if ($attribute->name == "href") { - $this->assertEquals(sprintf('%sentry/%d/', self::$DI['app']['feed.user-link-generator']->generatePublic($feed, 'atom', 1)->getURI(), $entry->get_id()), $attribute->value); + $this->assertEquals(sprintf('%sentry/%d/', self::$DI['app']['feed.user-link-generator']->generatePublic($feed, 'atom', 1)->getURI(), $entry->getId()), $attribute->value); break; } } break; case 'updated': - $this->assertEquals($entry->get_updated_on()->format(DATE_ATOM), $child->nodeValue); + $this->assertEquals($entry->getUpdatedOn()->format(DATE_ATOM), $child->nodeValue); break; case 'published': - $this->assertEquals($entry->get_created_on()->format(DATE_ATOM), $child->nodeValue); + $this->assertEquals($entry->getCreatedOn()->format(DATE_ATOM), $child->nodeValue); break; case 'title': - $this->assertEquals($entry->get_title(), $child->nodeValue); + $this->assertEquals($entry->getTitle(), $child->nodeValue); break; case 'content': - $this->assertEquals($entry->get_subtitle(), $child->nodeValue); + $this->assertEquals($entry->getSubtitle(), $child->nodeValue); break; case 'author': foreach ($node->childNodes as $child) { if ($child->nodeType !== XML_TEXT_NODE && $child->nodeName == "email") - $this->assertEquals($entry->get_author_email(), $child->nodeValue); + $this->assertEquals($entry->getAuthorEmail(), $child->nodeValue); if ($child->nodeType !== XML_TEXT_NODE && $child->nodeName == "name") - $this->assertEquals($entry->get_author_name(), $child->nodeValue); + $this->assertEquals($entry->getAuthorName(), $child->nodeValue); } break; } } } - $content = $entry->get_content(); + $content = $entry->getItems()->toArray(); $available_medium = array('image', 'audio', 'video'); @@ -686,7 +686,7 @@ class RssFeedTest extends \PhraseanetWebTestCaseAbstract foreach ($media_group as $media) { $entry_item = array_shift($content); - if ($entry_item instanceof \Feed_Entry_Item) { + if ($entry_item instanceof FeedEntry) { $this->verifyMediaItem($entry_item, $media); } } diff --git a/tests/classes/PhraseanetPHPUnitAbstract.php b/tests/classes/PhraseanetPHPUnitAbstract.php index 8efcbc6b93..aa22af778c 100644 --- a/tests/classes/PhraseanetPHPUnitAbstract.php +++ b/tests/classes/PhraseanetPHPUnitAbstract.php @@ -431,7 +431,7 @@ abstract class PhraseanetPHPUnitAbstract extends WebTestCase /** * - * @return \Entities\FeedEntry + * @return \Entities\FeedItem */ protected function insertOneFeedItem(\User_Adapter $user) { @@ -440,6 +440,8 @@ abstract class PhraseanetPHPUnitAbstract extends WebTestCase $item = new \Entities\FeedItem(); $item->setEntry($entry); + $item->setRecordId(self::$DI['record_1']->get_record_id()); + $item->setSbasId(self::$DI['record_1']->get_sbas_id()); $entry->addItem($item); @@ -449,11 +451,11 @@ abstract class PhraseanetPHPUnitAbstract extends WebTestCase $em->persist($item); $em->flush(); - - return $entry; } catch (\Exception $e) { $this->fail('Fail to load one FeedEntry : ' . $e->getMessage()); } + + return $item; } /** From 289c0294b2fceddbecf127e5e64242c1f708f87d Mon Sep 17 00:00:00 2001 From: Andrey Date: Thu, 13 Jun 2013 18:01:11 +0200 Subject: [PATCH 15/67] Rebased, fixed minor bugs --- .../Phrasea/Controller/Client/Root.php | 5 +- lib/Alchemy/Phrasea/Controller/Prod/Feed.php | 2 +- lib/Alchemy/Phrasea/Feed/Aggregate.php | 23 +-- .../Phrasea/Feed/AggregateLinkGenerator.php | 108 ---------- lib/Alchemy/Phrasea/Feed/Link.php | 68 ------ lib/Alchemy/Phrasea/Feed/LinkGenerator.php | 116 ----------- lib/Alchemy/Phrasea/Feed/LinkInterface.php | 30 --- .../Repositories/SessionRepository.php | 4 +- .../Repositories/UserSettingRepository.php | 2 +- lib/classes/record/preview.php | 12 +- templates/mobile/lightbox/feed.html.twig | 2 +- .../mobile/lightbox/feed_element.html.twig | 2 +- .../client/home_inter_pub_basket.html.twig | 2 +- .../web/lightbox/IE6/feed_container.html.twig | 2 +- .../web/lightbox/feed_container.html.twig | 2 +- .../actions/publish/publish_edit.html.twig | 2 +- .../web/prod/feeds/entry_macro.html.twig | 14 +- templates/web/prod/feeds/feeds.html.twig | 12 +- .../web/prod/preview/feed_train.html.twig | 10 +- .../Phrasea/Application/OverviewTest.php | 40 ++-- .../Core/Provider/FeedServiceProviderTest.php | 4 +- .../Tests/Phrasea/Feed/LinkGeneratorTest.php | 194 ------------------ 22 files changed, 72 insertions(+), 584 deletions(-) delete mode 100644 lib/Alchemy/Phrasea/Feed/AggregateLinkGenerator.php delete mode 100644 lib/Alchemy/Phrasea/Feed/Link.php delete mode 100644 lib/Alchemy/Phrasea/Feed/LinkGenerator.php delete mode 100644 lib/Alchemy/Phrasea/Feed/LinkInterface.php delete mode 100644 tests/Alchemy/Tests/Phrasea/Feed/LinkGeneratorTest.php diff --git a/lib/Alchemy/Phrasea/Controller/Client/Root.php b/lib/Alchemy/Phrasea/Controller/Client/Root.php index 6e90f40b93..99235cbd1b 100644 --- a/lib/Alchemy/Phrasea/Controller/Client/Root.php +++ b/lib/Alchemy/Phrasea/Controller/Client/Root.php @@ -11,6 +11,7 @@ namespace Alchemy\Phrasea\Controller\Client; +use Alchemy\Phrasea\Feed\Aggregate; use Alchemy\Phrasea\SearchEngine\SearchEngineOptions; use Alchemy\Phrasea\Exception\SessionNotFound; use Entities\UserQuery; @@ -538,8 +539,10 @@ class Root implements ControllerProviderInterface */ private function getPublicationStartPage(Application $app) { + $aggregate = Aggregate::createFromUser($app['EM'], $app['authentication']->getUser()); + return $app['twig']->render('client/home_inter_pub_basket.html.twig', array( - 'feeds' => $app['EM']->getRepository('Entities\Feed')->getAllforUser($app['authentication']->getUser()), + 'feeds' => $aggregate, 'image_size' => (int) $app['authentication']->getUser()->getPrefs('images_size') )); } diff --git a/lib/Alchemy/Phrasea/Controller/Prod/Feed.php b/lib/Alchemy/Phrasea/Controller/Prod/Feed.php index 4f905eacdf..c521e4e398 100644 --- a/lib/Alchemy/Phrasea/Controller/Prod/Feed.php +++ b/lib/Alchemy/Phrasea/Controller/Prod/Feed.php @@ -187,7 +187,7 @@ class Feed implements ControllerProviderInterface $controllers->post('/entry/{id}/delete/', function(Application $app, Request $request, $id) { $datas = array('error' => true, 'message' => ''); - + $entry = $app['EM']->getRepository('Entities\FeedEntry')->find($id); if (null === $entry) { diff --git a/lib/Alchemy/Phrasea/Feed/Aggregate.php b/lib/Alchemy/Phrasea/Feed/Aggregate.php index 75ca82667d..a149a60d6c 100644 --- a/lib/Alchemy/Phrasea/Feed/Aggregate.php +++ b/lib/Alchemy/Phrasea/Feed/Aggregate.php @@ -80,24 +80,7 @@ class Aggregate implements FeedInterface public function getEntries($offset_start = 0, $how_many = null) { - $count = 0; - $added = 0; - - $collection = array(); - foreach ($this->feeds as $feed) { - foreach ($feed->getEntries() as $entry) { - if ($count >= $offset_start) { - $collection[] = $entry; - $added++; - } - $count++; - if (null !== $how_many && $added == $how_many) { - return $collection; - } - } - } - - return $collection; + return $this->em->getRepository('Entities\FeedEntry')->findByFeeds($this->feeds, $offset_start, $how_many); } public function getSubtitle() @@ -112,9 +95,7 @@ class Aggregate implements FeedInterface public function getIconUrl() { - $url = '/skins/icons/rss32.gif'; - - return $url; + return false; } public function getCreatedOn() diff --git a/lib/Alchemy/Phrasea/Feed/AggregateLinkGenerator.php b/lib/Alchemy/Phrasea/Feed/AggregateLinkGenerator.php deleted file mode 100644 index 9579fc2090..0000000000 --- a/lib/Alchemy/Phrasea/Feed/AggregateLinkGenerator.php +++ /dev/null @@ -1,108 +0,0 @@ -generator = $generator; - $this->em = $em; - $this->random = $random; - } - - public function generate(Aggregate $aggregate, \User_Adapter $user, $format, $page = null, $renew = false) - { - switch ($format) { - case self::FORMAT_ATOM: - $params = array('token' => $this->getAggregateToken($user, $renew)->getValue(), - 'format' => 'atom'); - if (null !== $page) { - $params['page'] = $page; - } - return new FeedLink( - $this->generator->generate('feed_user_aggregated', $params, UrlGenerator::ABSOLUTE_URL), - sprintf('%s - %s', $aggregate->getTitle(), 'Atom'), - 'application/atom+xml' - ); - break; - case self::FORMAT_RSS: - $params = array('token' => $this->getAggregateToken($user, $renew)->getValue(), - 'format' => 'rss'); - if (null !== $page) { - $params['page'] = $page; - } - return new FeedLink( - $this->generator->generate('feed_user_aggregated', $params, UrlGenerator::ABSOLUTE_URL), - sprintf('%s - %s', $aggregate->getTitle(), 'RSS'), - 'application/rss+xml' - ); - break; - default: - throw new InvalidArgumentException(sprintf('Format %s is not recognized.', $format)); - } - } - - public function generatePublic(Aggregate $aggregate, $format, $page = null) - { - switch ($format) { - case self::FORMAT_ATOM: - $params = array('format' => 'atom'); - if (null !== $page) { - $params['page'] = $page; - } - return new FeedLink( - $this->generator->generate('feed_user_aggregated', $params, UrlGenerator::ABSOLUTE_URL), - sprintf('%s - %s', $aggregate->getTitle(), 'Atom'), - 'application/atom+xml' - ); - break; - case self::FORMAT_RSS: - $params = array('format' => 'rss'); - if (null !== $page) { - $params['page'] = $page; - } - return new FeedLink( - $this->generator->generate('feed_user_aggregated', $params, UrlGenerator::ABSOLUTE_URL), - sprintf('%s - %s', $aggregate->getTitle(), 'RSS'), - 'application/rss+xml' - ); - break; - default: - throw new InvalidArgumentException(sprintf('Format %s is not recognized.', $format)); - } - } - - private function getAggregateToken(\User_Adapter $user, $renew = false) - { - $token = $this->em - ->getRepository('Entities\AggregateToken') - ->findByUser($user); - - if (null === $token || true === $renew) { - if (null === $token) { - $token = new AggregateToken(); - $token->setUsrId($user->get_id()); - } - - $token->setValue($this->random->generatePassword(12, \random::LETTERS_AND_NUMBERS)); - $this->em->persist($token); - $this->em->flush(); - } - - return $token; - } -} diff --git a/lib/Alchemy/Phrasea/Feed/Link.php b/lib/Alchemy/Phrasea/Feed/Link.php deleted file mode 100644 index a6d475ad3e..0000000000 --- a/lib/Alchemy/Phrasea/Feed/Link.php +++ /dev/null @@ -1,68 +0,0 @@ -mimetype = $mimetype; - $this->uri = $uri; - $this->title = $title; - } - - /** - * {@inheritdoc} - */ - public function getMimetype() - { - return $this->mimetype; - } - - /** - * {@inheritdoc} - */ - public function getTitle() - { - return $this->title; - } - - /** - * {@inheritdoc} - */ - public function getURI() - { - return $this->uri; - } -} diff --git a/lib/Alchemy/Phrasea/Feed/LinkGenerator.php b/lib/Alchemy/Phrasea/Feed/LinkGenerator.php deleted file mode 100644 index b63347697d..0000000000 --- a/lib/Alchemy/Phrasea/Feed/LinkGenerator.php +++ /dev/null @@ -1,116 +0,0 @@ -generator = $generator; - $this->em = $em; - $this->random = $random; - } - - public function generate(Feed $feed, \User_Adapter $user, $format, $page = null, $renew = false) - { - switch ($format) { - case self::FORMAT_ATOM: - $params = array('token' => $this->getFeedToken($feed, $user, $renew)->getValue(), - 'id' => $feed->getId(), - 'format' => 'atom'); - if (null !== $page) { - $params['page'] = $page; - } - return new FeedLink( - $this->generator->generate('feed_user', $params, UrlGenerator::ABSOLUTE_URL), - sprintf('%s - %s', $feed->getTitle(), 'Atom'), - 'application/atom+xml' - ); - break; - case self::FORMAT_RSS: - $params = array('token' => $this->getFeedToken($feed, $user, $renew)->getValue(), - 'id' => $feed->getId(), - 'format' => 'rss'); - if (null !== $page) { - $params['page'] = $page; - } - return new FeedLink( - $this->generator->generate('feed_user', $params, UrlGenerator::ABSOLUTE_URL), - sprintf('%s - %s', $feed->getTitle(), 'RSS'), - 'application/rss+xml' - ); - break; - default: - throw new InvalidArgumentException(sprintf('Format %s is not recognized.', $format)); - } - } - - public function generatePublic(Feed $feed, $format, $page = null) - { - switch ($format) { - case self::FORMAT_ATOM: - $params = array('id' => $feed->getId(), - 'format' => 'atom'); - if (null !== $page) { - $params['page'] = $page; - } - return new FeedLink( - $this->generator->generate('feed_public', $params, UrlGenerator::ABSOLUTE_URL), - sprintf('%s - %s', $feed->getTitle(), 'Atom'), - 'application/atom+xml' - ); - break; - case self::FORMAT_RSS: - $params = array('id' => $feed->getId(), - 'format' => 'rss'); - if (null !== $page) { - $params['page'] = $page; - } - return new FeedLink( - $this->generator->generate('feed_public', $params, UrlGenerator::ABSOLUTE_URL), - sprintf('%s - %s', $feed->getTitle(), 'RSS'), - 'application/rss+xml' - ); - break; - default: - throw new InvalidArgumentException(sprintf('Format %s is not recognized.', $format)); - } - } - - private function getFeedToken(Feed $feed, \User_Adapter $user, $renew = false) - { - $token = $this->em - ->getRepository('Entities\FeedToken') - ->findByFeedAndUser($feed, $user); - - if (null === $token || true === $renew) { - if (null === $token) { - $token = new FeedToken(); - $token->setFeed($feed); - $token->setUsrId($user->get_id()); - $feed->addToken($token); - - $this->em->persist($feed); - } - - $token->setValue($this->random->generatePassword(12, \random::LETTERS_AND_NUMBERS)); - $this->em->persist($token); - $this->em->flush(); - } - - return $token; - } -} diff --git a/lib/Alchemy/Phrasea/Feed/LinkInterface.php b/lib/Alchemy/Phrasea/Feed/LinkInterface.php deleted file mode 100644 index 4d45c2d4d8..0000000000 --- a/lib/Alchemy/Phrasea/Feed/LinkInterface.php +++ /dev/null @@ -1,30 +0,0 @@ -_em->createQuery($dql); $feeds = $query->getResult(); @@ -44,7 +44,7 @@ class SessionRepository extends EntityRepository { $dql = 'SELECT f FROM Entities\Feed f WHERE f.public = true - ORDER BY f.created_on DESC'; + ORDER BY f.updated_on DESC'; $query = $this->_em->createQuery($dql); $feeds = $query->getResult(); diff --git a/lib/Doctrine/Repositories/UserSettingRepository.php b/lib/Doctrine/Repositories/UserSettingRepository.php index 3537ecd8b5..bc7a7a15da 100644 --- a/lib/Doctrine/Repositories/UserSettingRepository.php +++ b/lib/Doctrine/Repositories/UserSettingRepository.php @@ -38,7 +38,7 @@ class UserSettingRepository extends EntityRepository public function findByFeeds($feeds, $offset_start = null, $how_many = null) { $dql = 'SELECT f FROM Entities\FeedEntry f - WHERE f.feed IN (:feeds)'; + WHERE f.feed IN (:feeds) order by f.updated_on DESC'; $query = $this->_em->createQuery($dql); $query->setParameter('feeds', $feeds); diff --git a/lib/classes/record/preview.php b/lib/classes/record/preview.php index 2d94004888..90a7c1adf2 100644 --- a/lib/classes/record/preview.php +++ b/lib/classes/record/preview.php @@ -185,19 +185,19 @@ class record_preview extends record_adapter foreach ($entry->getItems() as $element) { $i ++; if ($first) { - $sbas_id = $element->getRecord()->get_sbas_id(); - $record_id = $element->getRecord()->get_record_id(); - $this->original_item = $element; + $sbas_id = $element->getRecord($this->app)->get_sbas_id(); + $record_id = $element->getRecord($this->app)->get_record_id(); $this->name = $entry->getTitle(); + $this->original_item = $element; $number = $element->getOrd(); } $first = false; if ($element->getOrd() == $pos) { - $sbas_id = $element->getRecord()->get_sbas_id(); - $record_id = $element->getRecord()->get_record_id(); - $this->original_item = $element; + $sbas_id = $element->getRecord($this->app)->get_sbas_id(); + $record_id = $element->getRecord($this->app)->get_record_id(); $this->name = $entry->getTitle(); + $this->original_item = $element; $number = $element->getOrd(); } } diff --git a/templates/mobile/lightbox/feed.html.twig b/templates/mobile/lightbox/feed.html.twig index 526d323729..c16994b940 100644 --- a/templates/mobile/lightbox/feed.html.twig +++ b/templates/mobile/lightbox/feed.html.twig @@ -29,7 +29,7 @@ {% for item in feed_entry.getItems() %}
  • - {{thumbnail.format(item.getRecord().get_thumbnail(), 80, 80, '', true, false)}} + {{thumbnail.format(item.getRecord(app).get_thumbnail(), 80, 80, '', true, false)}}
    • diff --git a/templates/mobile/lightbox/feed_element.html.twig b/templates/mobile/lightbox/feed_element.html.twig index 870e3c4697..cae9e11297 100644 --- a/templates/mobile/lightbox/feed_element.html.twig +++ b/templates/mobile/lightbox/feed_element.html.twig @@ -15,7 +15,7 @@
    Back -

    {{feed_element.getOrd()}} - {{record.getTitle()}}

    +

    {{feed_element.getOrd()}} - {{record.get_title()}}

    Home
    diff --git a/templates/web/client/home_inter_pub_basket.html.twig b/templates/web/client/home_inter_pub_basket.html.twig index 27e90e55d9..b2df45e908 100644 --- a/templates/web/client/home_inter_pub_basket.html.twig +++ b/templates/web/client/home_inter_pub_basket.html.twig @@ -39,7 +39,7 @@
    {% for item in entry.getItems() %} - {% set record = item.getRecord() %} + {% set record = item.getRecord(app) %} {% set thumbnail = record.get_thumbnail() %} {% set docType = record.get_type() %} {% set duration = "" %} diff --git a/templates/web/lightbox/IE6/feed_container.html.twig b/templates/web/lightbox/IE6/feed_container.html.twig index 2dd1f08a7f..4553ae4471 100644 --- a/templates/web/lightbox/IE6/feed_container.html.twig +++ b/templates/web/lightbox/IE6/feed_container.html.twig @@ -10,7 +10,7 @@ -
    +
    diff --git a/templates/web/lightbox/feed_container.html.twig b/templates/web/lightbox/feed_container.html.twig index 2dd1f08a7f..4553ae4471 100644 --- a/templates/web/lightbox/feed_container.html.twig +++ b/templates/web/lightbox/feed_container.html.twig @@ -10,7 +10,7 @@ -
    +
    diff --git a/templates/web/prod/actions/publish/publish_edit.html.twig b/templates/web/prod/actions/publish/publish_edit.html.twig index ccd22f34cf..0008ab0f25 100644 --- a/templates/web/prod/actions/publish/publish_edit.html.twig +++ b/templates/web/prod/actions/publish/publish_edit.html.twig @@ -18,7 +18,7 @@
    {% for content in entry.getItems() %}
    - {{ _self.format_diapo(content.getRecord()) }} + {{ _self.format_diapo(content.getRecord(app)) }}
    diff --git a/templates/web/prod/feeds/entry_macro.html.twig b/templates/web/prod/feeds/entry_macro.html.twig index 3954bde598..6b856d65e6 100644 --- a/templates/web/prod/feeds/entry_macro.html.twig +++ b/templates/web/prod/feeds/entry_macro.html.twig @@ -7,7 +7,11 @@

    {% if feed.isAggregated() %} - + {% endif %} {{ entry.getTitle() }} {% set author = entry.getAuthorName() %} @@ -47,14 +51,18 @@ {% trans %} dans {{feed_name}} {% endtrans %} - + {% endif %}

    {{ entry.getSubtitle()|nl2br|raw }}

    {% for item in entry.getItems() %} - {% set record = item.getRecord() %} + {% set record = item.getRecord(app) %} {% set prefix = 'PUBLI_' ~ item.getId() %} {{record_format.block(record, false, null, prefix, entry.getId())}} {% endfor %} diff --git a/templates/web/prod/feeds/feeds.html.twig b/templates/web/prod/feeds/feeds.html.twig index 182ff7b81a..f3c5fa6605 100644 --- a/templates/web/prod/feeds/feeds.html.twig +++ b/templates/web/prod/feeds/feeds.html.twig @@ -6,7 +6,11 @@

    - + {% if feed.isAggregated %} {% trans 'Toutes les publications' %} @@ -36,7 +40,11 @@ {% for aval_feed in feeds %}
  • - {{ aval_feed.getTitle() }} + {{ aval_feed.getTitle() }}
    • {% endfor %} diff --git a/templates/web/prod/preview/feed_train.html.twig b/templates/web/prod/preview/feed_train.html.twig index d9d44f0b9a..da1d1cc77c 100644 --- a/templates/web/prod/preview/feed_train.html.twig +++ b/templates/web/prod/preview/feed_train.html.twig @@ -1,8 +1,8 @@
      - {% for child in record.get_container().get_content() %} + {% for child in record.get_container() %} - {% set thumbnail = child.get_record().get_thumbnail() %} + {% set thumbnail = child.getRecord(app).get_thumbnail() %} {% if thumbnail.is_paysage() %} {% set style = 'width:65px;top:' %} {% set top = ((66 - (65 / (thumbnail.get_width() / thumbnail.get_height()))) / 2)|round %} @@ -14,16 +14,16 @@ {% set tooltip = '' %} {% if app['phraseanet.registry'].get('GV_rollover_reg_preview') %} - {% set tooltip = 'tooltipsrc="' ~ path('prod_tooltip_preview', { 'sbas_id' : child.get_record().get_sbas_id(), 'record_id' : child.get_record().get_record_id() }) ~ '"' %} + {% set tooltip = 'tooltipsrc="' ~ path('prod_tooltip_preview', { 'sbas_id' : child.getRecord(app).get_sbas_id(), 'record_id' : child.get_record().get_record_id() }) ~ '"' %} {% endif %} {% set class = '' %} - {% if record.get_number() == child.get_ord() %} + {% if record.get_number() == child.getOrd() %} {% set class = ' selected' %} {% endif %}
    • -
      • {% endfor %} diff --git a/tests/Alchemy/Tests/Phrasea/Application/OverviewTest.php b/tests/Alchemy/Tests/Phrasea/Application/OverviewTest.php index 501b04c31a..bfb7eef1ab 100644 --- a/tests/Alchemy/Tests/Phrasea/Application/OverviewTest.php +++ b/tests/Alchemy/Tests/Phrasea/Application/OverviewTest.php @@ -9,19 +9,19 @@ class ApplicationOverviewTest extends \PhraseanetWebTestCaseAuthenticatedAbstrac { public function testDatafilesRouteAuthenticated() { - $crawler = self::$DI['client']->request('GET', '/datafiles/' . self::$DI['record_1']->get_sbas_id() . '/' . self::$DI['record_1']->get_record_id() . '/preview/'); + $crawler = self::$DI['client']->request('GET', '/datafiles/' . self::$DI['record_24']->get_sbas_id() . '/' . self::$DI['record_24']->get_record_id() . '/preview/'); $response = self::$DI['client']->getResponse(); $this->assertEquals(200, $response->getStatusCode()); $content_disposition = explode(';', $response->headers->get('content-disposition')); $this->assertEquals('inline', $content_disposition[0]); - $this->assertEquals(self::$DI['record_1']->get_preview()->get_mime(), $response->headers->get('content-type')); - $this->assertEquals(self::$DI['record_1']->get_preview()->get_size(), $response->headers->get('content-length')); + $this->assertEquals(self::$DI['record_24']->get_preview()->get_mime(), $response->headers->get('content-type')); + $this->assertEquals(self::$DI['record_24']->get_preview()->get_size(), $response->headers->get('content-length')); } public function testDatafilesNonExistentSubdef() { - self::$DI['client']->request('GET', '/datafiles/' . self::$DI['record_1']->get_sbas_id() . '/' . self::$DI['record_1']->get_record_id() . '/asubdefthatdoesnotexists/'); + self::$DI['client']->request('GET', '/datafiles/' . self::$DI['record_24']->get_sbas_id() . '/' . self::$DI['record_24']->get_record_id() . '/asubdefthatdoesnotexists/'); $this->assertNotFoundResponse(self::$DI['client']->getResponse()); } @@ -56,7 +56,7 @@ class ApplicationOverviewTest extends \PhraseanetWebTestCaseAuthenticatedAbstrac public function testDatafilesRouteNotAuthenticated() { self::$DI['app']['authentication']->closeAccount(); - self::$DI['client']->request('GET', '/datafiles/' . self::$DI['record_1']->get_sbas_id() . '/' . self::$DI['record_1']->get_record_id() . '/preview/'); + self::$DI['client']->request('GET', '/datafiles/' . self::$DI['record_24']->get_sbas_id() . '/' . self::$DI['record_24']->get_record_id() . '/preview/'); $this->assertForbiddenResponse(self::$DI['client']->getResponse()); } @@ -64,7 +64,7 @@ class ApplicationOverviewTest extends \PhraseanetWebTestCaseAuthenticatedAbstrac public function testDatafilesRouteNotAuthenticatedUnknownSubdef() { self::$DI['app']['authentication']->closeAccount(); - self::$DI['client']->request('GET', '/datafiles/' . self::$DI['record_1']->get_sbas_id() . '/' . self::$DI['record_1']->get_record_id() . '/notfoundreview/'); + self::$DI['client']->request('GET', '/datafiles/' . self::$DI['record_24']->get_sbas_id() . '/' . self::$DI['record_24']->get_record_id() . '/notfoundreview/'); $this->assertForbiddenResponse(self::$DI['client']->getResponse()); } @@ -105,7 +105,7 @@ class ApplicationOverviewTest extends \PhraseanetWebTestCaseAuthenticatedAbstrac { $this->assertTrue(self::$DI['app']['authentication']->isAuthenticated()); $token = "unexisting_token"; - $url = '/permalink/v1/' . self::$DI['record_1']->get_sbas_id() . "/" . self::$DI['record_1']->get_record_id() . '/caption/?token='.$token; + $url = '/permalink/v1/' . self::$DI['record_24']->get_sbas_id() . "/" . self::$DI['record_24']->get_record_id() . '/caption/?token='.$token; $crawler = self::$DI['client']->request('GET', $url); $response = self::$DI['client']->getResponse(); @@ -158,8 +158,8 @@ class ApplicationOverviewTest extends \PhraseanetWebTestCaseAuthenticatedAbstrac protected function get_a_caption(array $headers = array()) { - $token = self::$DI['record_1']->get_thumbnail()->get_permalink()->get_token(); - $url = '/permalink/v1/' . self::$DI['record_1']->get_sbas_id() . "/" . self::$DI['record_1']->get_record_id() . '/caption/?token='.$token; + $token = self::$DI['record_24']->get_thumbnail()->get_permalink()->get_token(); + $url = '/permalink/v1/' . self::$DI['record_24']->get_sbas_id() . "/" . self::$DI['record_24']->get_record_id() . '/caption/?token='.$token; $crawler = self::$DI['client']->request('GET', $url); $response = self::$DI['client']->getResponse(); @@ -168,15 +168,15 @@ class ApplicationOverviewTest extends \PhraseanetWebTestCaseAuthenticatedAbstrac $this->assertEquals($value, $response->headers->get($name)); } - $caption = self::$DI['record_1']->get_caption()->serialize(\caption_record::SERIALIZE_JSON); + $caption = self::$DI['record_24']->get_caption()->serialize(\caption_record::SERIALIZE_JSON); $this->assertEquals($caption, $response->getContent()); $this->assertEquals(200, $response->getStatusCode()); } protected function get_a_permalinkBCcompatibility(array $headers = array()) { - $token = self::$DI['record_1']->get_preview()->get_permalink()->get_token(); - $url = '/permalink/v1/whateverIwannt/' . self::$DI['record_1']->get_sbas_id() . '/' . self::$DI['record_1']->get_record_id() . '/' . $token . '/preview/'; + $token = self::$DI['record_24']->get_preview()->get_permalink()->get_token(); + $url = '/permalink/v1/whateverIwannt/' . self::$DI['record_24']->get_sbas_id() . '/' . self::$DI['record_24']->get_record_id() . '/' . $token . '/preview/'; $crawler = self::$DI['client']->request('GET', $url); $response = self::$DI['client']->getResponse(); @@ -191,8 +191,8 @@ class ApplicationOverviewTest extends \PhraseanetWebTestCaseAuthenticatedAbstrac protected function get_a_permaviewBCcompatibility(array $headers = array()) { - $token = self::$DI['record_1']->get_preview()->get_permalink()->get_token(); - $url = '/permalink/v1/whateverIwannt/' . self::$DI['record_1']->get_sbas_id() . '/' . self::$DI['record_1']->get_record_id() . '/' . $token . '/preview/'; + $token = self::$DI['record_24']->get_preview()->get_permalink()->get_token(); + $url = '/permalink/v1/whateverIwannt/' . self::$DI['record_24']->get_sbas_id() . '/' . self::$DI['record_24']->get_record_id() . '/' . $token . '/preview/'; $url = $url . 'view/'; $crawler = self::$DI['client']->request('GET', $url); @@ -207,8 +207,8 @@ class ApplicationOverviewTest extends \PhraseanetWebTestCaseAuthenticatedAbstrac protected function get_a_permalink(array $headers = array()) { - $token = self::$DI['record_1']->get_preview()->get_permalink()->get_token(); - $url = '/permalink/v1/' . self::$DI['record_1']->get_sbas_id() . '/' . self::$DI['record_1']->get_record_id() . '/preview/whateverIwannt.jpg?token=' . $token . ''; + $token = self::$DI['record_24']->get_preview()->get_permalink()->get_token(); + $url = '/permalink/v1/' . self::$DI['record_24']->get_sbas_id() . '/' . self::$DI['record_24']->get_record_id() . '/preview/whateverIwannt.jpg?token=' . $token . ''; $crawler = self::$DI['client']->request('GET', $url); $response = self::$DI['client']->getResponse(); @@ -217,14 +217,18 @@ class ApplicationOverviewTest extends \PhraseanetWebTestCaseAuthenticatedAbstrac $this->assertEquals($value, $response->headers->get($name)); } +<<<<<<< HEAD $this->assertEquals(rtrim(self::$DI['app']['phraseanet.configuration']['main']['servername'], '/') . "/permalink/v1/1/". self::$DI['record_1']->get_record_id()."/caption/?token=".$token, $response->headers->get("Link")); +======= + $this->assertEquals($response->headers->get("Link"), "/permalink/v1/1/". self::$DI['record_24']->get_record_id()."/caption/?token=".$token); +>>>>>>> Rebased, fixed minor bugs $this->assertEquals(200, $response->getStatusCode()); } protected function get_a_permaview(array $headers = array()) { - $token = self::$DI['record_1']->get_preview()->get_permalink()->get_token(); - $url = '/permalink/v1/' . self::$DI['record_1']->get_sbas_id() . '/' . self::$DI['record_1']->get_record_id() . '/preview/?token=' . $token . ''; + $token = self::$DI['record_24']->get_preview()->get_permalink()->get_token(); + $url = '/permalink/v1/' . self::$DI['record_24']->get_sbas_id() . '/' . self::$DI['record_24']->get_record_id() . '/preview/?token=' . $token . ''; $crawler = self::$DI['client']->request('GET', $url); $response = self::$DI['client']->getResponse(); diff --git a/tests/Alchemy/Tests/Phrasea/Core/Provider/FeedServiceProviderTest.php b/tests/Alchemy/Tests/Phrasea/Core/Provider/FeedServiceProviderTest.php index 3dfd282d4b..6d65359bb6 100644 --- a/tests/Alchemy/Tests/Phrasea/Core/Provider/FeedServiceProviderTest.php +++ b/tests/Alchemy/Tests/Phrasea/Core/Provider/FeedServiceProviderTest.php @@ -13,12 +13,12 @@ class FeedServiceProviderTest extends ServiceProviderTestCase array( 'Alchemy\Phrasea\Core\Provider\FeedServiceProvider', 'feed.user-link-generator', - 'Alchemy\Phrasea\Feed\LinkGenerator' + 'Alchemy\Phrasea\Feed\Link\FeedLinkGenerator' ), array( 'Alchemy\Phrasea\Core\Provider\FeedServiceProvider', 'feed.aggregate-link-generator', - 'Alchemy\Phrasea\Feed\AggregateLinkGenerator' + 'Alchemy\Phrasea\Feed\Link\AggregateLinkGenerator' ), ); } diff --git a/tests/Alchemy/Tests/Phrasea/Feed/LinkGeneratorTest.php b/tests/Alchemy/Tests/Phrasea/Feed/LinkGeneratorTest.php deleted file mode 100644 index 3739c297ee..0000000000 --- a/tests/Alchemy/Tests/Phrasea/Feed/LinkGeneratorTest.php +++ /dev/null @@ -1,194 +0,0 @@ -persist($feed); - self::$DI['app']['EM']->flush(); - - $generator = $this->getMockBuilder('Symfony\Component\Routing\Generator\UrlGenerator') - ->disableOriginalConstructor() - ->getMock(); - - if ($alreadyCreated) { - $token = $this->insertOneFeedToken($feed, $user); - $tokenValue = $token->getValue(); - } - - $capture = null; - $generator->expects($this->once()) - ->method('generate') - ->with('feed_user', $this->isType('array'), UrlGenerator::ABSOLUTE_URL) - ->will($this->returnCallback(function ($name, $data, $option) use (&$capture, $expected) { - $capture = $data; - - return $expected; - })); - - $random = self::$DI['app']['tokens']; - - $linkGenerator = new LinkGenerator($generator, self::$DI['app']['EM'], $random); - - $link = $linkGenerator->generate($feed, $user, $format, $page, $renew); - - $this->assertSame($expected, $link->getUri()); - if ($format == "atom") { - $this->assertSame("application/atom+xml", $link->getMimetype()); - $this->assertSame("Title - Atom", $link->getTitle()); - } - elseif ($format == "rss") { - $this->assertSame("application/rss+xml", $link->getMimetype()); - $this->assertSame("Title - RSS", $link->getTitle()); - } - - if ($alreadyCreated) { - if ($renew) { - $this->assertEquals($feed->getId(), $capture['id']); - $this->assertEquals($format, $capture['format']); - $this->assertNotEquals($tokenValue, $capture['token']); - if (null !== $page) { - $this->assertEquals($page, $capture['page']); - } - - $this->assertCount(0, self::$DI['app']['EM'] - ->getRepository("Entities\FeedToken") - ->findBy(array('value' => $tokenValue))); - $this->assertCount(1, self::$DI['app']['EM'] - ->getRepository("Entities\FeedToken") - ->findBy(array('value' => $capture['token']))); - } else { - $expectedParams = array( - 'token' => $tokenValue, - 'id' => $feed->getId(), - 'format' => $format, - ); - - if ($page !== null) { - $expectedParams['page'] = $page; - } - - $this->assertEquals($expectedParams, $capture); - - $this->assertCount(1, self::$DI['app']['EM'] - ->getRepository("Entities\FeedToken") - ->findBy(array('value' => $tokenValue))); - } - } else { - if (null !== $page) { - $this->assertEquals($page, $capture['page']); - } - $this->assertEquals($feed->getId(), $capture['id']); - $this->assertEquals($format, $capture['format']); - $this->assertEquals(12, strlen($capture['token'])); - - $this->assertCount(1, self::$DI['app']['EM'] - ->getRepository("Entities\FeedToken") - ->findBy(array('value' => $capture['token']))); - } - $token = self::$DI['app']['EM'] - ->getRepository('Entities\FeedToken') - ->findByFeedAndUser($feed, $user); - self::$DI['app']['EM']->remove($token); - self::$DI['app']['EM']->flush(); - } - - /** - * @dataProvider provideGenerationDataPublic - */ - public function testGeneratePublic($expected, $format, $feed, $page) - { - self::$DI['app']['EM']->persist($feed); - self::$DI['app']['EM']->flush(); - - $generator = $this->getMockBuilder('Symfony\Component\Routing\Generator\UrlGenerator') - ->disableOriginalConstructor() - ->getMock(); - - $capture = null; - $generator->expects($this->once()) - ->method('generate') - ->with('feed_public', $this->isType('array'), UrlGenerator::ABSOLUTE_URL) - ->will($this->returnCallback(function ($name, $data, $option) use (&$capture, $expected) { - $capture = $data; - - return $expected; - })); - - $random = self::$DI['app']['tokens']; - - $linkGenerator = new LinkGenerator($generator, self::$DI['app']['EM'], $random); - - $link = $linkGenerator->generatePublic($feed, $format, $page); - - $this->assertSame($expected, $link->getUri()); - if ($format == "atom") { - $this->assertSame("application/atom+xml", $link->getMimetype()); - $this->assertSame("Title - Atom", $link->getTitle()); - } - elseif ($format == "rss") { - $this->assertSame("application/rss+xml", $link->getMimetype()); - $this->assertSame("Title - RSS", $link->getTitle()); - } - - if (null !== $page) { - $this->assertEquals($page, $capture['page']); - } - $this->assertEquals($feed->getId(), $capture['id']); - $this->assertEquals($format, $capture['format']); - } - - public function provideGenerationData() - { - $user = $this->getMockBuilder('User_Adapter') - ->disableOriginalConstructor() - ->getMock(); - - $user->expects($this->any()) - ->method('get_id') - ->will($this->returnValue(42)); - - $feed = new \Entities\Feed(); - $feed->setTitle('Title'); - - return array( - array('doliprane', 'atom', $feed, $user, null, false, false), - array('doliprane', 'atom', $feed, $user, null, false, true), - array('doliprane', 'atom', $feed, $user, null, true, false), - array('doliprane', 'atom', $feed, $user, null, true, true), - array('doliprane', 'atom', $feed, $user, 1, false, false), - array('doliprane', 'atom', $feed, $user, 1, false, true), - array('doliprane', 'atom', $feed, $user, 1, true, false), - array('doliprane', 'atom', $feed, $user, 1, true, true), - array('doliprane', 'rss', $feed, $user, null, false, false), - array('doliprane', 'rss', $feed, $user, null, false, true), - array('doliprane', 'rss', $feed, $user, null, true, false), - array('doliprane', 'rss', $feed, $user, null, true, true), - array('doliprane', 'rss', $feed, $user, 1, false, false), - array('doliprane', 'rss', $feed, $user, 1, false, true), - array('doliprane', 'rss', $feed, $user, 1, true, false), - array('doliprane', 'rss', $feed, $user, 1, true, true), - ); - } - - public function provideGenerationDataPublic() - { - $feed = new \Entities\Feed(); - $feed->setTitle('Title'); - - return array( - array('doliprane', 'atom', $feed, null), - array('doliprane', 'atom', $feed, 1), - array('doliprane', 'rss', $feed, null), - array('doliprane', 'rss', $feed, 1) - ); - } -} From c1157d0613f9404e3639d3718f4c8d6cc687d555 Mon Sep 17 00:00:00 2001 From: Andrey Date: Mon, 17 Jun 2013 09:57:53 +0200 Subject: [PATCH 16/67] Fixed error in RSSFeeds --- .../Phrasea/Controller/Root/RSSFeeds.php | 21 ++++++++++--------- 1 file changed, 11 insertions(+), 10 deletions(-) diff --git a/lib/Alchemy/Phrasea/Controller/Root/RSSFeeds.php b/lib/Alchemy/Phrasea/Controller/Root/RSSFeeds.php index 705cd18e36..bbd9dd564c 100644 --- a/lib/Alchemy/Phrasea/Controller/Root/RSSFeeds.php +++ b/lib/Alchemy/Phrasea/Controller/Root/RSSFeeds.php @@ -28,8 +28,9 @@ class RSSFeeds implements ControllerProviderInterface public function connect(Application $app) { $controllers = $app['controllers_factory']; + $that = $this; - $controllers->get('/feed/{id}/{format}/', function(Application $app, $id, $format) { + $controllers->get('/feed/{id}/{format}/', function(Application $app, $id, $format) use ($that) { $feed = $app['EM']->getRepository('Entities\Feed')->find($id); if (!$feed) { @@ -45,13 +46,13 @@ class RSSFeeds implements ControllerProviderInterface $page = (int) $request->query->get('page'); $page = $page < 1 ? 1 : $page; - return $app[$this->getFormater($format)]->createResponse($feed, $page); + return $app[$that->getFormater($format)]->createResponse($feed, $page); }) ->bind('feed_public') ->assert('id', '\d+') ->assert('format', '(rss|atom)'); - $controllers->get('/userfeed/{token}/{id}/{format}/', function(Application $app, $token, $id, $format) { + $controllers->get('/userfeed/{token}/{id}/{format}/', function(Application $app, $token, $id, $format) use ($that) { $token = $app["EM"]->find('Entities\FeedToken', $id); $feed = $token->getFeed(); $usrId = $token->getUsrId(); @@ -63,13 +64,13 @@ class RSSFeeds implements ControllerProviderInterface $page = (int) $request->query->get('page'); $page = $page < 1 ? 1 : $page; - return $app[$this->getFormater($format)]->createResponse($feed, $page, $user); + return $app[$that->getFormater($format)]->createResponse($feed, $page, $user); }) ->bind('feed_user') ->assert('id', '\d+') ->assert('format', '(rss|atom)'); - $controllers->get('/userfeed/aggregated/{token}/{format}/', function(Application $app, $token, $format) { + $controllers->get('/userfeed/aggregated/{token}/{format}/', function(Application $app, $token, $format) use ($that) { $token = $app['EM']->getRepository('Entities\AggregateToken')->findOneBy(array("value" => $token)); $usrId = $token->getUsrId(); @@ -84,12 +85,12 @@ class RSSFeeds implements ControllerProviderInterface $page = (int) $request->query->get('page'); $page = $page < 1 ? 1 : $page; - return $app[$this->getFormater($format)]->createResponse($aggregate, $page, $user); + return $app[$that->getFormater($format)]->createResponse($aggregate, $page, $user); }) ->bind('feed_user_aggregated') ->assert('format', '(rss|atom)'); - $controllers->get('/aggregated/{format}/', function(Application $app, $format) { + $controllers->get('/aggregated/{format}/', function(Application $app, $format) use ($that) { $feeds = $app['EM']->getRepository('Entities\Feed')->findAllPublic(); $feed = new Aggregate($app['EM'], $feeds); @@ -97,12 +98,12 @@ class RSSFeeds implements ControllerProviderInterface $page = (int) $request->query->get('page'); $page = $page < 1 ? 1 : $page; - return $app[$this->getFormater($format)]->createResponse($feed, $page); + return $app[$that->getFormater($format)]->createResponse($feed, $page); }) ->bind('feed_public_aggregated') ->assert('format', '(rss|atom)'); - $controllers->get('/cooliris/', function(Application $app) { + $controllers->get('/cooliris/', function(Application $app) use ($that) { $feeds = $app['EM']->getRepository('Entities\Feed')->findAllPublic(); $feed = new Aggregate($app['EM'], $feeds); @@ -110,7 +111,7 @@ class RSSFeeds implements ControllerProviderInterface $page = (int) $request->query->get('page'); $page = $page < 1 ? 1 : $page; - return $app[$this->getFormater('cooliris')]->createResponse($feed, $page, null, 'Phraseanet', $app); + return $app[$that->getFormater('cooliris')]->createResponse($feed, $page, null, 'Phraseanet', $app); }) ->bind('feed_public_cooliris'); From 3f8855f5cbe43d661a93ffca0f9079c133155bcd Mon Sep 17 00:00:00 2001 From: Andrey Date: Mon, 17 Jun 2013 10:29:19 +0200 Subject: [PATCH 17/67] Fixed zero and null confusion in RSSFeeds --- lib/Alchemy/Phrasea/Feed/Aggregate.php | 2 +- tests/Alchemy/Tests/Phrasea/Controller/Root/RSSFeedTest.php | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/lib/Alchemy/Phrasea/Feed/Aggregate.php b/lib/Alchemy/Phrasea/Feed/Aggregate.php index a149a60d6c..05bac9520e 100644 --- a/lib/Alchemy/Phrasea/Feed/Aggregate.php +++ b/lib/Alchemy/Phrasea/Feed/Aggregate.php @@ -78,7 +78,7 @@ class Aggregate implements FeedInterface return true; } - public function getEntries($offset_start = 0, $how_many = null) + public function getEntries($offset_start = null, $how_many = null) { return $this->em->getRepository('Entities\FeedEntry')->findByFeeds($this->feeds, $offset_start, $how_many); } diff --git a/tests/Alchemy/Tests/Phrasea/Controller/Root/RSSFeedTest.php b/tests/Alchemy/Tests/Phrasea/Controller/Root/RSSFeedTest.php index e1f680d3f1..4e05f601d5 100644 --- a/tests/Alchemy/Tests/Phrasea/Controller/Root/RSSFeedTest.php +++ b/tests/Alchemy/Tests/Phrasea/Controller/Root/RSSFeedTest.php @@ -42,7 +42,7 @@ class RssFeedTest extends \PhraseanetWebTestCaseAbstract public function testPublicFeedAggregated() { - $this->insertOneFeed(self::$DI['user']); + $this->insertOneFeed(self::$DI['user'], "test", true); self::$DI['client']->request('GET', '/feeds/aggregated/atom/'); $response = self::$DI['client']->getResponse(); From 6bdfa2da29469923af5b53d2dcb8f08690e21e3f Mon Sep 17 00:00:00 2001 From: Andrey Date: Mon, 17 Jun 2013 14:01:03 +0200 Subject: [PATCH 18/67] Fixed RSSFeeds bug for php 5.3, fixed Aggregate->getEntries() called without any feed --- .../Phrasea/Controller/Root/RSSFeeds.php | 38 ++++++------------- .../Core/Provider/FeedServiceProvider.php | 15 ++++++++ lib/Alchemy/Phrasea/Feed/Aggregate.php | 3 ++ .../Repositories/UserSettingRepository.php | 2 +- .../client/home_inter_pub_basket.html.twig | 6 +-- tests/classes/api/v1/api_v1_adapterTest.php | 21 ++++------ 6 files changed, 40 insertions(+), 45 deletions(-) diff --git a/lib/Alchemy/Phrasea/Controller/Root/RSSFeeds.php b/lib/Alchemy/Phrasea/Controller/Root/RSSFeeds.php index bbd9dd564c..b824393765 100644 --- a/lib/Alchemy/Phrasea/Controller/Root/RSSFeeds.php +++ b/lib/Alchemy/Phrasea/Controller/Root/RSSFeeds.php @@ -30,7 +30,7 @@ class RSSFeeds implements ControllerProviderInterface $controllers = $app['controllers_factory']; $that = $this; - $controllers->get('/feed/{id}/{format}/', function(Application $app, $id, $format) use ($that) { + $controllers->get('/feed/{id}/{format}/', function(Application $app, $id, $format) { $feed = $app['EM']->getRepository('Entities\Feed')->find($id); if (!$feed) { @@ -46,13 +46,13 @@ class RSSFeeds implements ControllerProviderInterface $page = (int) $request->query->get('page'); $page = $page < 1 ? 1 : $page; - return $app[$that->getFormater($format)]->createResponse($feed, $page); + return $app['feed.formatter-strategy']($format)->createResponse($feed, $page); }) ->bind('feed_public') ->assert('id', '\d+') ->assert('format', '(rss|atom)'); - $controllers->get('/userfeed/{token}/{id}/{format}/', function(Application $app, $token, $id, $format) use ($that) { + $controllers->get('/userfeed/{token}/{id}/{format}/', function(Application $app, $token, $id, $format) { $token = $app["EM"]->find('Entities\FeedToken', $id); $feed = $token->getFeed(); $usrId = $token->getUsrId(); @@ -64,13 +64,13 @@ class RSSFeeds implements ControllerProviderInterface $page = (int) $request->query->get('page'); $page = $page < 1 ? 1 : $page; - return $app[$that->getFormater($format)]->createResponse($feed, $page, $user); + return $app['feed.formatter-strategy']($format)->createResponse($feed, $page, $user); }) ->bind('feed_user') ->assert('id', '\d+') ->assert('format', '(rss|atom)'); - $controllers->get('/userfeed/aggregated/{token}/{format}/', function(Application $app, $token, $format) use ($that) { + $controllers->get('/userfeed/aggregated/{token}/{format}/', function(Application $app, $token, $format) { $token = $app['EM']->getRepository('Entities\AggregateToken')->findOneBy(array("value" => $token)); $usrId = $token->getUsrId(); @@ -85,12 +85,12 @@ class RSSFeeds implements ControllerProviderInterface $page = (int) $request->query->get('page'); $page = $page < 1 ? 1 : $page; - return $app[$that->getFormater($format)]->createResponse($aggregate, $page, $user); + return $app['feed.formatter-strategy']($format)->createResponse($aggregate, $page, $user); }) ->bind('feed_user_aggregated') ->assert('format', '(rss|atom)'); - $controllers->get('/aggregated/{format}/', function(Application $app, $format) use ($that) { + $controllers->get('/aggregated/{format}/', function(Application $app, $format) { $feeds = $app['EM']->getRepository('Entities\Feed')->findAllPublic(); $feed = new Aggregate($app['EM'], $feeds); @@ -98,12 +98,12 @@ class RSSFeeds implements ControllerProviderInterface $page = (int) $request->query->get('page'); $page = $page < 1 ? 1 : $page; - return $app[$that->getFormater($format)]->createResponse($feed, $page); + return $app['feed.formatter-strategy']($format)->createResponse($feed, $page); }) ->bind('feed_public_aggregated') ->assert('format', '(rss|atom)'); - $controllers->get('/cooliris/', function(Application $app) use ($that) { + $controllers->get('/cooliris/', function(Application $app) { $feeds = $app['EM']->getRepository('Entities\Feed')->findAllPublic(); $feed = new Aggregate($app['EM'], $feeds); @@ -111,27 +111,11 @@ class RSSFeeds implements ControllerProviderInterface $page = (int) $request->query->get('page'); $page = $page < 1 ? 1 : $page; - return $app[$that->getFormater('cooliris')]->createResponse($feed, $page, null, 'Phraseanet', $app); + + return $app['feed.formatter-strategy']('cooliris')->createResponse($feed, $page, null, 'Phraseanet', $app); }) ->bind('feed_public_cooliris'); return $controllers; } - - private function getFormater($type) - { - switch ($type) { - case 'rss': - return 'feed.rss-formatter'; - break; - case 'atom': - return 'feed.atom-formatter'; - break; - case 'cooliris': - return 'feed.cooliris-formatter'; - break; - default: - throw new InvalidArgumentException(sprintf('Format %s is not recognized.', $format)); - } - } } diff --git a/lib/Alchemy/Phrasea/Core/Provider/FeedServiceProvider.php b/lib/Alchemy/Phrasea/Core/Provider/FeedServiceProvider.php index 4009fdb552..d2331677c6 100644 --- a/lib/Alchemy/Phrasea/Core/Provider/FeedServiceProvider.php +++ b/lib/Alchemy/Phrasea/Core/Provider/FeedServiceProvider.php @@ -45,6 +45,21 @@ class FeedServiceProvider implements ServiceProviderInterface $app['feed.cooliris-formatter'] = $app->share(function($app) { return new CoolirisFormatter($app['feed.link-generator-collection']); }); + $app['feed.formatter-strategy'] = $app->protect(function($type) use ($app) { + switch ($type) { + case 'rss': + return $app['feed.rss-formatter']; + break; + case 'atom': + return $app['feed.atom-formatter']; + break; + case 'cooliris': + return $app['feed.cooliris-formatter']; + break; + default: + throw new InvalidArgumentException(sprintf('Format %s is not recognized.', $type)); + } + }); } public function boot(Application $app) diff --git a/lib/Alchemy/Phrasea/Feed/Aggregate.php b/lib/Alchemy/Phrasea/Feed/Aggregate.php index 05bac9520e..99e25756a0 100644 --- a/lib/Alchemy/Phrasea/Feed/Aggregate.php +++ b/lib/Alchemy/Phrasea/Feed/Aggregate.php @@ -80,6 +80,9 @@ class Aggregate implements FeedInterface public function getEntries($offset_start = null, $how_many = null) { + if (count($this->feeds) == 0) { + return null; + } return $this->em->getRepository('Entities\FeedEntry')->findByFeeds($this->feeds, $offset_start, $how_many); } diff --git a/lib/Doctrine/Repositories/UserSettingRepository.php b/lib/Doctrine/Repositories/UserSettingRepository.php index bc7a7a15da..193df37898 100644 --- a/lib/Doctrine/Repositories/UserSettingRepository.php +++ b/lib/Doctrine/Repositories/UserSettingRepository.php @@ -43,7 +43,7 @@ class UserSettingRepository extends EntityRepository $query = $this->_em->createQuery($dql); $query->setParameter('feeds', $feeds); - if (null !== $offset_start) { + if (null !== $offset_start && 0 !== $offset_start) { $query->setFirstResult($offset_start); } if (null !== $how_many) { diff --git a/templates/web/client/home_inter_pub_basket.html.twig b/templates/web/client/home_inter_pub_basket.html.twig index b2df45e908..f47a80da24 100644 --- a/templates/web/client/home_inter_pub_basket.html.twig +++ b/templates/web/client/home_inter_pub_basket.html.twig @@ -32,8 +32,8 @@
    - {% if entry.get_subtitle()|trim is not empty %} - {{ entry.get_subtitle()|nl2br }} + {% if entry.getSubtitle()|trim is not empty %} + {{ entry.getSubtitle()|nl2br }} {% endif %}
    @@ -76,7 +76,7 @@ {% endset %} {% endif %} -
    +
    {{ record.get_title() }} diff --git a/tests/classes/api/v1/api_v1_adapterTest.php b/tests/classes/api/v1/api_v1_adapterTest.php index 2b84a0fb73..faf196d081 100644 --- a/tests/classes/api/v1/api_v1_adapterTest.php +++ b/tests/classes/api/v1/api_v1_adapterTest.php @@ -653,10 +653,9 @@ class API_V1_adapterTest extends PhraseanetPHPUnitAuthenticatedAbstract public function testSearch_publications() { $request = new Request(array(), array(), array(), array(), array(), array('HTTP_Accept' => 'application/json')); - $feed = Feed_Adapter::create(self::$DI['app'], self::$DI['user'], "hello", "salut"); + $feed = $this->insertOneFeed(self::$DI['user']); $result = $this->object->search_publications($request, self::$DI['user']); $this->checkResponseField($result, "feeds", 'array'); - $feed->delete(); } public function testRemove_publications() @@ -673,25 +672,19 @@ class API_V1_adapterTest extends PhraseanetPHPUnitAuthenticatedAbstract ->disableOriginalConstructor() ->getMock(); - self::$DI['app']['notification.deliverer']->expects($this->atLeastOnce()) - ->method('deliver') - ->with($this->isInstanceOf('Alchemy\Phrasea\Notification\Mail\MailInfoNewPublication'), $this->equalTo(null)); - $date = new DateTime(); $request = new Request(array(), array(), array(), array(), array(), array('HTTP_Accept' => 'application/json')); - $feed = Feed_Adapter::create(self::$DI['app'], self::$DI['user'], "hello", "salut"); - $feed_publisher = Feed_Publisher_Adapter::getPublisher(self::$DI['app']['phraseanet.appbox'], $feed, self::$DI['user']); - $feed_entry = Feed_Entry_Adapter::create(self::$DI['app'], $feed, $feed_publisher, "coucou", "hello", "me", "my@email.com"); - $feed_entry_item = Feed_Entry_Item::create(self::$DI['app']['phraseanet.appbox'], $feed_entry, self::$DI['record_1']); - $coll = Feed_Collection::load_all(self::$DI['app'], self::$DI['user']); - foreach ($coll->get_feeds() as $feed) { - $result = $this->object->get_publication($request, $feed->get_id(), self::$DI['user']); + $feedItem = $this->insertOneFeedItem(self::$DI['user']); + $feed = $feedItem->getEntry()->getFeed(); + + $feeds = self::$DI['app']['EM']->getRepository('Entities\Feed')->getAllForUser(self::$DI['user']); + foreach ($feeds as $feed) { + $result = $this->object->get_publication($request, $feed->getId(), self::$DI['user']); $this->checkResponseField($result, "feed", 'array'); $this->checkResponseField($result, "entries", 'array'); $this->checkResponseField($result, "offset_start", 'integer'); $this->checkResponseField($result, "per_page", 'integer'); } - $feed->delete(); } protected function checkResponseField(API_V1_result $result, $field, $type) From d8d9ab7607929d43c2fbfcd3632fa6d4119dcf9d Mon Sep 17 00:00:00 2001 From: Andrey Date: Mon, 17 Jun 2013 16:52:18 +0200 Subject: [PATCH 19/67] Removed remaining occurrences to Feed_, adapted patch_320f --- lib/Alchemy/Phrasea/Controller/Prod/Feed.php | 3 +- .../Feed/Formatter/CoolirisFormatter.php | 21 +- .../Phrasea/Feed/Formatter/RssFormatter.php | 21 +- .../Phrasea/Feed}/RSS/Image.php | 30 +- .../Phrasea/Feed}/RSS/ImageInterface.php | 16 +- .../SearchEngine/Phrasea/PhraseaEngine.php | 7 +- .../SearchEngine/SearchEngineInterface.php | 13 +- .../SphinxSearch/SphinxSearchEngine.php | 7 +- lib/classes/Exception/Feed/EntryNotFound.php | 2 +- lib/classes/Exception/Feed/ItemNotFound.php | 2 +- .../Exception/Feed/PublisherNotFound.php | 2 +- lib/classes/Feed/Abstract.php | 98 --- lib/classes/Feed/Adapter.php | 722 ------------------ lib/classes/Feed/Aggregate.php | 260 ------- lib/classes/Feed/Collection.php | 165 ---- lib/classes/Feed/CollectionInterface.php | 24 - lib/classes/Feed/Entry/Adapter.php | 593 -------------- lib/classes/Feed/Entry/Collection.php | 73 -- .../Feed/Entry/CollectionInterface.php | 26 - lib/classes/Feed/Entry/Interface.php | 59 -- lib/classes/Feed/Entry/Item.php | 229 ------ lib/classes/Feed/Entry/ItemInterface.php | 32 - lib/classes/Feed/Interface.php | 40 - lib/classes/Feed/Link.php | 80 -- lib/classes/Feed/LinkInterface.php | 26 - lib/classes/Feed/Publisher/Adapter.php | 240 ------ lib/classes/Feed/Publisher/Interface.php | 40 - lib/classes/Feed/Token.php | 110 --- lib/classes/Feed/TokenAggregate.php | 66 -- lib/classes/Feed/XML/Abstract.php | 351 --------- lib/classes/Feed/XML/Atom.php | 192 ----- lib/classes/Feed/XML/Cooliris.php | 440 ----------- lib/classes/Feed/XML/Interface.php | 40 - lib/classes/Feed/XML/RSS.php | 369 --------- lib/classes/patch/320f.php | 62 +- .../Feed/Entry/Feed_Entry_AdapterTest.php | 166 ---- .../Feed/Entry/Feed_Entry_CollectionTest.php | 63 -- .../Feed/Entry/Feed_Entry_ItemTest.php | 69 -- tests/classes/Feed/Feed_AdapterTest.php | 259 ------- tests/classes/Feed/Feed_AggregateTest.php | 87 --- tests/classes/Feed/Feed_CollectionTest.php | 59 -- tests/classes/Feed/Feed_LinkTest.php | 33 - .../Publisher/Feed_Publisher_AdapterTest.php | 57 -- tests/classes/Feed/XML/Feed_XML_AtomTest.php | 209 ----- tests/classes/Feed/XML/Feed_XML_RSSTest.php | 189 ----- .../Feed/XML/RSS/Feed_XML_RSS_ImageTest.php | 81 -- 46 files changed, 116 insertions(+), 5617 deletions(-) rename lib/{classes/Feed/XML => Alchemy/Phrasea/Feed}/RSS/Image.php (79%) rename lib/{classes/Feed/XML => Alchemy/Phrasea/Feed}/RSS/ImageInterface.php (60%) delete mode 100644 lib/classes/Feed/Abstract.php delete mode 100644 lib/classes/Feed/Adapter.php delete mode 100644 lib/classes/Feed/Aggregate.php delete mode 100644 lib/classes/Feed/Collection.php delete mode 100644 lib/classes/Feed/CollectionInterface.php delete mode 100644 lib/classes/Feed/Entry/Adapter.php delete mode 100644 lib/classes/Feed/Entry/Collection.php delete mode 100644 lib/classes/Feed/Entry/CollectionInterface.php delete mode 100644 lib/classes/Feed/Entry/Interface.php delete mode 100644 lib/classes/Feed/Entry/Item.php delete mode 100644 lib/classes/Feed/Entry/ItemInterface.php delete mode 100644 lib/classes/Feed/Interface.php delete mode 100644 lib/classes/Feed/Link.php delete mode 100644 lib/classes/Feed/LinkInterface.php delete mode 100644 lib/classes/Feed/Publisher/Adapter.php delete mode 100644 lib/classes/Feed/Publisher/Interface.php delete mode 100644 lib/classes/Feed/Token.php delete mode 100644 lib/classes/Feed/TokenAggregate.php delete mode 100644 lib/classes/Feed/XML/Abstract.php delete mode 100644 lib/classes/Feed/XML/Atom.php delete mode 100644 lib/classes/Feed/XML/Cooliris.php delete mode 100644 lib/classes/Feed/XML/Interface.php delete mode 100644 lib/classes/Feed/XML/RSS.php delete mode 100644 tests/classes/Feed/Entry/Feed_Entry_AdapterTest.php delete mode 100644 tests/classes/Feed/Entry/Feed_Entry_CollectionTest.php delete mode 100644 tests/classes/Feed/Entry/Feed_Entry_ItemTest.php delete mode 100644 tests/classes/Feed/Feed_AdapterTest.php delete mode 100644 tests/classes/Feed/Feed_AggregateTest.php delete mode 100644 tests/classes/Feed/Feed_CollectionTest.php delete mode 100644 tests/classes/Feed/Feed_LinkTest.php delete mode 100644 tests/classes/Feed/Publisher/Feed_Publisher_AdapterTest.php delete mode 100644 tests/classes/Feed/XML/Feed_XML_AtomTest.php delete mode 100644 tests/classes/Feed/XML/Feed_XML_RSSTest.php delete mode 100644 tests/classes/Feed/XML/RSS/Feed_XML_RSS_ImageTest.php diff --git a/lib/Alchemy/Phrasea/Controller/Prod/Feed.php b/lib/Alchemy/Phrasea/Controller/Prod/Feed.php index c521e4e398..f2542bda14 100644 --- a/lib/Alchemy/Phrasea/Controller/Prod/Feed.php +++ b/lib/Alchemy/Phrasea/Controller/Prod/Feed.php @@ -78,6 +78,7 @@ class Feed implements ControllerProviderInterface $item->setEntry($entry); $item->setRecordId($record->get_record_id()); $item->setSbasId($record->get_sbas_id()); + $item->setLastInFeedItem(); $entry->addItem($item); $app['EM']->persist($item); } @@ -164,7 +165,7 @@ class Feed implements ControllerProviderInterface continue; } - $item = new FeedItem($entry, $item_sort_datas[0]); + $item = new FeedItem(); $item->setEntry($entry); $entry->addItem($item); $item->setOrd($item_sort_datas[1]); diff --git a/lib/Alchemy/Phrasea/Feed/Formatter/CoolirisFormatter.php b/lib/Alchemy/Phrasea/Feed/Formatter/CoolirisFormatter.php index c7db287a10..821f6be729 100644 --- a/lib/Alchemy/Phrasea/Feed/Formatter/CoolirisFormatter.php +++ b/lib/Alchemy/Phrasea/Feed/Formatter/CoolirisFormatter.php @@ -14,6 +14,7 @@ namespace Alchemy\Phrasea\Feed\Formatter; use Alchemy\Phrasea\Application; use Alchemy\Phrasea\Feed\FeedInterface; use Alchemy\Phrasea\Feed\Link\LinkGeneratorCollection; +use Alchemy\Phrasea\Feed\RSS\FeedRSSImage; use Symfony\Component\HttpFoundation\Response; class CoolirisFormatter extends FeedFormatterAbstract implements FeedFormatterInterface @@ -95,17 +96,17 @@ class CoolirisFormatter extends FeedFormatterAbstract implements FeedFormatterIn $this->addTag($doc, $channel, 'docs', $this->docs); if (isset($this->ttl)) $this->addTag($doc, $channel, 'ttl', $this->ttl); - if (isset($this->image) && $this->image instanceof Feed_XML_RSS_Image) { + if (isset($this->image) && $this->image instanceof FeedRSSImage) { $image = $this->addTag($doc, $channel, 'image'); - $this->addTag($doc, $image, 'url', $this->image->get_url()); - $this->addTag($doc, $image, 'title', $this->image->get_title()); - $this->addTag($doc, $image, 'link', $this->image->get_link()); - if ($this->image->get_width()) - $this->addTag($doc, $image, 'width', $this->image->get_width()); - if ($this->image->get_height()) - $this->addTag($doc, $image, 'height', $this->image->get_height()); - if ($this->image->get_description()) - $this->addTag($doc, $image, 'description', $this->image->get_description()); + $this->addTag($doc, $image, 'url', $this->image->getUrl()); + $this->addTag($doc, $image, 'title', $this->image->getTitle()); + $this->addTag($doc, $image, 'link', $this->image->getLink()); + if ($this->image->getWidth()) + $this->addTag($doc, $image, 'width', $this->image->getWidth()); + if ($this->image->getHeight()) + $this->addTag($doc, $image, 'height', $this->image->getHeight()); + if ($this->image->getDescription()) + $this->addTag($doc, $image, 'description', $this->image->getDescription()); } if (isset($this->skipHours) && count($this->skipHours)) { $skipHours = $this->addTag($doc, $channel, 'skipHours'); diff --git a/lib/Alchemy/Phrasea/Feed/Formatter/RssFormatter.php b/lib/Alchemy/Phrasea/Feed/Formatter/RssFormatter.php index 859fadfbdf..d67b0f9d94 100644 --- a/lib/Alchemy/Phrasea/Feed/Formatter/RssFormatter.php +++ b/lib/Alchemy/Phrasea/Feed/Formatter/RssFormatter.php @@ -15,6 +15,7 @@ use Alchemy\Phrasea\Application; use Alchemy\Phrasea\Feed\FeedInterface; use Alchemy\Phrasea\Feed\Link\FeedLink; use Alchemy\Phrasea\Feed\Link\LinkGeneratorCollection; +use Alchemy\Phrasea\Feed\RSS\FeedRSSImage; use Symfony\Component\HttpFoundation\Response; class RssFormatter extends FeedFormatterAbstract implements FeedFormatterInterface @@ -114,17 +115,17 @@ class RssFormatter extends FeedFormatterAbstract implements FeedFormatterInterfa $this->addTag($doc, $channel, 'docs', $this->docs); if (isset($this->ttl)) $this->addTag($doc, $channel, 'ttl', $this->ttl); - if (isset($this->image) && $this->image instanceof Feed_XML_RSS_Image) { + if (isset($this->image) && $this->image instanceof FeedRSSImage) { $image = $this->addTag($doc, $channel, 'image'); - $this->addTag($doc, $image, 'url', $this->image->get_url()); - $this->addTag($doc, $image, 'title', $this->image->get_title()); - $this->addTag($doc, $image, 'link', $this->image->get_link()); - if ($this->image->get_width()) - $this->addTag($doc, $image, 'width', $this->image->get_width()); - if ($this->image->get_height()) - $this->addTag($doc, $image, 'height', $this->image->get_height()); - if ($this->image->get_description()) - $this->addTag($doc, $image, 'description', $this->image->get_description()); + $this->addTag($doc, $image, 'url', $this->image->getUrl()); + $this->addTag($doc, $image, 'title', $this->image->getTitle()); + $this->addTag($doc, $image, 'link', $this->image->getLink()); + if ($this->image->getWidth()) + $this->addTag($doc, $image, 'width', $this->image->getWidth()); + if ($this->image->getHeight()) + $this->addTag($doc, $image, 'height', $this->image->getHeight()); + if ($this->image->getDescription()) + $this->addTag($doc, $image, 'description', $this->image->getDescription()); } if (isset($this->skipHours) && count($this->skipHours)) { $skipHours = $this->addTag($doc, $channel, 'skipHours'); diff --git a/lib/classes/Feed/XML/RSS/Image.php b/lib/Alchemy/Phrasea/Feed/RSS/Image.php similarity index 79% rename from lib/classes/Feed/XML/RSS/Image.php rename to lib/Alchemy/Phrasea/Feed/RSS/Image.php index 180ef933bd..008d01b048 100644 --- a/lib/classes/Feed/XML/RSS/Image.php +++ b/lib/Alchemy/Phrasea/Feed/RSS/Image.php @@ -9,13 +9,15 @@ * file that was distributed with this source code. */ +namespace Alchemy\Phrasea\Feed\RSS; + /** * * @package Feeds * @license http://opensource.org/licenses/gpl-3.0 GPLv3 * @link www.phraseanet.com */ -class Feed_XML_RSS_Image implements Feed_XML_RSS_ImageInterface +class FeedRSSImage implements FeedRSSImageInterface { /** * @@ -58,7 +60,7 @@ class Feed_XML_RSS_Image implements Feed_XML_RSS_ImageInterface * @param string $url * @param string $title * @param string $link - * @return Feed_XML_RSS_Image + * @return FeedRSSImage */ public function __construct($url, $title, $link) { @@ -72,9 +74,9 @@ class Feed_XML_RSS_Image implements Feed_XML_RSS_ImageInterface /** * * @param type $description - * @return Feed_XML_RSS_Image + * @return FeedRSSImage */ - public function set_description($description) + public function setDescription($description) { $this->description = $description; @@ -84,9 +86,9 @@ class Feed_XML_RSS_Image implements Feed_XML_RSS_ImageInterface /** * * @param int $width - * @return Feed_XML_RSS_Image + * @return FeedRSSImage */ - public function set_width($width) + public function setWidth($width) { $this->width = (int) $width; @@ -96,9 +98,9 @@ class Feed_XML_RSS_Image implements Feed_XML_RSS_ImageInterface /** * * @param int $height - * @return Feed_XML_RSS_Image + * @return FeedRSSImage */ - public function set_height($height) + public function setHeight($height) { $this->height = (int) $height; @@ -109,7 +111,7 @@ class Feed_XML_RSS_Image implements Feed_XML_RSS_ImageInterface * * @return string */ - public function get_url() + public function getUrl() { return $this->url; } @@ -118,7 +120,7 @@ class Feed_XML_RSS_Image implements Feed_XML_RSS_ImageInterface * * @return string */ - public function get_title() + public function getTitle() { return $this->title; } @@ -127,7 +129,7 @@ class Feed_XML_RSS_Image implements Feed_XML_RSS_ImageInterface * * @return string */ - public function get_link() + public function getLink() { return $this->link; } @@ -136,7 +138,7 @@ class Feed_XML_RSS_Image implements Feed_XML_RSS_ImageInterface * * @return string */ - public function get_description() + public function getDescription() { return $this->description; } @@ -145,7 +147,7 @@ class Feed_XML_RSS_Image implements Feed_XML_RSS_ImageInterface * * @return int */ - public function get_width() + public function getWidth() { return $this->width; } @@ -154,7 +156,7 @@ class Feed_XML_RSS_Image implements Feed_XML_RSS_ImageInterface * * @return int */ - public function get_height() + public function getHeight() { return $this->height; } diff --git a/lib/classes/Feed/XML/RSS/ImageInterface.php b/lib/Alchemy/Phrasea/Feed/RSS/ImageInterface.php similarity index 60% rename from lib/classes/Feed/XML/RSS/ImageInterface.php rename to lib/Alchemy/Phrasea/Feed/RSS/ImageInterface.php index 3762ef3aa7..be6e0ce799 100644 --- a/lib/classes/Feed/XML/RSS/ImageInterface.php +++ b/lib/Alchemy/Phrasea/Feed/RSS/ImageInterface.php @@ -9,26 +9,28 @@ * file that was distributed with this source code. */ +namespace Alchemy\Phrasea\Feed\RSS; + /** * * @package Feeds * @license http://opensource.org/licenses/gpl-3.0 GPLv3 * @link www.phraseanet.com */ -interface Feed_XML_RSS_ImageInterface +interface FeedXMLRSSImageInterface { public function __construct($url, $title, $link); - public function get_url(); + public function getUrl(); - public function get_title(); + public function getTitle(); - public function get_link(); + public function getLink(); - public function get_description(); + public function getDescription(); - public function get_height(); + public function getHeight(); - public function get_width(); + public function getWidth(); } diff --git a/lib/Alchemy/Phrasea/SearchEngine/Phrasea/PhraseaEngine.php b/lib/Alchemy/Phrasea/SearchEngine/Phrasea/PhraseaEngine.php index 33da3c9ad3..8f2923ace9 100644 --- a/lib/Alchemy/Phrasea/SearchEngine/Phrasea/PhraseaEngine.php +++ b/lib/Alchemy/Phrasea/SearchEngine/Phrasea/PhraseaEngine.php @@ -18,6 +18,7 @@ use Alchemy\Phrasea\SearchEngine\SearchEngineResult; use Alchemy\Phrasea\SearchEngine\SearchEngineSuggestion; use Alchemy\Phrasea\Exception\RuntimeException; use Doctrine\Common\Collections\ArrayCollection; +use Entities\FeedEntry; class PhraseaEngine implements SearchEngineInterface { @@ -303,7 +304,7 @@ class PhraseaEngine implements SearchEngineInterface /** * {@inheritdoc} */ - public function addFeedEntry(\Feed_Entry_Adapter $entry) + public function addFeedEntry(FeedEntry $entry) { throw new RuntimeException('Feed Entry indexing not supported by Phrasea Engine'); } @@ -311,7 +312,7 @@ class PhraseaEngine implements SearchEngineInterface /** * {@inheritdoc} */ - public function removeFeedEntry(\Feed_Entry_Adapter $entry) + public function removeFeedEntry(FeedEntry $entry) { throw new RuntimeException('Feed Entry indexing not supported by Phrasea Engine'); } @@ -319,7 +320,7 @@ class PhraseaEngine implements SearchEngineInterface /** * {@inheritdoc} */ - public function updateFeedEntry(\Feed_Entry_Adapter $entry) + public function updateFeedEntry(FeedEntry $entry) { throw new RuntimeException('Feed Entry indexing not supported by Phrasea Engine'); } diff --git a/lib/Alchemy/Phrasea/SearchEngine/SearchEngineInterface.php b/lib/Alchemy/Phrasea/SearchEngine/SearchEngineInterface.php index d156c12458..d47e551c13 100644 --- a/lib/Alchemy/Phrasea/SearchEngine/SearchEngineInterface.php +++ b/lib/Alchemy/Phrasea/SearchEngine/SearchEngineInterface.php @@ -16,6 +16,7 @@ use Alchemy\Phrasea\SearchEngine\SearchEngineOptions; use Alchemy\Phrasea\SearchEngine\SearchEngineResult; use Alchemy\Phrasea\Exception\RuntimeException; use Doctrine\Common\Collections\ArrayCollection; +use Entities\FeedEntry; interface SearchEngineInterface { @@ -131,29 +132,29 @@ interface SearchEngineInterface /** * Add an entry to index * - * @param \Feed_Entry_Adapter $entry + * @param FeedEntry $entry * @return SearchEngineInterface * @throws RuntimeException */ - public function addFeedEntry(\Feed_Entry_Adapter $entry); + public function addFeedEntry(FeedEntry $entry); /** * Remove an entry to index * - * @param \Feed_Entry_Adapter $entry + * @param FeedEntry $entry * @return SearchEngineInterface * @throws RuntimeException */ - public function removeFeedEntry(\Feed_Entry_Adapter $entry); + public function removeFeedEntry(FeedEntry $entry); /** * Update an entry in the index * - * @param \Feed_Entry_Adapter $entry + * @param FeedEntry $entry * @return SearchEngineInterface * @throws RuntimeException */ - public function updateFeedEntry(\Feed_Entry_Adapter $entry); + public function updateFeedEntry(FeedEntry $entry); /** * Set options to search-engine diff --git a/lib/Alchemy/Phrasea/SearchEngine/SphinxSearch/SphinxSearchEngine.php b/lib/Alchemy/Phrasea/SearchEngine/SphinxSearch/SphinxSearchEngine.php index 709ee6649b..fc97b2f797 100644 --- a/lib/Alchemy/Phrasea/SearchEngine/SphinxSearch/SphinxSearchEngine.php +++ b/lib/Alchemy/Phrasea/SearchEngine/SphinxSearch/SphinxSearchEngine.php @@ -18,6 +18,7 @@ use Alchemy\Phrasea\SearchEngine\SearchEngineResult; use Alchemy\Phrasea\SearchEngine\SearchEngineSuggestion; use Alchemy\Phrasea\Exception\RuntimeException; use Doctrine\Common\Collections\ArrayCollection; +use Entities\FeedEntry; use Symfony\Component\Process\ExecutableFinder; use Symfony\Component\Process\Process; @@ -387,7 +388,7 @@ class SphinxSearchEngine implements SearchEngineInterface /** * {@inheritdoc} */ - public function addFeedEntry(\Feed_Entry_Adapter $entry) + public function addFeedEntry(FeedEntry $entry) { throw new RuntimeException('Feed Entry indexing not supported by Sphinx Search Engine'); } @@ -395,7 +396,7 @@ class SphinxSearchEngine implements SearchEngineInterface /** * {@inheritdoc} */ - public function removeFeedEntry(\Feed_Entry_Adapter $entry) + public function removeFeedEntry(FeedEntry $entry) { throw new RuntimeException('Feed Entry indexing not supported by Sphinx Search Engine'); } @@ -403,7 +404,7 @@ class SphinxSearchEngine implements SearchEngineInterface /** * {@inheritdoc} */ - public function updateFeedEntry(\Feed_Entry_Adapter $entry) + public function updateFeedEntry(FeedEntry $entry) { throw new RuntimeException('Feed Entry indexing not supported by Sphinx Search Engine'); } diff --git a/lib/classes/Exception/Feed/EntryNotFound.php b/lib/classes/Exception/Feed/EntryNotFound.php index 93b593d047..b2153351c8 100644 --- a/lib/classes/Exception/Feed/EntryNotFound.php +++ b/lib/classes/Exception/Feed/EntryNotFound.php @@ -17,7 +17,7 @@ use Symfony\Component\HttpKernel\Exception\NotFoundHttpException; * @license http://opensource.org/licenses/gpl-3.0 GPLv3 * @link www.phraseanet.com */ -class Exception_Feed_EntryNotFound extends NotFoundHttpException +class Exception_FeedEntryNotFound extends NotFoundHttpException { } diff --git a/lib/classes/Exception/Feed/ItemNotFound.php b/lib/classes/Exception/Feed/ItemNotFound.php index d7f98a5d0b..aea8469705 100644 --- a/lib/classes/Exception/Feed/ItemNotFound.php +++ b/lib/classes/Exception/Feed/ItemNotFound.php @@ -17,7 +17,7 @@ use Symfony\Component\HttpKernel\Exception\NotFoundHttpException; * @license http://opensource.org/licenses/gpl-3.0 GPLv3 * @link www.phraseanet.com */ -class Exception_Feed_ItemNotFound extends NotFoundHttpException +class Exception_FeedItemNotFound extends NotFoundHttpException { } diff --git a/lib/classes/Exception/Feed/PublisherNotFound.php b/lib/classes/Exception/Feed/PublisherNotFound.php index e0d929852a..be8aa0e205 100644 --- a/lib/classes/Exception/Feed/PublisherNotFound.php +++ b/lib/classes/Exception/Feed/PublisherNotFound.php @@ -17,7 +17,7 @@ use Symfony\Component\HttpKernel\Exception\NotFoundHttpException; * @license http://opensource.org/licenses/gpl-3.0 GPLv3 * @link www.phraseanet.com */ -class Exception_Feed_PublisherNotFound extends NotFoundHttpException +class Exception_FeedPublisherNotFound extends NotFoundHttpException { } diff --git a/lib/classes/Feed/Abstract.php b/lib/classes/Feed/Abstract.php deleted file mode 100644 index 06bacab255..0000000000 --- a/lib/classes/Feed/Abstract.php +++ /dev/null @@ -1,98 +0,0 @@ -title; - } - - /** - * - * @return string - */ - public function get_subtitle() - { - return $this->subtitle; - } - - /** - * - * @return DateTime - */ - public function get_created_on() - { - return $this->created_on; - } - - /** - * - * @return DateTime - */ - public function get_updated_on() - { - return $this->updated_on; - } -} diff --git a/lib/classes/Feed/Adapter.php b/lib/classes/Feed/Adapter.php deleted file mode 100644 index 796f5d3089..0000000000 --- a/lib/classes/Feed/Adapter.php +++ /dev/null @@ -1,722 +0,0 @@ -app = $app; - $this->id = (int) $id; - - $this->load(); - - return $this; - } - - protected function load() - { - try { - $datas = $this->get_data_from_cache(); - - $this->title = $datas['title']; - $this->subtitle = $datas['subtitle']; - $this->collection = $datas['base_id'] ? collection::get_from_base_id($this->app, $datas['base_id']) : null; - $this->created_on = $datas['created_on']; - $this->updated_on = $datas['updated_on']; - $this->public = $datas['public']; - - return $this; - } catch (Exception $e) { - - } - - $sql = 'SELECT id, title, subtitle, created_on, updated_on, base_id, public - FROM feeds WHERE id = :feed_id'; - $stmt = $this->app['phraseanet.appbox']->get_connection()->prepare($sql); - $stmt->execute(array(':feed_id' => $this->id)); - $row = $stmt->fetch(PDO::FETCH_ASSOC); - $stmt->closeCursor(); - - if (!$row) - throw new NotFoundHttpException('Feed not found'); - - $this->title = $row['title']; - $this->subtitle = $row['subtitle']; - if (!is_null($row['base_id'])) - $this->collection = collection::get_from_base_id($this->app, $row['base_id']); - $this->created_on = new DateTime($row['created_on']); - $this->updated_on = new DateTime($row['updated_on']); - $this->public = !!$row['public']; - - $base_id = $this->collection instanceof collection ? $this->collection->get_base_id() : null; - - $datas = array( - 'title' => $this->title - , 'subtitle' => $this->subtitle - , 'base_id' => $base_id - , 'created_on' => $this->created_on - , 'updated_on' => $this->updated_on - , 'public' => $this->public - ); - - $this->set_data_to_cache($datas); - - return $this; - } - - /** - * - * @return string - */ - public function get_icon_url() - { - if ($this->icon_url) { - return $this->icon_url; - } - - $url = '/skins/icons/rss32.gif'; - - $file = $this->app['root.path'] - . '/www/custom/feed_' . $this->get_id() . '.jpg'; - - if (file_exists($file)) { - $url = '/custom/feed_' . $this->get_id() . '.jpg'; - } - - $this->icon_url = $url; - - return $this->icon_url; - } - - /** - * - * @param string $file The path to the file - * @return Feed_Adapter - */ - public function set_icon($file) - { - if (!file_exists($file)) { - throw new \Alchemy\Phrasea\Exception\InvalidArgumentException('File does not exists'); - } - - $config_file = $this->app['root.path'] . '/config/feed_' . $this->get_id() . '.jpg'; - $www_file = $this->app['root.path'] . '/www/custom/feed_' . $this->get_id() . '.jpg'; - - copy($file, $config_file); - copy($file, $www_file); - $this->icon_url = null; - - return $this; - } - - public function set_created_on(DateTime $created_on) - { - $sql = 'UPDATE feeds SET created_on = :created_on - WHERE id = :feed_id'; - $params = array( - ':created_on' => $created_on->format(DATE_ISO8601) - , ':feed_id' => $this->get_id() - ); - $stmt = $this->app['phraseanet.appbox']->get_connection()->prepare($sql); - $stmt->execute($params); - $stmt->closeCursor(); - $this->created_on = $created_on; - $this->delete_data_from_cache(); - - return $this; - } - - public function reset_icon() - { - $config_file = $this->app['root.path'] - . '/config/feed_' . $this->get_id() . '.jpg'; - $www_file = $this->app['root.path'] - . '/www/custom/feed_' . $this->get_id() . '.jpg'; - - if (is_file($config_file)) - unlink($config_file); - if (is_file($www_file)) - unlink($www_file); - - $this->icon_url = null; - - return $this; - } - - /** - * - * @return boolean - */ - public function is_aggregated() - { - return false; - } - - /** - * - * @param User_Adapter $user - * @return boolean - */ - public function is_owner(User_Adapter $user) - { - $this->load_publishers(); - - if (!$this->owner) { - return false; - } - - return $this->owner->get_user()->get_id() === $user->get_id(); - } - - /** - * - * @param User_Adapter $user - * @return boolean - */ - public function is_publisher(User_Adapter $user) - { - return in_array($user->get_id(), array_keys($this->get_publishers())); - } - - /** - * Tells if a user has access to the feed - * - * @param User_Adapter $user - * @return type - */ - public function has_access(User_Adapter $user) - { - if ($this->get_collection() instanceof collection) { - return $user->ACL()->has_access_to_base($this->collection->get_base_id()); - } - - return true; - } - - /** - * - * @return boolean - */ - public function is_public() - { - if ($this->get_collection() instanceof collection) { - return false; - } - - return $this->public; - } - - /** - * - * @return array - */ - public function get_publishers() - { - return $this->load_publishers(); - } - - /** - * - * @return collection - */ - public function get_collection() - { - return $this->collection; - } - - /** - * - * @param User_Adapter $user - * @return Feed_Adapter - */ - public function add_publisher(User_Adapter $user) - { - if (in_array($user->get_id(), array_keys($this->get_publishers()))) { - return $this; - } - - Feed_Publisher_Adapter::create($this->app, $user, $this, false); - $this->publishers = null; - - return $this; - } - - /** - * - * @return array - */ - protected function load_publishers() - { - if (is_array($this->publishers)) { - return $this->publishers; - } - - $sql = 'SELECT id, usr_id, owner FROM feed_publishers - WHERE feed_id = :feed_id'; - - $stmt = $this->app['phraseanet.appbox']->get_connection()->prepare($sql); - $stmt->execute(array(':feed_id' => $this->id)); - $rs = $stmt->fetchAll(PDO::FETCH_ASSOC); - $stmt->closeCursor(); - - foreach ($rs as $row) { - try { - $publisher = new Feed_Publisher_Adapter($this->app, $row['id']); - } catch (\Exception_Feed_PublisherNotFound $e) { - continue; - } - $this->publishers[$row['usr_id']] = $publisher; - if ($publisher->is_owner()) { - $this->owner = $publisher; - } - } - - return $this->publishers; - } - - /** - * - * @return int - */ - public function get_id() - { - return $this->id; - } - - /** - * - * @param collection $collection - * @return Feed_Adapter - */ - public function set_collection(collection $collection = null) - { - $base_id = null; - if ($collection instanceof collection) { - $base_id = $collection->get_base_id(); - } - - $sql = 'UPDATE feeds SET base_id = :base_id, updated_on = NOW() - WHERE id = :feed_id'; - $params = array(':base_id' => $base_id, ':feed_id' => $this->get_id()); - $stmt = $this->app['phraseanet.appbox']->get_connection()->prepare($sql); - $stmt->execute($params); - $stmt->closeCursor(); - $this->collection = $collection; - $this->delete_data_from_cache(); - - return $this; - } - - /** - * - * @param boolean $boolean - * @return Feed_Adapter - */ - public function set_public($boolean) - { - $boolean = !!$boolean; - $sql = 'UPDATE feeds SET public = :public, updated_on = NOW() - WHERE id = :feed_id'; - - $params = array( - ':public' => $boolean ? '1' : '0', - ':feed_id' => $this->get_id() - ); - - $stmt = $this->app['phraseanet.appbox']->get_connection()->prepare($sql); - $stmt->execute($params); - $stmt->closeCursor(); - $this->public = $boolean; - $this->delete_data_from_cache(); - - $feed_collection = new Feed_Collection($this->app, array()); - $feed_collection->delete_data_from_cache(Feed_Collection::CACHE_PUBLIC); - - return $this; - } - - /** - * - * @param string $title - * @return Feed_Adapter - */ - public function set_title($title) - { - $title = trim(strip_tags($title)); - - if ($title === '') - throw new Exception_InvalidArgument(); - - $sql = 'UPDATE feeds SET title = :title, updated_on = NOW() - WHERE id = :feed_id'; - $stmt = $this->app['phraseanet.appbox']->get_connection()->prepare($sql); - $stmt->execute(array(':title' => $title, ':feed_id' => $this->get_id())); - $stmt->closeCursor(); - $this->title = $title; - $this->delete_data_from_cache(); - - return $this; - } - - /** - * - * @param string $subtitle - * @return Feed_Adapter - */ - public function set_subtitle($subtitle) - { - $subtitle = strip_tags($subtitle); - - $sql = 'UPDATE feeds SET subtitle = :subtitle, updated_on = NOW() - WHERE id = :feed_id'; - $params = array(':subtitle' => $subtitle, ':feed_id' => $this->get_id()); - $stmt = $this->app['phraseanet.appbox']->get_connection()->prepare($sql); - $stmt->execute($params); - $stmt->closeCursor(); - $this->subtitle = $subtitle; - $this->delete_data_from_cache(); - - return $this; - } - - public static function create(Application $app, User_Adapter $user, $title, $subtitle) - { - $sql = 'INSERT INTO feeds (id, title, subtitle, created_on, updated_on) - VALUES (null, :title, :subtitle, NOW(), NOW())'; - $stmt = $app['phraseanet.appbox']->get_connection()->prepare($sql); - $stmt->execute(array(':title' => $title, ':subtitle' => $subtitle)); - $stmt->closeCursor(); - - $feed_id = $app['phraseanet.appbox']->get_connection()->lastInsertId(); - - $feed = new self($app, $feed_id); - - Feed_Publisher_Adapter::create($app, $user, $feed, true); - - return $feed; - } - - public static function load_with_user(Application $app, User_Adapter $user, $id) - { - $feed = new self($app, $id); - $coll = $feed->get_collection(); - if ( - $feed->is_public() - || $coll === null - || in_array($coll->get_base_id(), array_keys($user->ACL()->get_granted_base())) - ) { - return $feed; - } - - throw new NotFoundHttpException('Feed not found'); - } - - /** - * - * @return int - */ - public function get_count_total_entries() - { - try { - return $this->get_data_from_cache(self::CACHE_ENTRY_NUMBER); - } catch (Exception $e) { - - } - - $sql = 'SELECT count(id) as number - FROM feed_entries WHERE feed_id = :feed_id'; - - $stmt = $this->app['phraseanet.appbox']->get_connection()->prepare($sql); - $stmt->execute(array(':feed_id' => $this->get_id())); - $row = $stmt->fetch(PDO::FETCH_ASSOC); - $number = $row ? (int) $row['number'] : 0; - $stmt->closeCursor(); - - $this->set_data_to_cache($number, self::CACHE_ENTRY_NUMBER); - - return $number; - } - - /** - * - * @return void - */ - public function delete() - { - $this->reset_icon(); - while ($this->get_count_total_entries() > 0) { - $entries_coll = $this->get_entries(0, 10); - foreach ($entries_coll->get_entries() as $entry) { - $entry->delete(); - } - unset($entries_coll); - $this->delete_data_from_cache(self::CACHE_ENTRY_NUMBER); - } - - foreach ($this->get_publishers() as $publishers) - $publishers->delete(); - - $sql = 'DELETE FROM feed_tokens WHERE feed_id = :feed_id'; - $stmt = $this->app['phraseanet.appbox']->get_connection()->prepare($sql); - $stmt->execute(array(':feed_id' => $this->get_id())); - $stmt->closeCursor(); - - $sql = 'DELETE FROM feeds WHERE id = :feed_id'; - $stmt = $this->app['phraseanet.appbox']->get_connection()->prepare($sql); - $stmt->execute(array(':feed_id' => $this->get_id())); - $stmt->closeCursor(); - - $this->delete_data_from_cache(); - - $feed_coll = new Feed_Collection($this->app, array()); - $feed_coll->delete_data_from_cache(Feed_Collection::CACHE_PUBLIC); - - return; - } - - /** - * - * @param int $offset_start - * @param int $how_many - * @return Feed_Entry_Collection - */ - public function get_entries($offset_start, $how_many) - { - $offset_start = (int) $offset_start; - $how_many = $how_many > self::MAX_ENTRIES ? self::MAX_ENTRIES : (int) $how_many; - - $sql = 'SELECT id - FROM feed_entries - WHERE feed_id = :feed_id - ORDER BY id DESC - LIMIT ' . $offset_start . ', ' . $how_many; - - $params = array( - ':feed_id' => $this->get_id() - ); - $stmt = $this->app['phraseanet.appbox']->get_connection()->prepare($sql); - $stmt->execute($params); - $rs = $stmt->fetchAll(PDO::FETCH_ASSOC); - $stmt->closeCursor(); - - $result = new Feed_Entry_Collection(); - - foreach ($rs as $row) { - $entry = new Feed_Entry_Adapter($this->app, $this, $row['id']); - $result->add_entry($entry); - } - - return $result; - } - - /** - * - * @param registryInterface $registry - * @param string $format - * @param int $page - * @return Feed_Link - */ - public function get_homepage_link(registryInterface $registry, $format, $page = null) - { - if (!$this->is_public()) { - return null; - } - - switch ($format) { - case self::FORMAT_ATOM: - return new Feed_Link( - sprintf('%sfeeds/feed/%s/atom/%s' - , $registry->get('GV_ServerName') - , $this->get_id() - , ($page ? '?page=' . $page : '') - ) - , sprintf('%s - %s', $this->get_title(), 'Atom') - , 'application/atom+xml' - ); - break; - case self::FORMAT_RSS: - default: - return new Feed_Link( - sprintf('%sfeeds/feed/%s/rss/%s' - , $registry->get('GV_ServerName') - , $this->get_id() - , ($page ? '?page=' . $page : '') - ) - , sprintf('%s - %s', $this->get_title(), 'RSS') - , 'application/rss+xml' - ); - break; - } - } - - /** - * - * @param User_Adapter $user - * @param boolean $renew - * @return string - */ - protected function get_token(User_Adapter $user, $renew = false) - { - $cache_key = self::CACHE_USER_TOKEN . '_' . $user->get_id(); - try { - if (!$renew) { - return $this->get_data_from_cache($cache_key); - } - } catch (Exception $e) { - - } - - $sql = 'SELECT token FROM feed_tokens - WHERE usr_id = :usr_id AND feed_id = :feed_id - AND aggregated IS NULL'; - - $params = array( - ':usr_id' => $user->get_id(), - ':feed_id' => $this->get_id() - ); - - $stmt = $this->app['phraseanet.appbox']->get_connection()->prepare($sql); - $stmt->execute($params); - $row = $stmt->fetch(PDO::FETCH_ASSOC); - $stmt->closeCursor(); - - if (!$row || $renew === true) { - $token = random::generatePassword(12, random::LETTERS_AND_NUMBERS); - $sql = 'REPLACE INTO feed_tokens (id, token, feed_id, usr_id, aggregated) - VALUES (null, :token, :feed_id, :usr_id, :aggregated)'; - - $params = array( - ':token' => $token - , ':feed_id' => $this->get_id() - , ':usr_id' => $user->get_id() - , ':aggregated' => null - ); - - $stmt = $this->app['phraseanet.appbox']->get_connection()->prepare($sql); - $stmt->execute($params); - $this->delete_data_from_cache($cache_key); - } else { - $token = $row['token']; - } - - $this->set_data_to_cache($token, $cache_key); - - return $token; - } - - /** - * - * @param registryInterface $registry - * @param User_Adapter $user - * @param string $format - * @param int $page - * @param boolean $renew_token - * @return Feed_Link - */ - public function get_user_link(registryInterface $registry, User_Adapter $user, $format, $page = null, $renew_token = false) - { - switch ($format) { - case self::FORMAT_ATOM: - return new Feed_Link( - sprintf('%sfeeds/userfeed/%s/%s/atom/' - , $registry->get('GV_ServerName') - , $this->get_token($user, $renew_token) - , $this->get_id() - , ($page ? '?page=' . $page : '') - ) - , sprintf('%s - %s', $this->get_title(), 'Atom') - , 'application/atom+xml' - ); - break; - case self::FORMAT_RSS: - return new Feed_Link( - sprintf('%sfeeds/userfeed/%s/%s/rss/%s' - , $registry->get('GV_ServerName') - , $this->get_token($user, $renew_token) - , $this->get_id() - , ($page ? '?page=' . $page : '') - ) - , sprintf('%s - %s', $this->get_title(), 'RSS') - , 'application/rss+xml' - ); - break; - } - } - - public function get_cache_key($option = null) - { - return 'feed_adapter_' . $this->get_id() . '_' . ($option ? '_' . $option : ''); - } - - public function get_data_from_cache($option = null) - { - return $this->app['phraseanet.appbox']->get_data_from_cache($this->get_cache_key($option)); - } - - public function set_data_to_cache($value, $option = null, $duration = 0) - { - return $this->app['phraseanet.appbox']->set_data_to_cache($value, $this->get_cache_key($option), $duration); - } - - public function delete_data_from_cache($option = null) - { - return $this->app['phraseanet.appbox']->delete_data_from_cache($this->get_cache_key($option)); - } -} diff --git a/lib/classes/Feed/Aggregate.php b/lib/classes/Feed/Aggregate.php deleted file mode 100644 index cb8c900620..0000000000 --- a/lib/classes/Feed/Aggregate.php +++ /dev/null @@ -1,260 +0,0 @@ -title = 'AGGREGGATE'; - $this->subtitle = 'AGREGGATE SUBTITLE'; - $this->created_on = new DateTime(); - $this->updated_on = new DateTime(); - $this->app = $app; - - $tmp_feeds = array(); - - foreach ($feeds as $feed) { - $tmp_feeds[$feed->get_id()] = $feed; - } - - $this->feeds = $tmp_feeds; - - return $this; - } - - public function get_id() - { - throw new LogicException('Aggregate feed does not have an id'); - } - - /** - * - * @return string - */ - public function get_icon_url() - { - $url = '/skins/icons/rss32.gif'; - - return $url; - } - - /** - * - * @return boolean - */ - public function is_aggregated() - { - return true; - } - - /** - * - * @param int $offset_start - * @param int $how_many - * @return Feed_Entry_Collection - */ - public function get_entries($offset_start, $how_many) - { - $result = new Feed_Entry_Collection(); - - if (count($this->feeds) === 0) { - return $result; - } - - $offset_start = (int) $offset_start; - $how_many = $how_many > 20 ? 20 : (int) $how_many; - - $sql = 'SELECT id, feed_id - FROM feed_entries - WHERE feed_id IN (' . implode(', ', array_keys($this->feeds)) . ') - ORDER BY id DESC - LIMIT ' . $offset_start . ', ' . $how_many; - - $stmt = $this->app['phraseanet.appbox']->get_connection()->prepare($sql); - $stmt->execute(); - $rs = $stmt->fetchAll(PDO::FETCH_ASSOC); - $stmt->closeCursor(); - - foreach ($rs as $row) { - $entry = new Feed_Entry_Adapter($this->app, $this->feeds[$row['feed_id']], $row['id']); - $result->add_entry($entry); - } - - return $result; - } - - /** - * - * @return int - */ - public function get_count_total_entries() - { - if (count($this->feeds) === 0) { - return 0; - } - - $sql = 'SELECT count(id) as number - FROM feed_entries - WHERE feed_id - IN (' . implode(', ', array_keys($this->feeds)) . ') '; - $stmt = $this->app['phraseanet.appbox']->get_connection()->prepare($sql); - $stmt->execute(); - $row = $stmt->fetch(PDO::FETCH_ASSOC); - $number = $row ? (int) $row['number'] : 0; - $stmt->closeCursor(); - - return $number; - } - - /** - * - * @param registryInterface $registry - * @param string $format - * @param int $page - * @return Feed_Link - */ - public function get_homepage_link(registryInterface $registry, $format, $page = null) - { - switch ($format) { - case self::FORMAT_ATOM: - return new Feed_Link( - sprintf('%sfeeds/aggregated/atom/%s' - , $registry->get('GV_ServerName') - , ($page ? '?page=' . $page : '') - ) - , sprintf('%s - %s', $this->get_title(), 'Atom') - , 'application/atom+xml' - ); - break; - case self::FORMAT_COOLIRIS: - return new Feed_Link( - sprintf('%sfeeds/cooliris/%s' - , $registry->get('GV_ServerName') - , ($page ? '?page=' . $page : '') - ) - , sprintf('%s - %s', $this->get_title(), 'RSS') - , 'application/rss+xml' - ); - break; - default: - case self::FORMAT_RSS: - return new Feed_Link( - sprintf('%sfeeds/aggregated/rss/%s' - , $registry->get('GV_ServerName') - , ($page ? '?page=' . $page : '') - ) - , sprintf('%s - %s', $this->get_title(), 'RSS') - , 'application/rss+xml' - ); - break; - } - } - - /** - * - * @param User_Adapter $user - * @param boolean $renew - * @return string - */ - protected function get_token(User_Adapter $user, $renew = false) - { - $sql = 'SELECT token FROM feed_tokens - WHERE usr_id = :usr_id AND aggregated = "1"'; - $stmt = $this->app['phraseanet.appbox']->get_connection()->prepare($sql); - $stmt->execute(array(':usr_id' => $user->get_id())); - $row = $stmt->fetch(PDO::FETCH_ASSOC); - $stmt->closeCursor(); - - if (!$row || $renew === true) { - $token = random::generatePassword(12, random::LETTERS_AND_NUMBERS); - $sql = 'REPLACE INTO feed_tokens (id, token, feed_id, usr_id, aggregated) - VALUES (null, :token, :feed_id, :usr_id, :aggregated)'; - - $params = array( - ':token' => $token - , ':feed_id' => null - , ':usr_id' => $user->get_id() - , ':aggregated' => '1' - ); - - $stmt = $this->app['phraseanet.appbox']->get_connection()->prepare($sql); - $stmt->execute($params); - } else { - $token = $row['token']; - } - - return $token; - } - - /** - * - * @param Application $app - * @param User_Adapter $user - * @return Feed_Aggregate - */ - public static function load_with_user(Application $app, User_Adapter $user) - { - $feeds = Feed_Collection::load_all($app, $user); - - return new self($app, $feeds->get_feeds()); - } - - /** - * - * @param registryInterface $registry - * @param User_Adapter $user - * @param string $format - * @param int $page - * @param boolean $renew_token - * @return Feed_Link - */ - public function get_user_link(registryInterface $registry, User_Adapter $user, $format, $page = null, $renew_token = false) - { - switch ($format) { - case self::FORMAT_ATOM: - return new Feed_Link( - sprintf('%sfeeds/userfeed/aggregated/%s/atom/%s' - , $registry->get('GV_ServerName') - , $this->get_token($user, $renew_token) - , ($page ? '?page=' . $page : '') - ) - , sprintf('%s - %s', $this->get_title(), 'Atom') - , 'application/atom+xml' - ); - break; - case self::FORMAT_RSS: - return new Feed_Link( - sprintf('%sfeeds/userfeed/aggregated/%s/rss/%s' - , $registry->get('GV_ServerName') - , $this->get_token($user, $renew_token) - , ($page ? '?page=' . $page : '') - ) - , sprintf('%s - %s', $this->get_title(), 'RSS') - , 'application/rss+xml' - ); - break; - } - } -} diff --git a/lib/classes/Feed/Collection.php b/lib/classes/Feed/Collection.php deleted file mode 100644 index 10a16b6c46..0000000000 --- a/lib/classes/Feed/Collection.php +++ /dev/null @@ -1,165 +0,0 @@ -feeds = $feeds; - $this->app = $app; - - return $this; - } - - /** - * - * @param Application $app - * @param User_Adapter $user - * @return Feed_Collection - */ - public static function load_all(Application $app, User_Adapter $user) - { - $base_ids = array_keys($user->ACL()->get_granted_base()); - - $sql = 'SELECT id FROM feeds - WHERE base_id IS NULL '; - - if (count($base_ids) > 0) { - $sql .= ' OR base_id - IN (' . implode(', ', $base_ids) . ') '; - } - - $sql .= ' OR public = "1" - ORDER BY created_on DESC'; - - $stmt = $app['phraseanet.appbox']->get_connection()->prepare($sql); - $stmt->execute(); - $rs = $stmt->fetchAll(PDO::FETCH_ASSOC); - $stmt->closeCursor(); - - $feeds = array(); - - foreach ($rs as $row) { - $feeds[] = new Feed_Adapter($app, $row['id']); - } - - return new self($app, $feeds); - } - - /** - * - * @return Array - */ - public function get_feeds() - { - return $this->feeds; - } - - /** - * - * @return Feed_Aggregate - */ - public function get_aggregate() - { - return new Feed_Aggregate($this->app, $this->feeds); - } - - /** - * - * @param Application $app - * @return Feed_Collection - */ - public static function load_public_feeds(Application $app) - { - $rs = self::retrieve_public_feed_ids($app['phraseanet.appbox']); - $feeds = array(); - foreach ($rs as $feed_id) { - $feeds[] = new Feed_Adapter($app, $feed_id); - } - - return new self($app, $feeds); - } - - protected static function retrieve_public_feed_ids(appbox $appbox) - { - $key = 'feedcollection_' . self::CACHE_PUBLIC; - - try { - return $appbox->get_data_from_cache($key); - } catch (Exception $e) { - - } - - $sql = 'SELECT id FROM feeds WHERE public = "1" AND base_id IS null ORDER BY created_on DESC'; - $stmt = $appbox->get_connection()->prepare($sql); - $stmt->execute(); - $rs = $stmt->fetchAll(PDO::FETCH_ASSOC); - $stmt->closeCursor(); - - $feeds = array(); - - foreach ($rs as $row) { - $feeds[] = $row['id']; - } - - $appbox->set_data_to_cache($feeds, $key); - - return $feeds; - } - - public function get_cache_key($option = null) - { - return 'feedcollection_' . ($option ? '_' . $option : ''); - } - - public function get_data_from_cache($option = null) - { - return $this->app['phraseanet.appbox']->get_data_from_cache($this->get_cache_key($option)); - } - - public function set_data_to_cache($value, $option = null, $duration = 0) - { - return $this->app['phraseanet.appbox']->set_data_to_cache($value, $this->get_cache_key($option), $duration); - } - - public function delete_data_from_cache($option = null) - { - return $this->app['phraseanet.appbox']->delete_data_from_cache($this->get_cache_key($option)); - } -} diff --git a/lib/classes/Feed/CollectionInterface.php b/lib/classes/Feed/CollectionInterface.php deleted file mode 100644 index 94342d4d30..0000000000 --- a/lib/classes/Feed/CollectionInterface.php +++ /dev/null @@ -1,24 +0,0 @@ -app = $app; - $this->feed = $feed; - $this->id = (int) $id; - $this->load(); - - return $this; - } - - /** - * - * @return Feed_Entry_Adapter - */ - protected function load() - { - try { - $datas = $this->get_data_from_cache(); - - $this->title = $datas['title']; - $this->subtitle = $datas['subtitle']; - $this->author_name = $datas['author_name']; - $this->author_email = $datas['author_email']; - $this->publisher_id = $datas['publisher_id']; - $this->updated_on = $datas['updated_on']; - $this->created_on = $datas['created_on']; - - return $this; - } catch (Exception $e) { - - } - - $sql = 'SELECT publisher, title, description, created_on, updated_on - , author_name, author_email - FROM feed_entries - WHERE id = :id '; - - $stmt = $this->app['phraseanet.appbox']->get_connection()->prepare($sql); - $stmt->execute(array(':id' => $this->id)); - $row = $stmt->fetch(PDO::FETCH_ASSOC); - $stmt->closeCursor(); - - if ( ! $row) - throw new Exception_Feed_EntryNotFound(); - - $this->title = $row['title']; - $this->subtitle = $row['description']; - $this->author_name = $row['author_name']; - $this->author_email = $row['author_email']; - $this->publisher_id = $row['publisher']; - $this->updated_on = new DateTime($row['updated_on']); - $this->created_on = new DateTime($row['created_on']); - - $datas = array( - 'title' => $this->title - , 'subtitle' => $this->subtitle - , 'author_name' => $this->author_name - , 'author_email' => $this->author_email - , 'publisher_id' => $this->publisher_id - , 'updated_on' => $this->updated_on - , 'created_on' => $this->created_on - ); - - $this->set_data_to_cache($datas); - - return $this; - } - - public function get_link() - { - $href = sprintf( - '%slightbox/feeds/entry/%d/' - , $this->app['phraseanet.registry']->get('GV_ServerName') - , $this->get_id() - ); - - return new Feed_Link($href, $this->get_title(), 'text/html'); - } - - /** - * - * @return Feed_Adapter - */ - public function get_feed() - { - return $this->feed; - } - - /** - * - * @return int - */ - public function get_id() - { - return $this->id; - } - - /** - * - * @return string - */ - public function get_title() - { - return $this->title; - } - - /** - * - * @return string - */ - public function get_subtitle() - { - return $this->subtitle; - } - - /** - * Change the parent feed of the entry - * - * @param Feed_Adapter $feed - * @return \Feed_Entry_Adapter - */ - public function set_feed(Feed_Adapter $feed) - { - $sql = 'UPDATE feed_entries - SET feed_id = :feed_id, updated_on = NOW() WHERE id = :entry_id'; - $stmt = $this->app['phraseanet.appbox']->get_connection()->prepare($sql); - $stmt->execute(array( - ':feed_id' => $feed->get_id(), - ':entry_id' => $this->get_id(), - )); - $stmt->closeCursor(); - - $this->feed->delete_data_from_cache(); - $this->feed = $feed; - $feed->delete_data_from_cache(); - $this->delete_data_from_cache(); - - return $this; - } - - /** - * - * @param string $title - * @return Feed_Entry_Adapter - */ - public function set_title($title) - { - $title = trim(strip_tags($title)); - - if ($title === '') - throw new Exception_InvalidArgument(); - - $sql = 'UPDATE feed_entries - SET title = :title, updated_on = NOW() WHERE id = :entry_id'; - $stmt = $this->app['phraseanet.appbox']->get_connection()->prepare($sql); - $stmt->execute(array(':title' => $title, ':entry_id' => $this->get_id())); - $stmt->closeCursor(); - $this->title = $title; - $this->delete_data_from_cache(); - - return $this; - } - - /** - * - * @param string $subtitle - * @return Feed_Entry_Adapter - */ - public function set_subtitle($subtitle) - { - $subtitle = strip_tags($subtitle); - - $sql = 'UPDATE feed_entries - SET description = :subtitle, updated_on = NOW() - WHERE id = :entry_id'; - $params = array(':subtitle' => $subtitle, ':entry_id' => $this->get_id()); - $stmt = $this->app['phraseanet.appbox']->get_connection()->prepare($sql); - $stmt->execute($params); - $stmt->closeCursor(); - $this->subtitle = $subtitle; - $this->delete_data_from_cache(); - - return $this; - } - - /** - * - * @param string $author_name - * @return Feed_Entry_Adapter - */ - public function set_author_name($author_name) - { - $sql = 'UPDATE feed_entries - SET author_name = :author_name, updated_on = NOW() - WHERE id = :entry_id'; - $params = array( - ':author_name' => $author_name, - ':entry_id' => $this->get_id() - ); - $stmt = $this->app['phraseanet.appbox']->get_connection()->prepare($sql); - $stmt->execute($params); - $stmt->closeCursor(); - $this->author_name = $author_name; - $this->delete_data_from_cache(); - - return $this; - } - - /** - * - * @param string $author_email - * @return Feed_Entry_Adapter - */ - public function set_author_email($author_email) - { - $sql = 'UPDATE feed_entries - SET author_email = :author_email, updated_on = NOW() - WHERE id = :entry_id'; - $params = array( - ':author_email' => $author_email, - ':entry_id' => $this->get_id() - ); - $stmt = $this->app['phraseanet.appbox']->get_connection()->prepare($sql); - $stmt->execute($params); - $stmt->closeCursor(); - $this->author_email = $author_email; - $this->delete_data_from_cache(); - - return $this; - } - - public function set_created_on(DateTime $datetime) - { - $sql = 'UPDATE feed_entries - SET created_on = :created_on - WHERE id = :entry_id'; - $params = array( - ':created_on' => $datetime->format(DATE_ISO8601), - ':entry_id' => $this->get_id() - ); - $stmt = $this->app['phraseanet.appbox']->get_connection()->prepare($sql); - $stmt->execute($params); - $stmt->closeCursor(); - $this->created_on = $datetime; - $this->delete_data_from_cache(); - - return $this; - } - - public function set_updated_on(DateTime $datetime) - { - $sql = 'UPDATE feed_entries - SET updated_on = :updated_on - WHERE id = :entry_id'; - $params = array( - ':updated_on' => $datetime->format(DATE_ISO8601), - ':entry_id' => $this->get_id() - ); - $stmt = $this->app['phraseanet.appbox']->get_connection()->prepare($sql); - $stmt->execute($params); - $stmt->closeCursor(); - $this->updated_on = $datetime; - $this->delete_data_from_cache(); - - return $this; - } - - /** - * - * @return Feed_Publisher_Adapter - */ - public function get_publisher() - { - if (! $this->publisher instanceof Feed_Publisher_Adapter) { - try { - $this->publisher = new Feed_Publisher_Adapter($this->app, $this->publisher_id); - } catch (\Exception_Feed_PublisherNotFound $e) { - - } - } - - return $this->publisher; - } - - /** - * - * @param User_adapter $user - * @return boolean - */ - public function is_publisher(User_adapter $user) - { - $publisher = $this->get_publisher(); - - if ($publisher instanceof Feed_Publisher_Interface) { - return $user->get_id() === $publisher->get_user()->get_id(); - } - - return false; - } - - /** - * - * @return DateTime - */ - public function get_created_on() - { - return $this->created_on; - } - - /** - * - * @return DateTime - */ - public function get_updated_on() - { - return $this->updated_on; - } - - /** - * - * @return string - */ - public function get_author_name() - { - return $this->author_name; - } - - /** - * - * @return string - */ - public function get_author_email() - { - return $this->author_email; - } - - /** - * - * @return array - */ - public function get_content() - { - if ($this->items) { - return $this->items; - } - - $rs = $this->retrieve_elements(); - $items = array(); - foreach ($rs as $item_id) { - try { - $items[] = new Feed_Entry_Item($this->app['phraseanet.appbox'], $this, $item_id); - } catch (NotFoundHttpException $e) { - - } - } - - $this->items = $items; - - return $this->items; - } - - protected function retrieve_elements() - { - try { - return $this->get_data_from_cache(self::CACHE_ELEMENTS); - } catch (Exception $e) { - - } - - $sql = 'SELECT id FROM feed_entry_elements - WHERE entry_id = :entry_id ORDER BY ord ASC'; - $stmt = $this->app['phraseanet.appbox']->get_connection()->prepare($sql); - $stmt->execute(array(':entry_id' => $this->get_id())); - $rs = $stmt->fetchAll(PDO::FETCH_ASSOC); - $stmt->closeCursor(); - - $items = array(); - - foreach ($rs as $row) { - $items[] = (int) $row['id']; - } - - $this->set_data_to_cache($items, self::CACHE_ELEMENTS); - - return $items; - } - - /** - * - * @return void - */ - public function delete() - { - foreach ($this->get_content() as $content) { - $content->delete(); - } - - $sql = 'DELETE FROM feed_entries WHERE id = :entry_id'; - $stmt = $this->app['phraseanet.appbox']->get_connection()->prepare($sql); - $stmt->execute(array(':entry_id' => $this->get_id())); - $stmt->closeCursor(); - - return; - } - - public static function create(Application $app, Feed_Adapter $feed - , Feed_Publisher_Adapter $publisher, $title, $subtitle, $author_name, $author_mail) - { - if ( ! $feed->is_publisher($publisher->get_user())) { - throw new Exception_Feed_PublisherNotFound("Publisher not found"); - } - - if ( ! $feed->is_public() && $feed->get_collection() instanceof Collection) { - if ( ! $publisher->get_user()->ACL()->has_access_to_base($feed->get_collection()->get_base_id())) { - throw new AccessDeniedHttpException("User has no rights to publish in current feed"); - } - } - - $sql = 'INSERT INTO feed_entries (id, feed_id, publisher, title - , description, created_on, updated_on, author_name, author_email) - VALUES (null, :feed_id, :publisher_id, :title - , :description, NOW(), NOW(), :author_name, :author_email)'; - - $params = array( - ':feed_id' => $feed->get_id(), - ':publisher_id' => $publisher->get_id(), - ':title' => trim($title), - ':description' => trim($subtitle), - ':author_name' => trim($author_name), - ':author_email' => trim($author_mail), - ); - - $stmt = $app['phraseanet.appbox']->get_connection()->prepare($sql); - $stmt->execute($params); - $stmt->closeCursor(); - - $entry_id = $app['phraseanet.appbox']->get_connection()->lastInsertId(); - - $feed->delete_data_from_cache(); - - $entry = new self($app, $feed, $entry_id); - - $app['events-manager']->trigger('__FEED_ENTRY_CREATE__', array('entry_id' => $entry_id), $entry); - - return $entry; - } - - /** - * - * @param Application $app - * @param type $id - * @return Feed_Entry_Adapter - */ - public static function load_from_id(Application $app, $id) - { - $sql = 'SELECT feed_id FROM feed_entries WHERE id = :entry_id'; - $stmt = $app['phraseanet.appbox']->get_connection()->prepare($sql); - $stmt->execute(array(':entry_id' => $id)); - $row = $stmt->fetch(PDO::FETCH_ASSOC); - $stmt->closeCursor(); - - if ( ! $row) - throw new Exception_Feed_EntryNotFound(); - - $feed = new Feed_Adapter($app, $row['feed_id']); - - return new self($app, $feed, $id); - } - - public function get_cache_key($option = null) - { - return 'feedentry_' . $this->get_id() . '_' . ($option ? '_' . $option : ''); - } - - public function get_data_from_cache($option = null) - { - return $this->app['phraseanet.appbox']->get_data_from_cache($this->get_cache_key($option)); - } - - public function set_data_to_cache($value, $option = null, $duration = 0) - { - return $this->app['phraseanet.appbox']->set_data_to_cache($value, $this->get_cache_key($option), $duration); - } - - public function delete_data_from_cache($option = null) - { - return $this->app['phraseanet.appbox']->delete_data_from_cache($this->get_cache_key($option)); - } -} diff --git a/lib/classes/Feed/Entry/Collection.php b/lib/classes/Feed/Entry/Collection.php deleted file mode 100644 index 3798984c2a..0000000000 --- a/lib/classes/Feed/Entry/Collection.php +++ /dev/null @@ -1,73 +0,0 @@ -entries[] = $entry; - - return $this; - } - - /** - * - * @return Array - */ - public function get_entries() - { - return $this->entries; - } -} diff --git a/lib/classes/Feed/Entry/CollectionInterface.php b/lib/classes/Feed/Entry/CollectionInterface.php deleted file mode 100644 index 39299d58c7..0000000000 --- a/lib/classes/Feed/Entry/CollectionInterface.php +++ /dev/null @@ -1,26 +0,0 @@ -appbox = $appbox; - $this->id = (int) $id; - $this->entry = $entry; - $this->load(); - - return $this; - } - - public function get_entry() - { - return $this->entry; - } - - /** - * - * @return Feed_Entry_Item - */ - protected function load() - { - try { - $datas = $this->get_data_from_cache(); - $this->record = $this->appbox->get_databox($datas['sbas_id']) - ->get_record($datas['record_id'], $datas['ord']); - $this->ord = $datas['ord']; - - return $this; - } catch (Exception $e) { - - } - - $sql = 'SELECT id, sbas_id, record_id, ord - FROM feed_entry_elements WHERE id = :id'; - - $stmt = $this->appbox->get_connection()->prepare($sql); - $stmt->execute(array(':id' => $this->id)); - $row = $stmt->fetch(PDO::FETCH_ASSOC); - $stmt->closeCursor(); - - if ( ! $row) - throw new Exception_Feed_ItemNotFound(); - - $this->record = $this->appbox->get_databox($row['sbas_id']) - ->get_record($row['record_id']); - $this->ord = (int) $row['ord']; - - $datas = array( - 'record_id' => $this->record->get_record_id() - , 'sbas_id' => $this->record->get_sbas_id() - , 'ord' => $this->ord - ); - - $this->set_data_to_cache($datas); - - return $this; - } - - /** - * - * @return int - */ - public function get_id() - { - return $this->id; - } - - /** - * - * @return record_adapter - */ - public function get_record() - { - return $this->record; - } - - /** - * - * @return int - */ - public function get_ord() - { - return $this->ord; - } - - public function set_ord($order) - { - $order = (int) $order; - $sql = 'UPDATE feed_entry_elements SET ord = :ord WHERE id = :item_id'; - $stmt = $this->appbox->get_connection()->prepare($sql); - $stmt->execute(array(':ord' => $order, ':item_id' => $this->get_id())); - $stmt->closeCursor(); - - $this->ord = $order; - - return $this; - } - - /** - * - * @return void - */ - public function delete() - { - $sql = 'DELETE FROM feed_entry_elements WHERE id = :id'; - $stmt = $this->appbox->get_connection()->prepare($sql); - $stmt->execute(array(':id' => $this->get_id())); - $stmt->closeCursor(); - - return; - } - - /** - * - * @param appbox $appbox - * @param Feed_Entry_Adapter $entry - * @param record_adapter $record - * @return Feed_Entry_Item - */ - public static function create(appbox $appbox, Feed_Entry_Adapter $entry, record_adapter $record) - { - $sql = 'SELECT (MAX(ord)+1) as sorter FROM feed_entry_elements - WHERE entry_id = :entry_id'; - - $stmt = $appbox->get_connection()->prepare($sql); - $stmt->execute(array(':entry_id' => $entry->get_id())); - $row = $stmt->fetch(PDO::FETCH_ASSOC); - $stmt->closeCursor(); - - $sorter = ($row && $row['sorter'] > 0) ? (int) $row['sorter'] : 1; - - $sql = 'INSERT INTO feed_entry_elements - (id, entry_id, sbas_id, record_id, ord) - VALUES (null, :entry_id, :sbas_id, :record_id, :ord)'; - - $params = array( - ':entry_id' => $entry->get_id() - , ':sbas_id' => $record->get_sbas_id() - , ':record_id' => $record->get_record_id() - , ':ord' => $sorter - ); - - $stmt = $appbox->get_connection()->prepare($sql); - $stmt->execute($params); - $stmt->closeCursor(); - - $item_id = $appbox->get_connection()->lastInsertId(); - - $entry->delete_data_from_cache(Feed_Entry_Adapter::CACHE_ELEMENTS); - - return new self($appbox, $entry, $item_id); - } - - public function get_cache_key($option = null) - { - return 'feedentryitem_' . $this->get_id() . '_' . ($option ? '_' . $option : ''); - } - - public function get_data_from_cache($option = null) - { - return $this->appbox->get_data_from_cache($this->get_cache_key($option)); - } - - public function set_data_to_cache($value, $option = null, $duration = 0) - { - return $this->appbox->set_data_to_cache($value, $this->get_cache_key($option), $duration); - } - - public function delete_data_from_cache($option = null) - { - return $this->appbox->delete_data_from_cache($this->get_cache_key($option)); - } -} diff --git a/lib/classes/Feed/Entry/ItemInterface.php b/lib/classes/Feed/Entry/ItemInterface.php deleted file mode 100644 index 9e15da3611..0000000000 --- a/lib/classes/Feed/Entry/ItemInterface.php +++ /dev/null @@ -1,32 +0,0 @@ -mimetype = $mimetype; - $this->href = $href; - $this->title = $title; - - return $this; - } - - /** - * - * @return string - */ - public function get_mimetype() - { - return $this->mimetype; - } - - /** - * - * @return string - */ - public function get_title() - { - return $this->title; - } - - /** - * - * @return string - */ - public function get_href() - { - return $this->href; - } -} diff --git a/lib/classes/Feed/LinkInterface.php b/lib/classes/Feed/LinkInterface.php deleted file mode 100644 index eaff12b952..0000000000 --- a/lib/classes/Feed/LinkInterface.php +++ /dev/null @@ -1,26 +0,0 @@ -app = $app; - $this->id = (int) $id; - $this->load(); - - return $this; - } - - /** - * - * @return Feed_Publisher_Adapter - */ - protected function load() - { - try { - $datas = $this->get_data_from_cache(); - - $this->user = User_Adapter::getInstance($datas['usr_id'], $this->app); - $this->added_by = User_Adapter::getInstance($datas['added_by_usr_id'], $this->app); - $this->created_on = $datas['created_on']; - $this->owner = $datas['owner']; - - return $this; - } catch (Exception $e) { - - } - - $sql = 'SELECT id, usr_id, owner, created_on, added_by - FROM feed_publishers WHERE id = :feed_publisher_id'; - $stmt = $this->app['phraseanet.appbox']->get_connection()->prepare($sql); - $stmt->execute(array(':feed_publisher_id' => $this->id)); - $row = $stmt->fetch(PDO::FETCH_ASSOC); - $stmt->closeCursor(); - - if ( ! $row) - throw new Exception_Feed_PublisherNotFound('Publisher is not Found'); - - $this->user = User_Adapter::getInstance($row['usr_id'], $this->app); - $this->owner = ! ! $row['owner']; - $this->created_on = new DateTime($row['created_on']); - $this->added_by = User_Adapter::getInstance($row['added_by'], $this->app); - - $datas = array( - 'usr_id' => $this->user->get_id() - , 'owner' => $this->owner - , 'created_on' => $this->created_on - , 'added_by_usr_id' => $this->added_by->get_id() - ); - - $this->set_data_to_cache($datas); - - return $this; - } - - /** - * - * @return User_Adapter - */ - public function get_user() - { - return $this->user; - } - - /** - * - * @return boolean - */ - public function is_owner() - { - return $this->owner; - } - - /** - * - * @return DateTime - */ - public function get_created_on() - { - return $this->created_on; - } - - /** - * - * @return User_Adapter - */ - public function get_added_by() - { - return $this->added_by; - } - - /** - * - * @return int - */ - public function get_id() - { - return $this->id; - } - - /** - * - * @return void - */ - public function delete() - { - $sql = 'DELETE FROM feed_publishers WHERE id = :feed_publisher_id'; - $stmt = $this->app['phraseanet.appbox']->get_connection()->prepare($sql); - $stmt->execute(array(':feed_publisher_id' => $this->get_id())); - $stmt->closeCursor(); - - return; - } - - /** - * - * @param Application $app - * @param User_Adapter $user - * @param Feed_Adapter $feed - * @param boolean $owner - * @return Feed_Publisher_Adapter - */ - public static function create(Application $app, User_Adapter $user, Feed_Adapter $feed, $owner) - { - $sql = 'INSERT INTO feed_publishers (id, usr_id, feed_id, owner, created_on, added_by) - VALUES (null, :usr_id, :feed_id, :owner, NOW(), :added_by)'; - $stmt = $app['phraseanet.appbox']->get_connection()->prepare($sql); - $params = array( - ':usr_id' => $user->get_id() - , ':feed_id' => $feed->get_id() - , ':owner' => $owner ? '1' : null - , ':added_by' => $owner ? $user->get_id() : $app['authentication']->getUser()->get_id() - ); - $stmt->execute($params); - $id = $app['phraseanet.appbox']->get_connection()->lastInsertId(); - $stmt->closeCursor(); - - return new self($app, $id); - } - - /** - * - * @param appbox $appbox - * @param Feed_Adapter $feed - * @param User_Adapter $user - * @return Feed_Publisher_Adapter - */ - public static function getPublisher(appbox $appbox, Feed_Adapter $feed, User_Adapter $user) - { - foreach ($feed->get_publishers() as $publisher) { - if ($publisher->get_user()->get_id() === $user->get_id()) { - return $publisher; - } - } - throw new Exception_Feed_PublisherNotFound('Publisher not found'); - } - - public function get_cache_key($option = null) - { - return 'feedpublisher_' . $this->get_id() . '_' . ($option ? '_' . $option : ''); - } - - public function get_data_from_cache($option = null) - { - return $this->app['phraseanet.appbox']->get_data_from_cache($this->get_cache_key($option)); - } - - public function set_data_to_cache($value, $option = null, $duration = 0) - { - return $this->app['phraseanet.appbox']->set_data_to_cache($value, $this->get_cache_key($option), $duration); - } - - public function delete_data_from_cache($option = null) - { - return $this->app['phraseanet.appbox']->delete_data_from_cache($this->get_cache_key($option)); - } -} diff --git a/lib/classes/Feed/Publisher/Interface.php b/lib/classes/Feed/Publisher/Interface.php deleted file mode 100644 index 892e34b2a6..0000000000 --- a/lib/classes/Feed/Publisher/Interface.php +++ /dev/null @@ -1,40 +0,0 @@ - $feed_id - , ':token' => $token - ); - - $stmt = $app['phraseanet.appbox']->get_connection()->prepare($sql); - $stmt->execute($params); - $row = $stmt->fetch(PDO::FETCH_ASSOC); - $stmt->closeCursor(); - - if ( ! $row) - throw new NotFoundHttpException('Feed not found.'); - - $this->feed_id = (int) $row['feed_id']; - $this->usr_id = (int) $row['usr_id']; - $this->app = $app; - - return $this; - } - - /** - * - * @return User_Adapter - */ - public function get_user() - { - if ( ! $this->user) - $this->user = User_Adapter::getInstance($this->usr_id, $this->app); - - return $this->user; - } - - /** - * - * @return Feed_Adapter - */ - public function get_feed() - { - if ( ! $this->feed) - $this->feed = Feed_Adapter::load_with_user($this->app, $this->get_user(), $this->feed_id); - - return $this->feed; - } -} diff --git a/lib/classes/Feed/TokenAggregate.php b/lib/classes/Feed/TokenAggregate.php deleted file mode 100644 index b35f0a5944..0000000000 --- a/lib/classes/Feed/TokenAggregate.php +++ /dev/null @@ -1,66 +0,0 @@ - $token - ); - - $stmt = $app['phraseanet.appbox']->get_connection()->prepare($sql); - $stmt->execute($params); - $row = $stmt->fetch(PDO::FETCH_ASSOC); - $stmt->closeCursor(); - - if ( ! $row) - throw new NotFoundHttpException('Feed not found.'); - - $this->usr_id = $row['usr_id']; - $this->app = $app; - - return $this; - } - - /** - * - * @return Feed_Aggregate - */ - public function get_feed() - { - if (! $this->feed) { - $this->feed = Feed_Aggregate::load_with_user($this->app, $this->get_user()); - } - - return $this->feed; - } -} diff --git a/lib/classes/Feed/XML/Abstract.php b/lib/classes/Feed/XML/Abstract.php deleted file mode 100644 index 6535fed717..0000000000 --- a/lib/classes/Feed/XML/Abstract.php +++ /dev/null @@ -1,351 +0,0 @@ -title = $title; - - return $this; - } - - /** - * - * @param DateTime $datetime - * @return Feed_XML_Interface - */ - public function set_updated_on(DateTime $datetime) - { - $this->updated_on = $datetime; - - return $this; - } - - /** - * - * @param string $subtitle - * @return Feed_XML_Interface - */ - public function set_subtitle($subtitle) - { - $this->subtitle = $subtitle; - - return $this; - } - - /** - * - * @param Feed_Link $link - * @return Feed_XML_Interface - */ - public function set_link(Feed_Link $link) - { - $this->link = $link; - - return $this; - } - - /** - * - * @param Feed_Link $next_page - * @return Feed_XML_Interface - */ - public function set_next_page(Feed_Link $next_page) - { - $this->next_page = $next_page; - - return $this; - } - - /** - * - * @param Feed_Link $previous_page - * @return Feed_XML_Interface - */ - public function set_previous_page(Feed_Link $previous_page) - { - $this->previous_page = $previous_page; - - return $this; - } - - /** - * - * @param Feed_Entry_Adapter $entry - * @return Feed_XML_Interface - */ - public function set_item(Feed_Entry_Adapter $entry) - { - $this->items[] = $entry; - - return $this; - } - - /** - * - * @param string $generator - * @return Feed_XML_Interface - */ - public function set_generator($generator) - { - $this->generator = $generator; - - return $this; - } - - /** - * - * @param DOMDocument $document - * @param DOMNode $node - * @param boolean $namespaced - * @return Feed_XML_Interface - */ - public function add_navigation(DOMDocument $document, DOMNode $node, $namespaced) - { - $prefix = $namespaced ? 'atom:' : ''; - - if ($this->previous_page instanceof Feed_Link) { - $prev_link = $this->addTag($document, $node, $prefix . 'link'); - $prev_link->setAttribute('rel', 'previous'); - $prev_link->setAttribute('href', $this->previous_page->get_href()); - } - - if ($this->next_page instanceof Feed_Link) { - $next_link = $this->addTag($document, $node, $prefix . 'link'); - $next_link->setAttribute('rel', 'next'); - $next_link->setAttribute('href', $this->next_page->get_href()); - } - - return $this; - } - - /** - * - * @param DOMDocument $document - * @param DOMNode $node - * @param string $tagname - * @param string $tagcontent - * @return DOMElement - */ - protected function addTag(DOMDocument $document, DOMNode $node, $tagname, $tagcontent = null) - { - $tag = $document->createElement($tagname); - - if (trim($tagcontent) !== '') - $tag->appendChild($document->createTextNode($tagcontent)); - $node->appendChild($tag); - - return $tag; - } - - /** - * - * @param DOMDocument $document - * @param DOMNode $item - * @param Feed_Entry_Item $content - * @return Feed_XML_Interface - */ - protected function addContent(DOMDocument $document, DOMNode $item, Feed_Entry_Adapter $entry, Feed_Entry_Item $content) - { - $preview_sd = $content->get_record()->get_subdef('preview'); - $preview_permalink = $preview_sd->get_permalink(); - $thumbnail_sd = $content->get_record()->get_thumbnail(); - $thumbnail_permalink = $thumbnail_sd->get_permalink(); - - $medium = strtolower($content->get_record()->get_type()); - - if ( ! in_array($medium, array('image', 'audio', 'video'))) { - return $this; - } - - if (! $preview_permalink || ! $thumbnail_permalink) { - return $this; - } - - $group = $this->addTag($document, $item, 'media:group'); - - $caption = $content->get_record()->get_caption(); - - $title_field = $caption->get_dc_field(databox_Field_DCESAbstract::Title); - if ($title_field) { - $str_title = $title_field->get_serialized_values(' '); - $title = $this->addTag($document, $group, 'media:title', $str_title); - $title->setAttribute('type', 'plain'); - } - - $desc_field = $caption->get_dc_field(databox_Field_DCESAbstract::Description); - if ($desc_field) { - $str_desc = $desc_field->get_serialized_values(' '); - $desc = $this->addTag($document, $group, 'media:description', $str_desc); - $desc->setAttribute('type', 'plain'); - } - - $contrib_field = $caption->get_dc_field(databox_Field_DCESAbstract::Contributor); - if ($contrib_field) { - $str_contrib = $contrib_field->get_serialized_values(' '); - $contrib = $this->addTag($document, $group, 'media:credit', $str_contrib); - $contrib->setAttribute('role', 'contributor'); - $contrib->setAttribute('scheme', 'urn:ebu'); - } - - $director_field = $caption->get_dc_field(databox_Field_DCESAbstract::Creator); - if ($director_field) { - $str_director = $director_field->get_serialized_values(' '); - $director = $this->addTag($document, $group, 'media:credit', $str_director); - $director->setAttribute('role', 'director'); - $director->setAttribute('scheme', 'urn:ebu'); - } - - $publisher_field = $caption->get_dc_field(databox_Field_DCESAbstract::Publisher); - if ($publisher_field) { - $str_publisher = $publisher_field->get_serialized_values(' '); - $publisher = $this->addTag($document, $group, 'media:credit', $str_publisher); - $publisher->setAttribute('role', 'publisher'); - $publisher->setAttribute('scheme', 'urn:ebu'); - } - - $rights_field = $caption->get_dc_field(databox_Field_DCESAbstract::Rights); - if ($rights_field) { - $str_rights = $rights_field->get_serialized_values(' '); - $rights = $this->addTag($document, $group, 'media:copyright', $str_rights); - } - - $keyword_field = $caption->get_dc_field(databox_Field_DCESAbstract::Subject); - if ($keyword_field) { - $str_keywords = $keyword_field->get_serialized_values(', '); - $keywords = $this->addTag($document, $group, 'media:keywords', $str_keywords); - } - - $duration = $content->get_record()->get_duration(); - - if ($preview_permalink) { - $preview = $this->addTag($document, $group, 'media:content'); - - $preview->setAttribute('url', $preview_permalink->get_url()); - $preview->setAttribute('fileSize', $preview_sd->get_size()); - $preview->setAttribute('type', $preview_sd->get_mime()); - $preview->setAttribute('medium', $medium); - $preview->setAttribute('expression', 'full'); - $preview->setAttribute('isDefault', 'true'); - - if ($preview_sd->get_width()) - $preview->setAttribute('width', $preview_sd->get_width()); - if ($preview_sd->get_height()) - $preview->setAttribute('height', $preview_sd->get_height()); - if ($duration) - $preview->setAttribute('duration', $duration); - } - - if ($thumbnail_permalink) { - $thumbnail = $this->addTag($document, $group, 'media:thumbnail'); - - $thumbnail->setAttribute('url', $thumbnail_permalink->get_url()); - - if ($thumbnail_sd->get_width()) - $thumbnail->setAttribute('width', $thumbnail_sd->get_width()); - if ($thumbnail_sd->get_height()) - $thumbnail->setAttribute('height', $thumbnail_sd->get_height()); - - $thumbnail = $this->addTag($document, $group, 'media:content'); - - $thumbnail->setAttribute('url', $thumbnail_permalink->get_url()); - $thumbnail->setAttribute('fileSize', $thumbnail_sd->get_size()); - $thumbnail->setAttribute('type', $thumbnail_sd->get_mime()); - $thumbnail->setAttribute('medium', $medium); - $thumbnail->setAttribute('isDefault', 'false'); - - if ($thumbnail_sd->get_width()) - $thumbnail->setAttribute('width', $thumbnail_sd->get_width()); - if ($thumbnail_sd->get_height()) - $thumbnail->setAttribute('height', $thumbnail_sd->get_height()); - if ($duration) - $thumbnail->setAttribute('duration', $duration); - } - - return $this; - } - - /** - * - * @return string - */ - public function get_mimetype() - { - return $this->mimetype; - } - - abstract public function render(); -} diff --git a/lib/classes/Feed/XML/Atom.php b/lib/classes/Feed/XML/Atom.php deleted file mode 100644 index 337912cb56..0000000000 --- a/lib/classes/Feed/XML/Atom.php +++ /dev/null @@ -1,192 +0,0 @@ -formatOutput = true; - $document->standalone = true; - - $root = $this->addTag($document, $document, 'feed'); - $root->setAttribute('xmlns', 'http://www.w3.org/2005/Atom'); - $root->setAttribute('xmlns:media', 'http://search.yahoo.com/mrss/'); - - $this->addTag($document, $root, 'title', $this->title); - if ($this->updated_on instanceof DateTime) { - $updated_on = $this->updated_on->format(DATE_ATOM); - $this->addTag($document, $root, 'updated', $updated_on); - } - - if ($this->link instanceof Feed_Link) { - $link = $this->addTag($document, $root, 'link'); - $link->setAttribute('rel', 'self'); - $link->setAttribute('href', $this->link->get_href()); - $this->addTag($document, $root, 'id', $this->link->get_href()); - } - - $this->add_navigation($document, $root, false); - - if ($this->generator) - $this->addTag($document, $root, 'generator', $this->generator); - if ($this->subtitle) - $this->addTag($document, $root, 'subtitle', $this->subtitle); - if ($this->icon) - $this->addTag($document, $root, 'icon', $this->icon); - if ($this->author) { - $author = $this->addTag($document, $root, 'author'); - if ($this->author_email) - $this->addTag($document, $author, 'email', $this->author_email); - if ($this->author_name) - $this->addTag($document, $author, 'name', $this->author_name); - if ($this->author_url) - $this->addTag($document, $author, 'uri', $this->author_url); - } - - foreach ($this->items as $item) { - $this->add_item($document, $root, $item); - } - - return $document->saveXML(); - } - - /** - * - * @param DOMDocument $document - * @param DOMElement $feed - * @param Feed_Entry_Adapter $entry - * @return DOMElement - */ - protected function add_item(DOMDocument $document, DOMElement $feed, Feed_Entry_Adapter $entry) - { - $entry_node = $this->addTag($document, $feed, 'entry'); - - $link = sprintf('%sentry/%d/', $this->link->get_href(), $entry->get_id()); - - $this->addTag($document, $entry_node, 'id', $link); - $link_tag = $this->addTag($document, $entry_node, 'link'); - $link_tag->setAttribute('rel', 'self'); - $link_tag->setAttribute('href', $link); - - $updated_on = $entry->get_updated_on()->format(DATE_ATOM); - $created_on = $entry->get_created_on()->format(DATE_ATOM); - - $this->addTag($document, $entry_node, 'updated', $updated_on); - $this->addTag($document, $entry_node, 'published', $created_on); - $this->addTag($document, $entry_node, 'title', $entry->get_title()); - $author = $this->addTag($document, $entry_node, 'author'); - - if ($entry->get_author_email()) - $this->addTag($document, $author, 'email', $entry->get_author_email()); - if ($entry->get_author_name()) - $this->addTag($document, $author, 'name', $entry->get_author_name()); - - $this->addTag($document, $entry_node, 'content', $entry->get_subtitle()); - - foreach ($entry->get_content() as $content) { - $this->addContent($document, $entry_node, $entry, $content); - } - - return $entry_node; - } - - /** - * - * @param string $author_name - * @return Feed_XML_Atom - */ - public function set_author_name($author_name) - { - $this->author = true; - $this->author_name = $author_name; - - return $this; - } - - /** - * - * @param string $author_email - * @return Feed_XML_Atom - */ - public function set_author_email($author_email) - { - $this->author = true; - $this->author_email = $author_email; - - return $this; - } - - /** - * - * @param string $author_url - * @return Feed_XML_Atom - */ - public function set_author_url($author_url) - { - $this->author = true; - $this->author_url = $author_url; - - return $this; - } -} diff --git a/lib/classes/Feed/XML/Cooliris.php b/lib/classes/Feed/XML/Cooliris.php deleted file mode 100644 index afddffbe62..0000000000 --- a/lib/classes/Feed/XML/Cooliris.php +++ /dev/null @@ -1,440 +0,0 @@ -language = $language; - - return $this; - } - - /** - * - * @param string $copyright - * @return Feed_XML_RSS - */ - public function set_copyright($copyright) - { - $this->copyright = $copyright; - - return $this; - } - - /** - * - * @param string $managingEditor - * @return Feed_XML_RSS - */ - public function set_managingEditor($managingEditor) - { - $this->managingEditor = $managingEditor; - - return $this; - } - - /** - * - * @param string $webMaster - * @return Feed_XML_RSS - */ - public function set_webMaster($webMaster) - { - $this->webMaster = $webMaster; - - return $this; - } - - /** - * - * @param DateTime $lastBuildDate - * @return Feed_XML_RSS - */ - public function set_lastBuildDate(DateTime $lastBuildDate) - { - $this->lastBuildDate = $lastBuildDate; - - return $this; - } - - /** - * - * @param string $category - * @return Feed_XML_RSS - */ - public function set_category($category) - { - $this->categories[] = $category; - - return $this; - } - - /** - * - * @param string $docs - * @return Feed_XML_RSS - */ - public function set_docs($docs) - { - $this->docs = $docs; - - return $this; - } - - /** - * - * @param int $ttl - * @return Feed_XML_RSS - */ - public function set_ttl($ttl) - { - $this->ttl = $ttl; - - return $this; - } - - /** - * - * @param Feed_XML_RSS_Image $image - * @return Feed_XML_RSS - */ - public function set_image(Feed_XML_RSS_Image $image) - { - $this->image = $image; - - return $this; - } - - /** - * - * @param string $hour - * @return Feed_XML_RSS - */ - public function set_skipHour($hour) - { - $this->skipHours[] = (int) $hour; - - return $this; - } - - /** - * - * @param string $day - * @return Feed_XML_RSS - */ - public function set_skipDays($day) - { - $this->skipDays[] = $day; - - return $this; - } - - /** - * - * @return string - */ - public function render() - { - $doc = new DOMDocument('1.0', 'UTF-8'); - $doc->formatOutput = true; - $doc->standalone = true; - - $root = $this->addTag($doc, $doc, 'rss'); - - $root->setAttribute('version', self::VERSION); - $root->setAttribute('xmlns:media', 'http://search.yahoo.com/mrss/'); - $root->setAttribute('xmlns:atom', 'http://www.w3.org/2005/Atom'); - $root->setAttribute('xmlns:dc', 'http://purl.org/dc/elements/1.1/'); - - $channel = $this->addTag($doc, $root, 'channel'); - - $this->addTag($doc, $channel, 'title', $this->title); - $this->addTag($doc, $channel, 'dc:title', $this->title); - $this->addTag($doc, $channel, 'description', $this->subtitle); - if ($this->link instanceof Feed_Link) - $this->addTag($doc, $channel, 'link', $this->link->get_href()); - - if ($this->language) - $this->addTag($doc, $channel, 'language', $this->language); - if ($this->copyright) - $this->addTag($doc, $channel, 'copyright', $this->copyright); - if ($this->managingEditor) - $this->addTag($doc, $channel, 'managingEditor', $this->managingEditor); - if ($this->webMaster) - $this->addTag($doc, $channel, 'webMaster', $this->webMaster); - if ($this->updated_on instanceof DateTime) { - $updated_on = $this->updated_on->format(DATE_RFC2822); - $this->addTag($doc, $channel, 'pubDate', $updated_on); - } - if ($this->lastBuildDate instanceof DateTime) { - $last_build = $this->lastBuildDate->format(DATE_RFC2822); - $this->addTag($doc, $channel, 'lastBuildDate', $last_build); - } - if (count($this->categories) > 0) { - foreach ($this->categories as $category) { - $this->addTag($doc, $channel, 'category', $category); - } - } - if ($this->generator) - $this->addTag($doc, $channel, 'generator', $this->generator); - if ($this->docs) - $this->addTag($doc, $channel, 'docs', $this->docs); - if ($this->ttl) - $this->addTag($doc, $channel, 'ttl', $this->ttl); - if ($this->image instanceof Feed_XML_RSS_Image) { - $image = $this->addTag($doc, $channel, 'image'); - $this->addTag($doc, $image, 'url', $this->image->get_url()); - $this->addTag($doc, $image, 'title', $this->image->get_title()); - $this->addTag($doc, $image, 'link', $this->image->get_link()); - if ($this->image->get_width()) - $this->addTag($doc, $image, 'width', $this->image->get_width()); - if ($this->image->get_height()) - $this->addTag($doc, $image, 'height', $this->image->get_height()); - if ($this->image->get_description()) - $this->addTag($doc, $image, 'description', $this->image->get_description()); - } - if (count($this->skipHours)) { - $skipHours = $this->addTag($doc, $channel, 'skipHours'); - foreach ($this->skipHours as $hour) { - $this->addTag($doc, $skipHours, 'hour', $hour); - } - } - if (count($this->skipDays) > 0) { - $skipDays = $this->addTag($doc, $channel, 'skipDays'); - foreach ($this->skipDays as $day) { - $this->addTag($doc, $skipDays, 'day', $day); - } - } - if ($this->link instanceof Feed_Link) { - $self_link = $this->addTag($doc, $channel, 'atom:link'); - $self_link->setAttribute('rel', 'self'); - $self_link->setAttribute('href', $this->link->get_href()); - } - - $this->add_navigation($doc, $channel, true); - - foreach ($this->items as $item) { - $this->add_item($doc, $channel, $item); - } - - return $doc->saveXML(); - } - - /** - * - * @param DOMDocument $document - * @param DOMNode $node - * @param Feed_Entry_Adapter $entry - * @return DOMElement - */ - protected function add_item(DOMDocument $document, DOMNode $node, Feed_Entry_Adapter $entry) - { - foreach ($entry->get_content() as $content) { - $this->addContent($document, $node, $entry, $content); - } - - return; - } - - /** - * - * @param DOMDocument $document - * @param DOMNode $item - * @param Feed_Entry_Item $content - * @return Feed_XML_Interface - */ - protected function addContent(DOMDocument $document, DOMNode $node, Feed_Entry_Adapter $entry, Feed_Entry_Item $content) - { - - $preview_sd = $content->get_record()->get_subdef('preview'); - $preview_permalink = $preview_sd->get_permalink(); - $thumbnail_sd = $content->get_record()->get_thumbnail(); - $thumbnail_permalink = $thumbnail_sd->get_permalink(); - - $medium = strtolower($content->get_record()->get_type()); - - if ( ! in_array($medium, array('image', 'audio', 'video'))) { - return $this; - } - - if (! $preview_permalink || ! $thumbnail_permalink) { - return $this; - } - - //add item node to channel node - $item = $this->addTag($document, $node, 'item'); - - $caption = $content->get_record()->get_caption(); - - $title_field = $caption->get_dc_field(databox_Field_DCESAbstract::Title); - if ($title_field) { - $str_title = $title_field->get_serialized_values(' '); - } else { - $str_title = $content->get_record()->get_title(); - } - - //attach tile node to item node - $title = $this->addTag($document, $item, 'title', $str_title); - - $desc_field = $caption->get_dc_field(databox_Field_DCESAbstract::Description); - if ($desc_field) { - $str_desc = $desc_field->get_serialized_values(' '); - } else { - $str_desc = ''; - } - - //attach desc node to item node - $desc = $this->addTag($document, $item, 'description', $str_desc); - - $duration = $content->get_record()->get_duration(); - - if ($preview_permalink) { - $preview = $this->addTag($document, $item, 'media:content'); - - $preview->setAttribute('url', $preview_permalink->get_url()); - $preview->setAttribute('fileSize', $preview_sd->get_size()); - $preview->setAttribute('type', $preview_sd->get_mime()); - $preview->setAttribute('medium', $medium); - $preview->setAttribute('expression', 'full'); - $preview->setAttribute('isDefault', 'true'); - - if ($preview_sd->get_width()) - $preview->setAttribute('width', $preview_sd->get_width()); - if ($preview_sd->get_height()) - $preview->setAttribute('height', $preview_sd->get_height()); - if ($duration) - $preview->setAttribute('duration', $duration); - } - - if ($thumbnail_permalink) { - $thumbnail = $this->addTag($document, $item, 'media:thumbnail'); - - $thumbnail->setAttribute('url', $thumbnail_permalink->get_url()); - - if ($thumbnail_sd->get_width()) - $thumbnail->setAttribute('width', $thumbnail_sd->get_width()); - if ($thumbnail_sd->get_height()) - $thumbnail->setAttribute('height', $thumbnail_sd->get_height()); - - $thumbnail = $this->addTag($document, $item, 'media:content'); - - $thumbnail->setAttribute('url', $thumbnail_permalink->get_url()); - $thumbnail->setAttribute('fileSize', $thumbnail_sd->get_size()); - $thumbnail->setAttribute('type', $thumbnail_sd->get_mime()); - $thumbnail->setAttribute('medium', $medium); - $thumbnail->setAttribute('isDefault', 'false'); - - if ($thumbnail_sd->get_width()) - $thumbnail->setAttribute('width', $thumbnail_sd->get_width()); - if ($thumbnail_sd->get_height()) - $thumbnail->setAttribute('height', $thumbnail_sd->get_height()); - if ($duration) - $thumbnail->setAttribute('duration', $duration); - } - - return $this; - } -} diff --git a/lib/classes/Feed/XML/Interface.php b/lib/classes/Feed/XML/Interface.php deleted file mode 100644 index 873bed9fd0..0000000000 --- a/lib/classes/Feed/XML/Interface.php +++ /dev/null @@ -1,40 +0,0 @@ -language = $language; - - return $this; - } - - /** - * - * @param string $copyright - * @return Feed_XML_RSS - */ - public function set_copyright($copyright) - { - $this->copyright = $copyright; - - return $this; - } - - /** - * - * @param string $managingEditor - * @return Feed_XML_RSS - */ - public function set_managingEditor($managingEditor) - { - $this->managingEditor = $managingEditor; - - return $this; - } - - /** - * - * @param string $webMaster - * @return Feed_XML_RSS - */ - public function set_webMaster($webMaster) - { - $this->webMaster = $webMaster; - - return $this; - } - - /** - * - * @param DateTime $lastBuildDate - * @return Feed_XML_RSS - */ - public function set_lastBuildDate(DateTime $lastBuildDate) - { - $this->lastBuildDate = $lastBuildDate; - - return $this; - } - - /** - * - * @param string $category - * @return Feed_XML_RSS - */ - public function set_category($category) - { - $this->categories[] = $category; - - return $this; - } - - /** - * - * @param string $docs - * @return Feed_XML_RSS - */ - public function set_docs($docs) - { - $this->docs = $docs; - - return $this; - } - - /** - * - * @param int $ttl - * @return Feed_XML_RSS - */ - public function set_ttl($ttl) - { - $this->ttl = $ttl; - - return $this; - } - - /** - * - * @param Feed_XML_RSS_Image $image - * @return Feed_XML_RSS - */ - public function set_image(Feed_XML_RSS_Image $image) - { - $this->image = $image; - - return $this; - } - - /** - * - * @param string $hour - * @return Feed_XML_RSS - */ - public function set_skipHour($hour) - { - $this->skipHours[] = (int) $hour; - - return $this; - } - - /** - * - * @param string $day - * @return Feed_XML_RSS - */ - public function set_skipDays($day) - { - $this->skipDays[] = $day; - - return $this; - } - - /** - * - * @return string - */ - public function render() - { - $doc = new DOMDocument('1.0', 'UTF-8'); - $doc->formatOutput = true; - $doc->standalone = true; - - $root = $this->addTag($doc, $doc, 'rss'); - - $root->setAttribute('version', self::VERSION); - $root->setAttribute('xmlns:media', 'http://search.yahoo.com/mrss/'); - $root->setAttribute('xmlns:atom', 'http://www.w3.org/2005/Atom'); - $root->setAttribute('xmlns:dc', 'http://purl.org/dc/elements/1.1/'); - - $channel = $this->addTag($doc, $root, 'channel'); - - $this->addTag($doc, $channel, 'title', $this->title); - $this->addTag($doc, $channel, 'dc:title', $this->title); - $this->addTag($doc, $channel, 'description', $this->subtitle); - if ($this->link instanceof Feed_Link) - $this->addTag($doc, $channel, 'link', $this->link->get_href()); - - if ($this->language) - $this->addTag($doc, $channel, 'language', $this->language); - if ($this->copyright) - $this->addTag($doc, $channel, 'copyright', $this->copyright); - if ($this->managingEditor) - $this->addTag($doc, $channel, 'managingEditor', $this->managingEditor); - if ($this->webMaster) - $this->addTag($doc, $channel, 'webMaster', $this->webMaster); - if ($this->updated_on instanceof DateTime) { - $updated_on = $this->updated_on->format(DATE_RFC2822); - $this->addTag($doc, $channel, 'pubDate', $updated_on); - } - if ($this->lastBuildDate instanceof DateTime) { - $last_build = $this->lastBuildDate->format(DATE_RFC2822); - $this->addTag($doc, $channel, 'lastBuildDate', $last_build); - } - if (count($this->categories) > 0) { - foreach ($this->categories as $category) { - $this->addTag($doc, $channel, 'category', $category); - } - } - if ($this->generator) - $this->addTag($doc, $channel, 'generator', $this->generator); - if ($this->docs) - $this->addTag($doc, $channel, 'docs', $this->docs); - if ($this->ttl) - $this->addTag($doc, $channel, 'ttl', $this->ttl); - if ($this->image instanceof Feed_XML_RSS_Image) { - $image = $this->addTag($doc, $channel, 'image'); - $this->addTag($doc, $image, 'url', $this->image->get_url()); - $this->addTag($doc, $image, 'title', $this->image->get_title()); - $this->addTag($doc, $image, 'link', $this->image->get_link()); - if ($this->image->get_width()) - $this->addTag($doc, $image, 'width', $this->image->get_width()); - if ($this->image->get_height()) - $this->addTag($doc, $image, 'height', $this->image->get_height()); - if ($this->image->get_description()) - $this->addTag($doc, $image, 'description', $this->image->get_description()); - } - if (count($this->skipHours)) { - $skipHours = $this->addTag($doc, $channel, 'skipHours'); - foreach ($this->skipHours as $hour) { - $this->addTag($doc, $skipHours, 'hour', $hour); - } - } - if (count($this->skipDays) > 0) { - $skipDays = $this->addTag($doc, $channel, 'skipDays'); - foreach ($this->skipDays as $day) { - $this->addTag($doc, $skipDays, 'day', $day); - } - } - if ($this->link instanceof Feed_Link) { - $self_link = $this->addTag($doc, $channel, 'atom:link'); - $self_link->setAttribute('rel', 'self'); - $self_link->setAttribute('href', $this->link->get_href()); - } - - $this->add_navigation($doc, $channel, true); - - foreach ($this->items as $item) { - $this->add_item($doc, $channel, $item); - } - - return $doc->saveXML(); - } - - /** - * - * @param DOMDocument $document - * @param DOMNode $node - * @param Feed_Entry_Adapter $entry - * @return DOMElement - */ - protected function add_item(DOMDocument $document, DOMNode $node, Feed_Entry_Adapter $entry) - { - $item = $this->addTag($document, $node, 'item'); - - $link = $entry->get_link(); - - $this->addTag($document, $item, 'title', $entry->get_title()); - $this->addTag($document, $item, 'description', $entry->get_subtitle()); - - $author = sprintf( - '%s (%s)' - , $entry->get_author_email() - , $entry->get_author_name() - ); - $created_on = $entry->get_created_on()->format(DATE_RFC2822); - - $this->addTag($document, $item, 'author', $author); - $this->addTag($document, $item, 'pubDate', $created_on); - $this->addTag($document, $item, 'guid', $link->get_href()); - $this->addTag($document, $item, 'link', $link->get_href()); - - /** - * Missing : - * - * category Includes the item in one or more categories. More. - * comments URL of a page for comments relating to the item. More. - * enclosure Describes a media object that is attached to the item. More. - * source The RSS channel that the item came from. More. - * - */ - foreach ($entry->get_content() as $content) { - $this->addContent($document, $item, $entry, $content); - } - - return $item; - } -} diff --git a/lib/classes/patch/320f.php b/lib/classes/patch/320f.php index 933c4519d0..a0b97b4fde 100644 --- a/lib/classes/patch/320f.php +++ b/lib/classes/patch/320f.php @@ -10,6 +10,10 @@ */ use Alchemy\Phrasea\Application; +use Entities\Feed; +use Entities\FeedEntry; +use Entities\FeedItem; +use Entities\FeedPublisher; use Symfony\Component\HttpKernel\Exception\NotFoundHttpException; /** @@ -81,22 +85,31 @@ class patch_320f implements patchInterface foreach ($rs as $row) { $user = User_Adapter::getInstance($row['usr_id'], $app); - $feed = $this->get_feed($appbox, $user, $row['pub_restrict'], $row['homelink']); + $feed = $this->getFeed($appbox, $user, $row['pub_restrict'], $row['homelink'], $app); - if (! $feed instanceof Feed_Adapter) { + if (! $feed instanceof Feed) { continue; } - $publishers = $feed->get_publishers(); - $entry = Feed_Entry_Adapter::create($app, $feed, array_shift($publishers), $row['name'], $row['descript'], $user->get_display_name(), $user->get_email()); + $publishers = $feed->getPublishers(); + + $entry = new FeedEntry(); + $entry->setAuthorEmail($user->get_email()); + $entry->setAuthorName($user->get_display_name()); + $entry->setFeed($feed); + $entry->setPublisher($publishers->first()); + $entry->setTitle($row['name']); + $entry->setSubtitle($row['descript']); + $feed->addEntry($entry); + $date_create = new DateTime($row['pub_date']); if ($date_create < $date_ref) { $date_ref = $date_create; } - $entry->set_created_on($date_create); + $entry->setCreatedOn($date_create); if ($row['updater'] != '0000-00-00 00:00:00') { $date_update = new DateTime($row['updater']); - $entry->set_updated_on($date_update); + $entry->setUpdatedOn($date_update); } $sql = 'SELECT sselcont_id, ssel_id, base_id, record_id @@ -109,12 +122,20 @@ class patch_320f implements patchInterface foreach ($rs as $row) { try { $record = new record_adapter($app, phrasea::sbasFromBas($app, $row['base_id']), $row['record_id']); - $item = Feed_Entry_Item::create($appbox, $entry, $record); + $item = new FeedItem(); + $item->setEntry($entry); + $entry->addItem($item); + $item->setRecordId($record->get_record_id()); + $item->setSbasId($record->get_sbas_id()); + $item->setLastInFeedItem(); + $app['EM']->persist($item); } catch (NotFoundHttpException $e) { } } + $app['EM']->persist($entry); + $sql = 'UPDATE ssel SET deleted = "1", migrated="1" WHERE ssel_id = :ssel_id'; $stmt = $appbox->get_connection()->prepare($sql); @@ -122,15 +143,17 @@ class patch_320f implements patchInterface $stmt->closeCursor(); } $this->set_feed_dates($date_ref); + $app['EM']->persist($feed); + $app['EM']->flush(); return true; } - protected function set_feed_dates(DateTime $date_ref) + protected function setFeedDates(DateTime $date_ref) { foreach (self::$feeds as $array_feeds) { foreach ($array_feeds as $feed) { - $feed->set_created_on($date_ref); + $feed->setCreatedOn($date_ref); } } @@ -138,7 +161,7 @@ class patch_320f implements patchInterface } protected static $feeds = array(); - protected function get_feed(appbox $appbox, User_Adapter $user, $pub_restrict, $homelink) + protected function getFeed(appbox $appbox, User_Adapter $user, $pub_restrict, $homelink, Application $app) { $user_key = 'user_' . $user->get_id(); if ($homelink == '1') @@ -156,10 +179,23 @@ class patch_320f implements patchInterface else $title = $user->get_display_name() . ' - ' . 'public Feed'; - $feed = Feed_Adapter::create($app, $user, $title, ''); + $feed = new Feed(); + $publisher = new FeedPublisher(); + $feed->setTitle('title'); + $feed->setSubtitle(''); + $feed->setIconUrl(false); + $feed->addPublisher($publisher); + $publisher->setFeed($feed); + $publisher->setOwner(true); + $publisher->setUsrId($user->get_id()); if ($homelink) { - $feed->set_public(true); + $feed->setPublic(true); + + $app['EM']->persist($feed); + $app['EM']->persist($user); + $app['EM']->flush(); + } elseif ($pub_restrict == 1) { $collections = $user->ACL()->get_granted_base(); $collection = array_shift($collections); @@ -177,7 +213,7 @@ class patch_320f implements patchInterface if ( ! ($collection instanceof collection)) { return false; } - $feed->set_collection($collection); + $feed->setCollection($collection); } self::$feeds[$user_key][$feed_key] = $feed; } else { diff --git a/tests/classes/Feed/Entry/Feed_Entry_AdapterTest.php b/tests/classes/Feed/Entry/Feed_Entry_AdapterTest.php deleted file mode 100644 index d97404882f..0000000000 --- a/tests/classes/Feed/Entry/Feed_Entry_AdapterTest.php +++ /dev/null @@ -1,166 +0,0 @@ -delete(); - parent::tearDownAfterClass(); - } - - public function testGet_feed() - { - $this->assertInstanceOf('Feed_Adapter', self::$object->get_feed()); - $this->assertEquals(self::$feed->get_id(), self::$object->get_feed()->get_id()); - } - - public function testGet_id() - { - $this->assertTrue(is_int(self::$object->get_id())); - } - - public function testGet_title() - { - $this->assertEquals(self::$title, self::$object->get_title()); - } - - public function testGet_subtitle() - { - $this->assertEquals(self::$subtitle, self::$object->get_subtitle()); - } - - public function testSet_title() - { - $new_titre = 'UNnouveau titre'; - self::$object->set_title($new_titre); - $this->assertEquals($new_titre, self::$object->get_title()); - $new_titre = 'UNnouveau titre encore'; - self::$object->set_title($new_titre); - $this->assertNotEquals($new_titre, self::$object->get_title()); - $this->assertEquals(strip_tags($new_titre), self::$object->get_title()); - try { - self::$object->set_title(''); - $this->fail(); - } catch (Exception_InvalidArgument $e) { - - } - } - - public function testSet_subtitle() - { - $new_subtitle = 'PROUT - ET PROUT'; - self::$object->set_subtitle($new_subtitle); - $this->assertEquals($new_subtitle, self::$object->get_subtitle()); - $new_subtitle = ''; - self::$object->set_subtitle($new_subtitle); - $this->assertEquals($new_subtitle, self::$object->get_subtitle()); - } - - public function testSet_author_name() - { - $new_author = 'Tintin et Milou'; - self::$object->set_author_name($new_author); - $this->assertEquals($new_author, self::$object->get_author_name()); - self::$object->set_author_name(self::$author_name); - $this->assertEquals(self::$author_name, self::$object->get_author_name()); - } - - public function testSetFeed() - { - self::$DI['app']['notification.deliverer'] = $this->getMockBuilder('Alchemy\Phrasea\Notification\Deliverer') - ->disableOriginalConstructor() - ->getMock(); - - self::$DI['app']['notification.deliverer']->expects($this->atLeastOnce()) - ->method('deliver') - ->with($this->isInstanceOf('Alchemy\Phrasea\Notification\Mail\MailInfoNewPublication'), $this->equalTo(null)); - - $new_feed = Feed_Adapter::create(self::$DI['app'], self::$DI['user'], self::$feed_title, self::$feed_subtitle); - - $publisher = Feed_Publisher_Adapter::getPublisher(self::$DI['app']['phraseanet.appbox'], $new_feed, self::$DI['user']); - $entry = Feed_Entry_Adapter::create(self::$DI['app'], self::$feed, $publisher, self::$title, self::$subtitle, self::$author_name, self::$author_email); - - $this->assertEquals(self::$feed, $entry->get_feed()); - $entry->set_feed($new_feed); - $this->assertEquals($new_feed, $entry->get_feed()); - - $new_feed->delete(); - } - - public function testSet_author_email() - { - $new_email = 'Tintin@herge.be'; - self::$object->set_author_email($new_email); - $this->assertEquals($new_email, self::$object->get_author_email()); - self::$object->set_author_email(self::$author_email); - $this->assertEquals(self::$author_email, self::$object->get_author_email()); - } - - public function testGet_publisher() - { - $this->assertInstanceOf('Feed_Publisher_Adapter', self::$object->get_publisher()); - $this->assertEquals(self::$object->get_publisher()->get_user()->get_id(), self::$DI['user']->get_id()); - } - - public function testGet_created_on() - { - $this->assertInstanceOf('DateTime', self::$object->get_created_on()); - } - - public function testGet_updated_on() - { - $this->assertInstanceOf('DateTime', self::$object->get_updated_on()); - } - - public function testGet_author_name() - { - $this->assertEquals(self::$author_name, self::$object->get_author_name()); - } - - public function testGet_author_email() - { - $this->assertEquals(self::$author_email, self::$object->get_author_email()); - } - - public function testGet_content() - { - $this->assertTrue(is_array(self::$object->get_content())); - $this->assertEquals(0, count(self::$object->get_content())); - } - - public function testLoad_from_id() - { - $test_entry = Feed_Entry_Adapter::load_from_id(self::$DI['app'], self::$object->get_id()); - - $this->assertInstanceOf('Feed_Entry_Adapter', $test_entry); - $this->assertEquals(self::$object->get_id(), $test_entry->get_id()); - } -} diff --git a/tests/classes/Feed/Entry/Feed_Entry_CollectionTest.php b/tests/classes/Feed/Entry/Feed_Entry_CollectionTest.php deleted file mode 100644 index d2cd0490d7..0000000000 --- a/tests/classes/Feed/Entry/Feed_Entry_CollectionTest.php +++ /dev/null @@ -1,63 +0,0 @@ -delete(); - parent::tearDownAfterClass(); - } - - public function testAdd_entry() - { - self::$object->add_entry(self::$entry); - } - - public function testGet_entries() - { - $this->assertTrue(is_array(self::$object->get_entries())); - $this->assertTrue(count(self::$object->get_entries()) == 1); - } -} diff --git a/tests/classes/Feed/Entry/Feed_Entry_ItemTest.php b/tests/classes/Feed/Entry/Feed_Entry_ItemTest.php deleted file mode 100644 index 9ada243e7b..0000000000 --- a/tests/classes/Feed/Entry/Feed_Entry_ItemTest.php +++ /dev/null @@ -1,69 +0,0 @@ -delete(); - parent::tearDownAfterClass(); - } - - public function testGet_id() - { - $this->assertTrue(is_int(self::$object->get_id())); - } - - public function testGet_record() - { - $this->assertInstanceOf('record_adapter', self::$object->get_record()); - $this->assertEquals(self::$DI['record_1']->get_record_id(), self::$object->get_record()->get_record_id()); - $this->assertEquals(self::$DI['record_1']->get_sbas_id(), self::$object->get_record()->get_sbas_id()); - $this->assertEquals(self::$DI['record_1']->get_base_id(), self::$object->get_record()->get_base_id()); - } - - public function testGet_ord() - { - $this->assertTrue(is_int(self::$object->get_ord())); - } - - public function testGet_entry() - { - $this->assertInstanceOf('Feed_Entry_Adapter', self::$object->get_entry()); - $this->assertEquals(self::$entry->get_id(), self::$object->get_entry()->get_id()); - } -} diff --git a/tests/classes/Feed/Feed_AdapterTest.php b/tests/classes/Feed/Feed_AdapterTest.php deleted file mode 100644 index 8046b6b31a..0000000000 --- a/tests/classes/Feed/Feed_AdapterTest.php +++ /dev/null @@ -1,259 +0,0 @@ -delete(); - parent::tearDownAfterClass(); - } - - public function testGet_icon_url() - { - $this->assertEquals('/skins/icons/rss32.gif', self::$object->get_icon_url()); - } - - public function testSet_icon() - { - $this->assertEquals('/skins/icons/rss32.gif', self::$object->get_icon_url()); - $file = __DIR__ . '/../../files/p4logo.jpg'; - self::$object->set_icon($file); - $this->assertEquals('/custom/feed_' . self::$object->get_id() . '.jpg', self::$object->get_icon_url()); - } - - /** - * @expectedException \Alchemy\Phrasea\Exception\InvalidArgumentException - */ - public function testSet_iconFail() - { - $file = __DIR__ . '/../../files/unknown.jpg'; - self::$object->set_icon($file); - } - - public function testIs_aggregated() - { - $this->assertFalse(self::$object->is_aggregated()); - } - - public function testIs_owner() - { - $this->assertTrue(self::$object->is_owner(self::$DI['user'])); - } - - public function testIs_publisher() - { - $this->assertTrue(self::$object->is_publisher(self::$DI['user'])); - } - - public function testIs_public() - { - $this->assertFalse(self::$object->is_public()); - self::$object->set_public(true); - $this->assertTrue(self::$object->is_public()); - - $coll = null; - foreach (self::$DI['app']['phraseanet.appbox']->get_databoxes() as $databox) { - foreach ($databox->get_collections() as $collection) { - $coll = $collection; - break; - } - if ($coll instanceof collection) - break; - } - - self::$object->set_collection($coll); - $this->assertFalse(self::$object->is_public()); - self::$object->set_collection(null); - $this->assertTrue(self::$object->is_public()); - self::$object->set_public(false); - $this->assertFalse(self::$object->is_public()); - } - - public function testGet_publishers() - { - $publishers = self::$object->get_publishers(); - $this->assertEquals(1, count($publishers)); - } - - public function testGet_collection() - { - $this->assertNull(self::$object->get_collection()); - } - - public function testAdd_publisher() - { - self::$object->add_publisher(self::$DI['user']); - $publishers = self::$object->get_publishers(); - $this->assertEquals(1, count($publishers)); - } - - public function testGet_id() - { - $this->assertTrue(is_int(self::$object->get_id())); - $this->assertTrue(self::$object->get_id() > 0); - } - - public function testSet_collection() - { - - $coll = null; - foreach (self::$DI['app']['phraseanet.appbox']->get_databoxes() as $databox) { - foreach ($databox->get_collections() as $collection) { - $coll = $collection; - break; - } - if ($coll instanceof collection) - break; - } - - self::$object->set_collection($coll); - $this->assertInstanceOf('collection', self::$object->get_collection()); - self::$object->set_collection(null); - $this->assertNull(self::$object->get_collection()); - } - - public function testSet_public() - { - self::$object->set_collection(null); - self::$object->set_public(true); - $this->assertTrue(self::$object->is_public()); - self::$object->set_public(false); - $this->assertFalse(self::$object->is_public()); - } - - public function testSet_title() - { - $this->assertEquals(self::$title, self::$object->get_title()); - $title = 'GROS NIchONS'; - self::$object->set_title($title); - $this->assertEquals($title, self::$object->get_title()); - $title = 'GROS NIchONS'; - self::$object->set_title($title); - $this->assertNotEquals($title, self::$object->get_title()); - $this->assertEquals(strip_tags($title), self::$object->get_title()); - - try { - self::$object->set_title(' '); - $this->fail(); - } catch (Exception $e) { - - } - try { - self::$object->set_title(' '); - $this->fail(); - } catch (Exception $e) { - - } - try { - self::$object->set_title(''); - $this->fail(); - } catch (Exception $e) { - - } - - self::$object->set_title(self::$title); - } - - public function testSet_subtitle() - { - $this->assertEquals(self::$subtitle, self::$object->get_subtitle()); - self::$object->set_subtitle(''); - - $this->assertEquals('', self::$object->get_subtitle()); - self::$object->set_subtitle(' un sous titre '); - $this->assertEquals(' un sous titre ', self::$object->get_subtitle()); - self::$object->set_subtitle(self::$subtitle); - $this->assertEquals(self::$subtitle, self::$object->get_subtitle()); - } - - public function testLoad_with_user() - { - $this->assertEquals(Feed_Adapter::load_with_user(self::$DI['app'], self::$DI['user'], self::$object->get_id())->get_id(), self::$object->get_id()); - } - - public function testGet_count_total_entries() - { - $n = self::$object->get_count_total_entries(); - $this->assertTrue($n === 0); - } - - public function testGet_entries() - { - $entries_coll = self::$object->get_entries(0, 5); - - $this->assertInstanceOf('Feed_Entry_Collection', $entries_coll); - $this->assertEquals(0, count($entries_coll->get_entries())); - } - - public function testGet_homepage_link() - { - self::$object->set_public(false); - $link = self::$object->get_homepage_link(self::$DI['app']['phraseanet.registry'], Feed_Adapter::FORMAT_ATOM); - $this->assertNull($link); - - self::$object->set_public(true); - $link = self::$object->get_homepage_link(self::$DI['app']['phraseanet.registry'], Feed_Adapter::FORMAT_ATOM); - $this->assertInstanceOf('Feed_Link', $link); - } - - public function testGet_user_link() - { - $link = self::$object->get_user_link(self::$DI['app']['phraseanet.registry'], self::$DI['user'], Feed_Adapter::FORMAT_ATOM); - $supposed = '/feeds\/userfeed\/([a-zA-Z0-9]{12})\/' . self::$object->get_id() . '\/atom\//'; - - $atom = $link->get_href(); - - $this->assertRegExp($supposed, str_replace(self::$DI['app']['phraseanet.registry']->get('GV_ServerName'), '', $atom)); - $this->assertEquals($atom, self::$object->get_user_link(self::$DI['app']['phraseanet.registry'], self::$DI['user'], Feed_Adapter::FORMAT_ATOM)->get_href()); - $this->assertEquals($atom, self::$object->get_user_link(self::$DI['app']['phraseanet.registry'], self::$DI['user'], Feed_Adapter::FORMAT_ATOM)->get_href()); - - $this->assertNotEquals($atom, self::$object->get_user_link(self::$DI['app']['phraseanet.registry'], self::$DI['user'], Feed_Adapter::FORMAT_ATOM, null, true)->get_href()); - - $link = self::$object->get_user_link(self::$DI['app']['phraseanet.registry'], self::$DI['user'], Feed_Adapter::FORMAT_RSS); - $supposed = '/feeds\/userfeed\/([a-zA-Z0-9]{12})\/' . self::$object->get_id() . '\/rss\//'; - $this->assertRegExp($supposed, str_replace(self::$DI['app']['phraseanet.registry']->get('GV_ServerName'), '', $link->get_href())); - } - - public function testGet_title() - { - $this->assertEquals(self::$object->get_title(), self::$title); - try { - self::$object->set_title(''); - $this->fail(); - } catch (Exception $e) { - - } - } - - public function testGet_subtitle() - { - $this->assertEquals(self::$object->get_subtitle(), self::$subtitle); - self::$object->set_subtitle(''); - $this->assertEquals(self::$object->get_subtitle(), ''); - self::$object->set_subtitle(self::$subtitle); - } - - public function testGet_created_on() - { - $this->assertInstanceOf('DateTime', self::$object->get_created_on()); - } - - public function testGet_updated_on() - { - $this->assertInstanceOf('DateTime', self::$object->get_updated_on()); - } -} diff --git a/tests/classes/Feed/Feed_AggregateTest.php b/tests/classes/Feed/Feed_AggregateTest.php deleted file mode 100644 index 16e846b588..0000000000 --- a/tests/classes/Feed/Feed_AggregateTest.php +++ /dev/null @@ -1,87 +0,0 @@ -delete(); - } - parent::tearDownAfterClass(); - } - - public function testGet_icon_url() - { - $this->assertEquals('/skins/icons/rss32.gif', self::$object->get_icon_url()); - } - - public function testIs_aggregated() - { - $this->assertTrue(self::$object->is_aggregated()); - } - - public function testGet_entries() - { - $entries_coll = self::$object->get_entries(0, 5); - $this->assertInstanceOf('Feed_Entry_Collection', $entries_coll); - $this->assertEquals(0, count($entries_coll->get_entries())); - } - - public function testGet_count_total_entries() - { - $this->assertEquals(0, self::$object->get_count_total_entries()); - } - - public function testGet_homepage_link() - { - $link = self::$object->get_homepage_link(self::$DI['app']['phraseanet.registry'], Feed_Adapter::FORMAT_ATOM); - $this->assertInstanceOf('Feed_Link', $link); - $this->assertEquals(self::$DI['app']['phraseanet.registry']->get('GV_ServerName') . 'feeds/aggregated/atom/', $link->get_href()); - } - - public function testGet_user_link() - { - $link = self::$object->get_user_link(self::$DI['app']['phraseanet.registry'], self::$DI['user'], Feed_Adapter::FORMAT_ATOM); - $supposed = '/feeds\/userfeed\/aggregated\/([a-zA-Z0-9]{12})\/atom\//'; - - $atom = $link->get_href(); - - $this->assertRegExp($supposed, str_replace(self::$DI['app']['phraseanet.registry']->get('GV_ServerName'), '', $atom)); - $this->assertEquals($atom, self::$object->get_user_link(self::$DI['app']['phraseanet.registry'], self::$DI['user'], Feed_Adapter::FORMAT_ATOM)->get_href()); - $this->assertEquals($atom, self::$object->get_user_link(self::$DI['app']['phraseanet.registry'], self::$DI['user'], Feed_Adapter::FORMAT_ATOM)->get_href()); - - $this->assertNotEquals($atom, self::$object->get_user_link(self::$DI['app']['phraseanet.registry'], self::$DI['user'], Feed_Adapter::FORMAT_ATOM, null, true)->get_href()); - - $link = self::$object->get_user_link(self::$DI['app']['phraseanet.registry'], self::$DI['user'], Feed_Adapter::FORMAT_RSS); - $supposed = '/feeds\/userfeed\/aggregated\/([a-zA-Z0-9]{12})\/rss\//'; - $this->assertRegExp($supposed, str_replace(self::$DI['app']['phraseanet.registry']->get('GV_ServerName'), '', $link->get_href())); - } - - public function testGet_created_on() - { - $this->assertInstanceOf('DateTime', self::$object->get_created_on()); - } - - public function testGet_updated_on() - { - $this->assertInstanceOf('DateTime', self::$object->get_updated_on()); - } -} diff --git a/tests/classes/Feed/Feed_CollectionTest.php b/tests/classes/Feed/Feed_CollectionTest.php deleted file mode 100644 index 265b51c60d..0000000000 --- a/tests/classes/Feed/Feed_CollectionTest.php +++ /dev/null @@ -1,59 +0,0 @@ -set_public(true); - } - - public static function tearDownAfterClass() - { - self::$object->delete(); - parent::tearDownAfterClass(); - } - - public function testLoad_all() - { - $coll = Feed_Collection::load_all(self::$DI['app'], self::$DI['user']); - - foreach ($coll->get_feeds() as $feed) { - $this->assertInstanceOf('Feed_Adapter', $feed); - } - } - - public function testGet_feeds() - { - $coll = Feed_Collection::load_public_feeds(self::$DI['app']); - - foreach ($coll->get_feeds() as $feed) { - $this->assertInstanceOf('Feed_Adapter', $feed); - } - } - - public function testGet_aggregate() - { - $coll = Feed_Collection::load_public_feeds(self::$DI['app']); - - $this->assertInstanceOf('Feed_Aggregate', $coll->get_aggregate()); - } - - public function testLoad_public_feeds() - { - $coll = Feed_Collection::load_public_feeds(self::$DI['app']); - - foreach ($coll->get_feeds() as $feed) { - $this->assertTrue($feed->is_public()); - } - } -} diff --git a/tests/classes/Feed/Feed_LinkTest.php b/tests/classes/Feed/Feed_LinkTest.php deleted file mode 100644 index 33c0f5a9ba..0000000000 --- a/tests/classes/Feed/Feed_LinkTest.php +++ /dev/null @@ -1,33 +0,0 @@ -object = new Feed_Link($this->href, $this->title, $this->mime); - } - - public function testGet_mimetype() - { - $this->assertEquals($this->mime, $this->object->get_mimetype()); - } - - public function testGet_title() - { - $this->assertEquals($this->title, $this->object->get_title()); - } - - public function testGet_href() - { - $this->assertEquals($this->href, $this->object->get_href()); - } -} diff --git a/tests/classes/Feed/Publisher/Feed_Publisher_AdapterTest.php b/tests/classes/Feed/Publisher/Feed_Publisher_AdapterTest.php deleted file mode 100644 index 286298a52a..0000000000 --- a/tests/classes/Feed/Publisher/Feed_Publisher_AdapterTest.php +++ /dev/null @@ -1,57 +0,0 @@ -get_publishers(); - self::$object = array_pop($publishers); - } - - public static function tearDownAfterClass() - { - self::$feed->delete(); - parent::tearDownAfterClass(); - } - - public function testGet_user() - { - $this->assertInstanceOf('user_Adapter', self::$object->get_user()); - $this->assertEquals(self::$DI['user']->get_id(), self::$object->get_user()->get_id()); - } - - public function testIs_owner() - { - $this->assertTrue(self::$object->is_owner()); - } - - public function testGet_created_on() - { - $this->assertInstanceOf('DateTime', self::$object->get_created_on()); - } - - public function testGet_added_by() - { - $this->assertInstanceOf('User_Adapter', self::$object->get_added_by()); - } - - public function testGet_id() - { - $this->assertTrue(is_int(self::$object->get_id())); - } -} diff --git a/tests/classes/Feed/XML/Feed_XML_AtomTest.php b/tests/classes/Feed/XML/Feed_XML_AtomTest.php deleted file mode 100644 index eae6ee8ba4..0000000000 --- a/tests/classes/Feed/XML/Feed_XML_AtomTest.php +++ /dev/null @@ -1,209 +0,0 @@ -render()); - $this->assertInstanceOf('SimpleXMLElement', $sxe); - } - - public function testSet_author_name() - { - self::$atom->set_author_name('boulbil'); - $sxe = simplexml_load_string(self::$atom->render()); - $this->assertInstanceOf('SimpleXMLElement', $sxe); - $this->assertEquals('boulbil', (string) $sxe->author->name); - - self::$atom->set_author_name('boubi bouba'); - $sxe = simplexml_load_string(self::$atom->render()); - $this->assertInstanceOf('SimpleXMLElement', $sxe); - $this->assertEquals('boubi bouba', (string) $sxe->author->name); - } - - public function testSet_author_email() - { - self::$atom->set_author_email('bouba@example.net'); - $sxe = simplexml_load_string(self::$atom->render()); - $this->assertInstanceOf('SimpleXMLElement', $sxe); - $this->assertEquals('bouba@example.net', (string) $sxe->author->email); - - self::$atom->set_author_email('email+test@example.org'); - $sxe = simplexml_load_string(self::$atom->render()); - $this->assertInstanceOf('SimpleXMLElement', $sxe); - $this->assertEquals('email+test@example.org', (string) $sxe->author->email); - } - - public function testSet_author_url() - { - self::$atom->set_author_url('http://example.net/'); - $sxe = simplexml_load_string(self::$atom->render()); - $this->assertInstanceOf('SimpleXMLElement', $sxe); - $this->assertEquals('http://example.net/', (string) $sxe->author->uri); - } - - public function testSet_title() - { - $title = 'Un joli titre'; - self::$atom->set_title($title); - self::$atom->set_title($title); - - $xml = self::$atom->render(); - $sxe = simplexml_load_string($xml); - $namespaces = $sxe->getDocNamespaces(); - $sxe->registerXPathNamespace('__empty_ns', $namespaces['']); - $this->assertInstanceOf('SimpleXMLElement', $sxe); - $obj = $sxe->xpath('/__empty_ns:feed/__empty_ns:title'); - - $this->assertEquals(1, count($obj)); - - $this->assertEquals($title, (string) $obj[0]); - } - - public function testSet_updated_on() - { - $date_obj = new DateTime(); - self::$atom->set_updated_on($date_obj); - - $sxe = simplexml_load_string(self::$atom->render()); - $this->assertInstanceOf('SimpleXMLElement', $sxe); - $this->assertEquals($date_obj->format(DATE_ATOM), (string) $sxe->updated); - } - - public function testSet_subtitle() - { - $subtitle = 'Lorem ipsum dolor sit amet, consectetur adipisicing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam, quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo consequat. Duis aute irure dolor in reprehenderit in voluptate velit esse cillum dolore eu fugiat nulla pariatur. Excepteur sint occaecat cupidatat non proident, sunt in culpa qui officia deserunt mollit anim id est laborum.'; - self::$atom->set_subtitle($subtitle); - self::$atom->set_subtitle($subtitle); - - $xml = self::$atom->render(); - $sxe = simplexml_load_string($xml); - $namespaces = $sxe->getDocNamespaces(); - $sxe->registerXPathNamespace('__empty_ns', $namespaces['']); - $this->assertInstanceOf('SimpleXMLElement', $sxe); - $obj = $sxe->xpath('/__empty_ns:feed/__empty_ns:subtitle'); - - $this->assertEquals(1, count($obj)); - - $this->assertEquals($subtitle, (string) $obj[0]); - } - - public function testSet_link() - { - $href = 'http://www.example.org/?page=24'; - $current_page = new Feed_Link($href, 'example next page', 'application/atom+xml'); - self::$atom->set_link($current_page); - self::$atom->set_link($current_page); - - $xml = self::$atom->render(); - $sxe = simplexml_load_string($xml); - $namespaces = $sxe->getDocNamespaces(); - $sxe->registerXPathNamespace('__empty_ns', $namespaces['']); - $this->assertInstanceOf('SimpleXMLElement', $sxe); - $obj = $sxe->xpath('/__empty_ns:feed/__empty_ns:link[@rel="self"]'); - - $this->assertEquals(1, count($obj)); - $found = false; - - foreach ($obj[0]->attributes() as $attr => $attr_value) { - if ($attr != 'href') - continue; - $found = true; - $this->assertEquals($href, (string) $attr_value); - } - - if ( ! $found) - $this->fail(); - } - - public function testSet_next_page() - { - $href = 'http://www.example.org/?page=23'; - $next_page = new Feed_Link($href, 'example next page', 'application/atom+xml'); - self::$atom->set_next_page($next_page); - self::$atom->set_next_page($next_page); - - $xml = self::$atom->render(); - $sxe = simplexml_load_string($xml); - $namespaces = $sxe->getDocNamespaces(); - $sxe->registerXPathNamespace('__empty_ns', $namespaces['']); - $this->assertInstanceOf('SimpleXMLElement', $sxe); - $obj = $sxe->xpath('/__empty_ns:feed/__empty_ns:link[@rel="next"]'); - - $this->assertEquals(1, count($obj)); - $found = false; - - foreach ($obj[0]->attributes() as $attr => $attr_value) { - if ($attr != 'href') - continue; - $found = true; - $this->assertEquals($href, (string) $attr_value); - } - - if ( ! $found) - $this->fail(); - } - - public function testSet_previous_page() - { - $href = 'http://www.example.org/?page=25'; - $prev_page = new Feed_Link($href, 'example next page', 'application/atom+xml'); - self::$atom->set_previous_page($prev_page); - self::$atom->set_previous_page($prev_page); - - $xml = self::$atom->render(); - $sxe = simplexml_load_string($xml); - $namespaces = $sxe->getDocNamespaces(); - $sxe->registerXPathNamespace('__empty_ns', $namespaces['']); - $this->assertInstanceOf('SimpleXMLElement', $sxe); - $obj = $sxe->xpath('/__empty_ns:feed/__empty_ns:link[@rel="previous"]'); - - $this->assertEquals(1, count($obj)); - $found = false; - - foreach ($obj[0]->attributes() as $attr => $attr_value) { - if ($attr != 'href') - continue; - $found = true; - $this->assertEquals($href, (string) $attr_value); - } - - if ( ! $found) - $this->fail(); - } - - public function testSet_generator() - { - $generator = 'Arnold Schwarzenegger'; - self::$atom->set_generator($generator); - self::$atom->set_generator($generator); - - $xml = self::$atom->render(); - $sxe = simplexml_load_string($xml); - $namespaces = $sxe->getDocNamespaces(); - $sxe->registerXPathNamespace('__empty_ns', $namespaces['']); - $this->assertInstanceOf('SimpleXMLElement', $sxe); - $obj = $sxe->xpath('/__empty_ns:feed/__empty_ns:generator'); - - $this->assertEquals(1, count($obj)); - - $this->assertEquals($generator, (string) $obj[0]); - } - - public function testGet_mimetype() - { - $this->assertEquals('application/atom+xml', self::$atom->get_mimetype()); - } -} diff --git a/tests/classes/Feed/XML/Feed_XML_RSSTest.php b/tests/classes/Feed/XML/Feed_XML_RSSTest.php deleted file mode 100644 index 5b1e5541be..0000000000 --- a/tests/classes/Feed/XML/Feed_XML_RSSTest.php +++ /dev/null @@ -1,189 +0,0 @@ -set_language($language); - - $xml = self::$rss->render(); - $sxe = simplexml_load_string($xml); - $this->assertInstanceOf('SimpleXMLElement', $sxe); - $this->assertEquals($language, (string) $sxe->channel->language); - } - - public function testSet_copyright() - { - $copyright = '2006-2014 No copyright'; - self::$rss->set_copyright($copyright); - - $xml = self::$rss->render(); - $sxe = simplexml_load_string($xml); - $this->assertInstanceOf('SimpleXMLElement', $sxe); - $this->assertEquals($copyright, (string) $sxe->channel->copyright); - } - - public function testSet_managingEditor() - { - $email = 'manager@example.org'; - self::$rss->set_managingEditor($email); - - $xml = self::$rss->render(); - $sxe = simplexml_load_string($xml); - $this->assertInstanceOf('SimpleXMLElement', $sxe); - $this->assertEquals($email, (string) $sxe->channel->managingEditor); - } - - public function testSet_webMaster() - { - $email = 'webmaster@example.org'; - self::$rss->set_webMaster($email); - - $xml = self::$rss->render(); - $sxe = simplexml_load_string($xml); - $this->assertInstanceOf('SimpleXMLElement', $sxe); - $this->assertEquals($email, (string) $sxe->channel->webMaster); - } - - public function testSet_lastBuildDate() - { - $last_build = new DateTime('-2 hours'); - self::$rss->set_lastBuildDate($last_build); - - $xml = self::$rss->render(); - $sxe = simplexml_load_string($xml); - $this->assertInstanceOf('SimpleXMLElement', $sxe); - $this->assertEquals($last_build->format(DATE_RFC2822), (string) $sxe->channel->lastBuildDate); - } - - public function testSet_category() - { - $categories = array('banana' => 'banana', 'prout' => 'prout'); - foreach ($categories as $category) { - self::$rss->set_category($category); - } - - $xml = self::$rss->render(); - $sxe = simplexml_load_string($xml); - $this->assertInstanceOf('SimpleXMLElement', $sxe); - - $cat_objs = $sxe->xpath('//channel/category'); - $this->assertEquals(count($cat_objs), count($categories)); - - foreach ($cat_objs as $cat_obj) { - $str_cat = (string) $cat_obj; - $this->assertArrayHasKey($str_cat, $categories); - unset($categories[$str_cat]); - } - - $this->assertTrue((count($categories) === 0)); - } - - public function testSet_docs() - { - $xml = self::$rss->render(); - $sxe = simplexml_load_string($xml); - $this->assertInstanceOf('SimpleXMLElement', $sxe); - - $this->assertEquals('http://blogs.law.harvard.edu/tech/rss', (string) $sxe->channel->docs); - - self::$rss->set_docs('http://www.example.org'); - $xml = self::$rss->render(); - $sxe = simplexml_load_string($xml); - $this->assertInstanceOf('SimpleXMLElement', $sxe); - - $this->assertEquals('http://www.example.org', (string) $sxe->channel->docs); - } - - public function testSet_ttl() - { - self::$rss->set_ttl(240); - $xml = self::$rss->render(); - $sxe = simplexml_load_string($xml); - $this->assertInstanceOf('SimpleXMLElement', $sxe); - - $this->assertEquals(240, (string) $sxe->channel->ttl); - } - - public function testSet_image() - { - $link = 'http://www.example.org'; - $title = 'Un beau titre'; - $url = 'http://www.example.org/image.jpg'; - $image = new Feed_XML_RSS_Image($url, $title, $link); - $width = 42; - $height = 30; - $description = 'KIKOO'; - $image->set_width($width); - $image->set_height($height); - $image->set_description($description); - - self::$rss->set_image($image); - $xml = self::$rss->render(); - $sxe = simplexml_load_string($xml); - $this->assertInstanceOf('SimpleXMLElement', $sxe); - - $this->assertEquals($title, (string) $sxe->channel->image->title); - $this->assertEquals($link, (string) $sxe->channel->image->link); - $this->assertEquals($url, (string) $sxe->channel->image->url); - $this->assertEquals($height, (string) $sxe->channel->image->height); - $this->assertEquals($width, (string) $sxe->channel->image->width); - $this->assertEquals($description, (string) $sxe->channel->image->description); - } - - public function testSet_skipHours() - { - $hours = array('4' => '4', '8' => '8', '12' => '12'); - foreach ($hours as $hour) { - self::$rss->set_skipHour($hour); - } - $xml = self::$rss->render(); - $sxe = simplexml_load_string($xml); - $this->assertInstanceOf('SimpleXMLElement', $sxe); - - foreach ($sxe->channel->skipHours->hour as $sx_hour) { - $sx_hour = (string) $sx_hour; - $this->assertArrayHasKey($sx_hour, $hours); - unset($hours[$sx_hour]); - } - - $this->assertTrue(empty($hours)); - } - - public function testSet_skipDays() - { - $days = array('sunday' => 'sunday', 'saturday' => 'saturday', 'monday' => 'monday'); - foreach ($days as $day) { - self::$rss->set_skipDays($day); - } - $xml = self::$rss->render(); - $sxe = simplexml_load_string($xml); - $this->assertInstanceOf('SimpleXMLElement', $sxe); - - foreach ($sxe->channel->skipDays->day as $sx_day) { - $sx_day = (string) $sx_day; - $this->assertArrayHasKey($sx_day, $days); - unset($days[$sx_day]); - } - - $this->assertTrue(empty($days)); - } - - public function testRender() - { - $sxe = simplexml_load_string(self::$rss->render()); - $this->assertInstanceOf('SimpleXMLElement', $sxe); - } -} diff --git a/tests/classes/Feed/XML/RSS/Feed_XML_RSS_ImageTest.php b/tests/classes/Feed/XML/RSS/Feed_XML_RSS_ImageTest.php deleted file mode 100644 index 7f8a76ac51..0000000000 --- a/tests/classes/Feed/XML/RSS/Feed_XML_RSS_ImageTest.php +++ /dev/null @@ -1,81 +0,0 @@ -link = 'http://www.example.org'; - $this->title = 'Un beau titre'; - $this->url = 'http://www.example.org/image.jpg'; - $this->width = 42; - $this->height = 30; - $this->description = 'KIKOO'; - $this->object = new Feed_XML_RSS_Image($this->url, $this->title, $this->link); - $this->object->set_width($this->width); - $this->object->set_height($this->height); - $this->object->set_description($this->description); - } - - public function testGet_url() - { - $this->assertEquals($this->url, $this->object->get_url()); - } - - public function testGet_title() - { - $this->assertEquals($this->title, $this->object->get_title()); - } - - public function testGet_link() - { - $this->assertEquals($this->link, $this->object->get_link()); - } - - public function testGet_description() - { - $this->assertEquals($this->description, $this->object->get_description()); - } - - public function testGet_height() - { - $this->assertEquals($this->height, $this->object->get_height()); - } - - public function testGet_width() - { - $this->assertEquals($this->width, $this->object->get_width()); - } - - public function testSet_description() - { - $new_desc = 'une nouvelle'; - $this->object->set_description($new_desc); - $this->assertEquals($new_desc, $this->object->get_description()); - } - - public function testSet_height() - { - $new_height = 27; - $this->object->set_height($new_height); - $this->assertEquals($new_height, $this->object->get_height()); - } - - public function testSet_width() - { - $new_width = 14; - $this->object->set_width($new_width); - $this->assertEquals($new_width, $this->object->get_width()); - } -} From ff40015c97b1f9a865a16f48a778ad76267e1e82 Mon Sep 17 00:00:00 2001 From: Andrey Date: Mon, 17 Jun 2013 18:24:13 +0200 Subject: [PATCH 20/67] Updated bridgetest --- tests/Alchemy/Tests/Phrasea/Controller/Prod/BridgeTest.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/tests/Alchemy/Tests/Phrasea/Controller/Prod/BridgeTest.php b/tests/Alchemy/Tests/Phrasea/Controller/Prod/BridgeTest.php index 80351c9789..268d644212 100644 --- a/tests/Alchemy/Tests/Phrasea/Controller/Prod/BridgeTest.php +++ b/tests/Alchemy/Tests/Phrasea/Controller/Prod/BridgeTest.php @@ -76,7 +76,7 @@ class BridgeApplication extends \PhraseanetWebTestCaseAuthenticatedAbstract $crawler ->filter('div') ->reduce(function ($crawler, $i) use ($phpunit) { - if (!$crawler->attr('class')) { + if (!$crawler->hasAttribute('class')) { return false; } elseif ($node->getAttribute('class') == 'error_auth') { $phpunit->fail("Erreur callback"); @@ -101,7 +101,7 @@ class BridgeApplication extends \PhraseanetWebTestCaseAuthenticatedAbstract $crawler ->filter('div') ->reduce(function ($crawler, $i) use ($phpunit) { - if (!$crawler->attr('class')) { + if (!$crawler->hasAttribute('class')) { return false; } elseif ($node->getAttribute('class') == 'error_auth') { $phpunit->fail("Erreur callback"); From 56a8aa33f847aa417082c92fe3d65423fdcf0c7c Mon Sep 17 00:00:00 2001 From: Andrey Date: Mon, 17 Jun 2013 18:36:06 +0200 Subject: [PATCH 21/67] Updated patch 302f --- lib/classes/patch/320f.php | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/lib/classes/patch/320f.php b/lib/classes/patch/320f.php index a0b97b4fde..54f20f220b 100644 --- a/lib/classes/patch/320f.php +++ b/lib/classes/patch/320f.php @@ -85,7 +85,7 @@ class patch_320f implements patchInterface foreach ($rs as $row) { $user = User_Adapter::getInstance($row['usr_id'], $app); - $feed = $this->getFeed($appbox, $user, $row['pub_restrict'], $row['homelink'], $app); + $feed = $this->get_feed($appbox, $user, $row['pub_restrict'], $row['homelink'], $app); if (! $feed instanceof Feed) { continue; @@ -149,7 +149,7 @@ class patch_320f implements patchInterface return true; } - protected function setFeedDates(DateTime $date_ref) + protected function set_feed_dates(DateTime $date_ref) { foreach (self::$feeds as $array_feeds) { foreach ($array_feeds as $feed) { @@ -161,7 +161,7 @@ class patch_320f implements patchInterface } protected static $feeds = array(); - protected function getFeed(appbox $appbox, User_Adapter $user, $pub_restrict, $homelink, Application $app) + protected function get_feed(appbox $appbox, User_Adapter $user, $pub_restrict, $homelink, Application $app) { $user_key = 'user_' . $user->get_id(); if ($homelink == '1') From d40a6c0a0de41be0b2f9c83cacb402a2ae99e926 Mon Sep 17 00:00:00 2001 From: Andrey Date: Tue, 18 Jun 2013 09:36:46 +0200 Subject: [PATCH 22/67] Fixed feed error in patch 320f --- lib/classes/patch/320f.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/classes/patch/320f.php b/lib/classes/patch/320f.php index 54f20f220b..cf2ead259e 100644 --- a/lib/classes/patch/320f.php +++ b/lib/classes/patch/320f.php @@ -141,9 +141,9 @@ class patch_320f implements patchInterface $stmt = $appbox->get_connection()->prepare($sql); $stmt->execute(array(':ssel_id' => $row['ssel_id'])); $stmt->closeCursor(); + $app['EM']->persist($feed); } $this->set_feed_dates($date_ref); - $app['EM']->persist($feed); $app['EM']->flush(); return true; From 082de0b7ceb12e112b0623a0ea09945099a5abe7 Mon Sep 17 00:00:00 2001 From: Andrey Date: Tue, 18 Jun 2013 10:00:12 +0200 Subject: [PATCH 23/67] Reversed modifications in bridge test --- tests/Alchemy/Tests/Phrasea/Controller/Prod/BridgeTest.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/tests/Alchemy/Tests/Phrasea/Controller/Prod/BridgeTest.php b/tests/Alchemy/Tests/Phrasea/Controller/Prod/BridgeTest.php index 268d644212..80351c9789 100644 --- a/tests/Alchemy/Tests/Phrasea/Controller/Prod/BridgeTest.php +++ b/tests/Alchemy/Tests/Phrasea/Controller/Prod/BridgeTest.php @@ -76,7 +76,7 @@ class BridgeApplication extends \PhraseanetWebTestCaseAuthenticatedAbstract $crawler ->filter('div') ->reduce(function ($crawler, $i) use ($phpunit) { - if (!$crawler->hasAttribute('class')) { + if (!$crawler->attr('class')) { return false; } elseif ($node->getAttribute('class') == 'error_auth') { $phpunit->fail("Erreur callback"); @@ -101,7 +101,7 @@ class BridgeApplication extends \PhraseanetWebTestCaseAuthenticatedAbstract $crawler ->filter('div') ->reduce(function ($crawler, $i) use ($phpunit) { - if (!$crawler->hasAttribute('class')) { + if (!$crawler->attr('class')) { return false; } elseif ($node->getAttribute('class') == 'error_auth') { $phpunit->fail("Erreur callback"); From c8b62c02db03587803148ff4a7748e59429d5d87 Mon Sep 17 00:00:00 2001 From: Andrey Date: Tue, 18 Jun 2013 11:16:32 +0200 Subject: [PATCH 24/67] Rebased, fixed codestyle --- lib/Alchemy/Phrasea/Controller/Prod/Feed.php | 1 - lib/Alchemy/Phrasea/Controller/Prod/Root.php | 1 - .../Phrasea/Controller/Root/RSSFeeds.php | 2 -- .../Core/Provider/FeedServiceProvider.php | 1 + lib/Alchemy/Phrasea/Feed/Aggregate.php | 2 ++ lib/Alchemy/Phrasea/Feed/AggregateToken.php | 10 +++----- .../Phrasea/Feed/Formatter/AtomFormatter.php | 5 ++-- .../Feed/Formatter/CoolirisFormatter.php | 5 ++-- .../Feed/Formatter/FeedFormatterAbstract.php | 6 ++--- .../Feed/Formatter/FeedFormatterInterface.php | 4 +-- .../Phrasea/Feed/Formatter/RssFormatter.php | 5 ++-- .../Feed/Link/AggregateLinkGenerator.php | 4 +++ lib/Alchemy/Phrasea/Feed/Link/FeedLink.php | 6 ++--- .../Phrasea/Feed/Link/FeedLinkGenerator.php | 1 + .../Feed/Link/LinkGeneratorInterface.php | 12 ++++----- lib/Alchemy/Phrasea/Feed/RSS/Image.php | 14 +++++------ .../Phrasea/Feed/RSS/ImageInterface.php | 2 +- .../SearchEngine/SearchEngineInterface.php | 6 ++--- lib/Doctrine/Entities/AggregateToken.php | 19 ++++++-------- lib/Doctrine/Entities/Feed.php | 25 ++++++++++--------- lib/Doctrine/Entities/FeedEntry.php | 20 +++++++-------- lib/Doctrine/Entities/FeedItem.php | 13 +++++----- lib/Doctrine/Entities/FeedPublisher.php | 11 +++----- lib/Doctrine/Entities/FeedToken.php | 10 +++----- .../Repositories/AggregateTokenRepository.php | 1 - .../Repositories/SessionRepository.php | 2 +- lib/classes/API/V1/adapter.php | 8 +++--- .../PhraseaFixture/Feed/LoadOneFeed.php | 3 +-- 28 files changed, 91 insertions(+), 108 deletions(-) diff --git a/lib/Alchemy/Phrasea/Controller/Prod/Feed.php b/lib/Alchemy/Phrasea/Controller/Prod/Feed.php index f2542bda14..16eb2a3342 100644 --- a/lib/Alchemy/Phrasea/Controller/Prod/Feed.php +++ b/lib/Alchemy/Phrasea/Controller/Prod/Feed.php @@ -22,7 +22,6 @@ use Silex\ControllerProviderInterface; use Symfony\Component\HttpFoundation\Request; use Symfony\Component\HttpFoundation\Response; use Symfony\Component\HttpKernel\Exception\AccessDeniedHttpException; -use Symfony\Component\HttpKernel\Exception\NotFoundHttpException; /** * diff --git a/lib/Alchemy/Phrasea/Controller/Prod/Root.php b/lib/Alchemy/Phrasea/Controller/Prod/Root.php index 39222da584..68ecbe102d 100644 --- a/lib/Alchemy/Phrasea/Controller/Prod/Root.php +++ b/lib/Alchemy/Phrasea/Controller/Prod/Root.php @@ -11,7 +11,6 @@ namespace Alchemy\Phrasea\Controller\Prod; -use Alchemy\Phrasea\Feed\Aggregate; use Alchemy\Phrasea\Application; use Alchemy\Phrasea\Exception\SessionNotFound; use Silex\Application as SilexApplication; diff --git a/lib/Alchemy/Phrasea/Controller/Root/RSSFeeds.php b/lib/Alchemy/Phrasea/Controller/Root/RSSFeeds.php index b824393765..ac282593c5 100644 --- a/lib/Alchemy/Phrasea/Controller/Root/RSSFeeds.php +++ b/lib/Alchemy/Phrasea/Controller/Root/RSSFeeds.php @@ -13,7 +13,6 @@ namespace Alchemy\Phrasea\Controller\Root; use Entities\Feed; use Alchemy\Phrasea\Feed\Aggregate; -use Symfony\Component\HttpFoundation\Response; use Silex\Application; use Silex\ControllerProviderInterface; @@ -111,7 +110,6 @@ class RSSFeeds implements ControllerProviderInterface $page = (int) $request->query->get('page'); $page = $page < 1 ? 1 : $page; - return $app['feed.formatter-strategy']('cooliris')->createResponse($feed, $page, null, 'Phraseanet', $app); }) ->bind('feed_public_cooliris'); diff --git a/lib/Alchemy/Phrasea/Core/Provider/FeedServiceProvider.php b/lib/Alchemy/Phrasea/Core/Provider/FeedServiceProvider.php index d2331677c6..f3efe87e6f 100644 --- a/lib/Alchemy/Phrasea/Core/Provider/FeedServiceProvider.php +++ b/lib/Alchemy/Phrasea/Core/Provider/FeedServiceProvider.php @@ -34,6 +34,7 @@ class FeedServiceProvider implements ServiceProviderInterface $collection = new LinkGeneratorCollection(); $collection->pushGenerator($app['feed.user-link-generator']); $collection->pushGenerator($app['feed.aggregate-link-generator']); + return $collection; }); $app['feed.rss-formatter'] = $app->share(function($app) { diff --git a/lib/Alchemy/Phrasea/Feed/Aggregate.php b/lib/Alchemy/Phrasea/Feed/Aggregate.php index 99e25756a0..133e66e5c8 100644 --- a/lib/Alchemy/Phrasea/Feed/Aggregate.php +++ b/lib/Alchemy/Phrasea/Feed/Aggregate.php @@ -83,6 +83,7 @@ class Aggregate implements FeedInterface if (count($this->feeds) == 0) { return null; } + return $this->em->getRepository('Entities\FeedEntry')->findByFeeds($this->feeds, $offset_start, $how_many); } @@ -131,6 +132,7 @@ class Aggregate implements FeedInterface if (count($this->feeds) > 0) { return count($this->em->getRepository('Entities\FeedEntry')->findByFeeds($this->feeds)); } + return 0; } diff --git a/lib/Alchemy/Phrasea/Feed/AggregateToken.php b/lib/Alchemy/Phrasea/Feed/AggregateToken.php index d19c4f807d..3034d7017e 100644 --- a/lib/Alchemy/Phrasea/Feed/AggregateToken.php +++ b/lib/Alchemy/Phrasea/Feed/AggregateToken.php @@ -2,8 +2,6 @@ namespace Alchemy\Phrasea\Feed; -use Doctrine\ORM\Mapping as ORM; - /** * FeedToken */ @@ -24,7 +22,6 @@ class AggregateToken */ private $feed; - /** * Get id * @@ -38,7 +35,7 @@ class AggregateToken /** * Set usr_id * - * @param integer $usrId + * @param integer $usrId * @return FeedToken */ public function setUsrId($usrId) @@ -61,7 +58,7 @@ class AggregateToken /** * Set feed * - * @param \Entities\Feed $feed + * @param \Entities\Feed $feed * @return FeedToken */ public function setFeed(\Entities\Feed $feed = null) @@ -85,11 +82,10 @@ class AggregateToken */ private $value; - /** * Set value * - * @param string $value + * @param string $value * @return FeedToken */ public function setValue($value) diff --git a/lib/Alchemy/Phrasea/Feed/Formatter/AtomFormatter.php b/lib/Alchemy/Phrasea/Feed/Formatter/AtomFormatter.php index c81a6d70a7..6d6c834fc0 100644 --- a/lib/Alchemy/Phrasea/Feed/Formatter/AtomFormatter.php +++ b/lib/Alchemy/Phrasea/Feed/Formatter/AtomFormatter.php @@ -32,6 +32,7 @@ class AtomFormatter extends FeedFormatterAbstract implements FeedFormatterInterf $content = $this->format($feed, $page, $user, $generator); $response = new Response($content, 200, array('Content-Type' => 'application/atom+xml')); $response->setCharset('UTF-8'); + return $response; } @@ -76,8 +77,7 @@ class AtomFormatter extends FeedFormatterAbstract implements FeedFormatterInterf if (null !== $user) { $feedlink = $this->linkGenerator->generate($feed, $user, static::FORMAT, $page); - } - else { + } else { $feedlink = $this->linkGenerator->generatePublic($feed, static::FORMAT, $page); } @@ -156,4 +156,3 @@ class AtomFormatter extends FeedFormatterAbstract implements FeedFormatterInterf return $entry_node; } } - diff --git a/lib/Alchemy/Phrasea/Feed/Formatter/CoolirisFormatter.php b/lib/Alchemy/Phrasea/Feed/Formatter/CoolirisFormatter.php index 821f6be729..ef0a830c18 100644 --- a/lib/Alchemy/Phrasea/Feed/Formatter/CoolirisFormatter.php +++ b/lib/Alchemy/Phrasea/Feed/Formatter/CoolirisFormatter.php @@ -33,6 +33,7 @@ class CoolirisFormatter extends FeedFormatterAbstract implements FeedFormatterIn $content = $this->format($feed, $page, $user, $generator, $app); $response = new Response($content, 200, array('Content-Type' => 'application/rss+xml')); $response->setCharset('UTF-8'); + return $response; } @@ -61,8 +62,7 @@ class CoolirisFormatter extends FeedFormatterAbstract implements FeedFormatterIn if (null !== $user) { $link = $this->linkGenerator->generate($feed, $user, static::FORMAT, $page); - } - else { + } else { $link = $this->linkGenerator->generatePublic($feed, static::FORMAT, $page); } @@ -265,4 +265,3 @@ class CoolirisFormatter extends FeedFormatterAbstract implements FeedFormatterIn return $this; } } - diff --git a/lib/Alchemy/Phrasea/Feed/Formatter/FeedFormatterAbstract.php b/lib/Alchemy/Phrasea/Feed/Formatter/FeedFormatterAbstract.php index 3f87da30cb..a2a6b6ca2c 100644 --- a/lib/Alchemy/Phrasea/Feed/Formatter/FeedFormatterAbstract.php +++ b/lib/Alchemy/Phrasea/Feed/Formatter/FeedFormatterAbstract.php @@ -38,9 +38,9 @@ abstract class FeedFormatterAbstract /** * - * @param DOMDocument $document - * @param DOMNode $item - * @param FeedItem $content + * @param DOMDocument $document + * @param DOMNode $item + * @param FeedItem $content * @return FeedFormaterInterface */ protected function addContent(Application $app, \DOMDocument $document, \DOMNode $item, FeedItem $content) diff --git a/lib/Alchemy/Phrasea/Feed/Formatter/FeedFormatterInterface.php b/lib/Alchemy/Phrasea/Feed/Formatter/FeedFormatterInterface.php index a028f73333..7b7c4daf33 100644 --- a/lib/Alchemy/Phrasea/Feed/Formatter/FeedFormatterInterface.php +++ b/lib/Alchemy/Phrasea/Feed/Formatter/FeedFormatterInterface.php @@ -10,9 +10,9 @@ interface FeedFormatterInterface * Returns a string representation of the feed * * @param FeedInterface $feed - * @param type $page + * @param type $page * @param \User_Adapter $user - * @param type $generator + * @param type $generator * * @return string */ diff --git a/lib/Alchemy/Phrasea/Feed/Formatter/RssFormatter.php b/lib/Alchemy/Phrasea/Feed/Formatter/RssFormatter.php index d67b0f9d94..561df325c2 100644 --- a/lib/Alchemy/Phrasea/Feed/Formatter/RssFormatter.php +++ b/lib/Alchemy/Phrasea/Feed/Formatter/RssFormatter.php @@ -34,6 +34,7 @@ class RssFormatter extends FeedFormatterAbstract implements FeedFormatterInterfa $content = $this->format($feed, $page, $user, $generator); $response = new Response($content, 200, array('Content-Type' => 'application/rss+xml')); $response->setCharset('UTF-8'); + return $response; } @@ -64,8 +65,7 @@ class RssFormatter extends FeedFormatterAbstract implements FeedFormatterInterfa if (null !== $user) { $link = $this->linkGenerator->generate($feed, $user, static::FORMAT, $page); - } - else { + } else { $link = $this->linkGenerator->generatePublic($feed, static::FORMAT, $page); } @@ -203,4 +203,3 @@ class RssFormatter extends FeedFormatterAbstract implements FeedFormatterInterfa return $item; } } - diff --git a/lib/Alchemy/Phrasea/Feed/Link/AggregateLinkGenerator.php b/lib/Alchemy/Phrasea/Feed/Link/AggregateLinkGenerator.php index 22afd10a2e..93ff9ca774 100644 --- a/lib/Alchemy/Phrasea/Feed/Link/AggregateLinkGenerator.php +++ b/lib/Alchemy/Phrasea/Feed/Link/AggregateLinkGenerator.php @@ -38,6 +38,7 @@ class AggregateLinkGenerator implements LinkGeneratorInterface if (null !== $page) { $params['page'] = $page; } + return new FeedLink( $this->generator->generate('feed_user_aggregated', $params, UrlGenerator::ABSOLUTE_URL), sprintf('%s - %s', $aggregate->getTitle(), 'Atom'), @@ -50,6 +51,7 @@ class AggregateLinkGenerator implements LinkGeneratorInterface if (null !== $page) { $params['page'] = $page; } + return new FeedLink( $this->generator->generate('feed_user_aggregated', $params, UrlGenerator::ABSOLUTE_URL), sprintf('%s - %s', $aggregate->getTitle(), 'RSS'), @@ -78,6 +80,7 @@ class AggregateLinkGenerator implements LinkGeneratorInterface if (null !== $page) { $params['page'] = $page; } + return new FeedLink( $this->generator->generate('feed_public_aggregated', $params, UrlGenerator::ABSOLUTE_URL), sprintf('%s - %s', $aggregate->getTitle(), 'Atom'), @@ -89,6 +92,7 @@ class AggregateLinkGenerator implements LinkGeneratorInterface if (null !== $page) { $params['page'] = $page; } + return new FeedLink( $this->generator->generate('feed_public_aggregated', $params, UrlGenerator::ABSOLUTE_URL), sprintf('%s - %s', $aggregate->getTitle(), 'RSS'), diff --git a/lib/Alchemy/Phrasea/Feed/Link/FeedLink.php b/lib/Alchemy/Phrasea/Feed/Link/FeedLink.php index 3d55b2c562..9845e19c98 100644 --- a/lib/Alchemy/Phrasea/Feed/Link/FeedLink.php +++ b/lib/Alchemy/Phrasea/Feed/Link/FeedLink.php @@ -29,9 +29,9 @@ class FeedLink implements FeedLinkInterface protected $uri; /** - * @param string $uri - * @param string $title - * @param string $mimetype + * @param string $uri + * @param string $title + * @param string $mimetype * * @return FeedLink */ diff --git a/lib/Alchemy/Phrasea/Feed/Link/FeedLinkGenerator.php b/lib/Alchemy/Phrasea/Feed/Link/FeedLinkGenerator.php index aed7972f5d..9eb0267de6 100644 --- a/lib/Alchemy/Phrasea/Feed/Link/FeedLinkGenerator.php +++ b/lib/Alchemy/Phrasea/Feed/Link/FeedLinkGenerator.php @@ -62,6 +62,7 @@ class FeedLinkGenerator implements LinkGeneratorInterface if (null !== $page) { $params['page'] = $page; } + return new FeedLink( $this->generator->generate('feed_user', $params, UrlGenerator::ABSOLUTE_URL), sprintf('%s - %s', $feed->getTitle(), 'RSS'), diff --git a/lib/Alchemy/Phrasea/Feed/Link/LinkGeneratorInterface.php b/lib/Alchemy/Phrasea/Feed/Link/LinkGeneratorInterface.php index b701f0dcae..65d9be33ec 100644 --- a/lib/Alchemy/Phrasea/Feed/Link/LinkGeneratorInterface.php +++ b/lib/Alchemy/Phrasea/Feed/Link/LinkGeneratorInterface.php @@ -9,10 +9,10 @@ interface LinkGeneratorInterface /** * * @param \Alchemy\Phrasea\Feed\FeedInterface $feed - * @param \User_Adapter $user - * @param type $format - * @param type $page - * @param type $renew + * @param \User_Adapter $user + * @param type $format + * @param type $page + * @param type $renew * * @throws InvalidArgumentException */ @@ -21,8 +21,8 @@ interface LinkGeneratorInterface /** * * @param \Alchemy\Phrasea\Feed\FeedInterface $feed - * @param type $format - * @param type $page + * @param type $format + * @param type $page * * @throws InvalidArgumentException */ diff --git a/lib/Alchemy/Phrasea/Feed/RSS/Image.php b/lib/Alchemy/Phrasea/Feed/RSS/Image.php index 008d01b048..15c30c2184 100644 --- a/lib/Alchemy/Phrasea/Feed/RSS/Image.php +++ b/lib/Alchemy/Phrasea/Feed/RSS/Image.php @@ -17,7 +17,7 @@ namespace Alchemy\Phrasea\Feed\RSS; * @license http://opensource.org/licenses/gpl-3.0 GPLv3 * @link www.phraseanet.com */ -class FeedRSSImage implements FeedRSSImageInterface +class Image implements FeedRSSImageInterface { /** * @@ -57,9 +57,9 @@ class FeedRSSImage implements FeedRSSImageInterface /** * - * @param string $url - * @param string $title - * @param string $link + * @param string $url + * @param string $title + * @param string $link * @return FeedRSSImage */ public function __construct($url, $title, $link) @@ -73,7 +73,7 @@ class FeedRSSImage implements FeedRSSImageInterface /** * - * @param type $description + * @param type $description * @return FeedRSSImage */ public function setDescription($description) @@ -85,7 +85,7 @@ class FeedRSSImage implements FeedRSSImageInterface /** * - * @param int $width + * @param int $width * @return FeedRSSImage */ public function setWidth($width) @@ -97,7 +97,7 @@ class FeedRSSImage implements FeedRSSImageInterface /** * - * @param int $height + * @param int $height * @return FeedRSSImage */ public function setHeight($height) diff --git a/lib/Alchemy/Phrasea/Feed/RSS/ImageInterface.php b/lib/Alchemy/Phrasea/Feed/RSS/ImageInterface.php index be6e0ce799..35298e48cd 100644 --- a/lib/Alchemy/Phrasea/Feed/RSS/ImageInterface.php +++ b/lib/Alchemy/Phrasea/Feed/RSS/ImageInterface.php @@ -17,7 +17,7 @@ namespace Alchemy\Phrasea\Feed\RSS; * @license http://opensource.org/licenses/gpl-3.0 GPLv3 * @link www.phraseanet.com */ -interface FeedXMLRSSImageInterface +interface ImageInterface { public function __construct($url, $title, $link); diff --git a/lib/Alchemy/Phrasea/SearchEngine/SearchEngineInterface.php b/lib/Alchemy/Phrasea/SearchEngine/SearchEngineInterface.php index d47e551c13..c2277d71dd 100644 --- a/lib/Alchemy/Phrasea/SearchEngine/SearchEngineInterface.php +++ b/lib/Alchemy/Phrasea/SearchEngine/SearchEngineInterface.php @@ -132,7 +132,7 @@ interface SearchEngineInterface /** * Add an entry to index * - * @param FeedEntry $entry + * @param FeedEntry $entry * @return SearchEngineInterface * @throws RuntimeException */ @@ -141,7 +141,7 @@ interface SearchEngineInterface /** * Remove an entry to index * - * @param FeedEntry $entry + * @param FeedEntry $entry * @return SearchEngineInterface * @throws RuntimeException */ @@ -150,7 +150,7 @@ interface SearchEngineInterface /** * Update an entry in the index * - * @param FeedEntry $entry + * @param FeedEntry $entry * @return SearchEngineInterface * @throws RuntimeException */ diff --git a/lib/Doctrine/Entities/AggregateToken.php b/lib/Doctrine/Entities/AggregateToken.php index 85f9493da0..3b92c2db1b 100644 --- a/lib/Doctrine/Entities/AggregateToken.php +++ b/lib/Doctrine/Entities/AggregateToken.php @@ -2,8 +2,6 @@ namespace Entities; -use Doctrine\ORM\Mapping as ORM; - /** * AggregateToken */ @@ -24,11 +22,10 @@ class AggregateToken */ private $value; - /** * Get id * - * @return integer + * @return integer */ public function getId() { @@ -38,20 +35,20 @@ class AggregateToken /** * Set usr_id * - * @param integer $usrId + * @param integer $usrId * @return AggregateToken */ public function setUsrId($usrId) { $this->usr_id = $usrId; - + return $this; } /** * Get usr_id * - * @return integer + * @return integer */ public function getUsrId() { @@ -61,23 +58,23 @@ class AggregateToken /** * Set value * - * @param string $value + * @param string $value * @return AggregateToken */ public function setValue($value) { $this->value = $value; - + return $this; } /** * Get value * - * @return string + * @return string */ public function getValue() { return $this->value; } -} \ No newline at end of file +} diff --git a/lib/Doctrine/Entities/Feed.php b/lib/Doctrine/Entities/Feed.php index 8c778d02f6..09dcd16b37 100644 --- a/lib/Doctrine/Entities/Feed.php +++ b/lib/Doctrine/Entities/Feed.php @@ -4,7 +4,6 @@ namespace Entities; use Alchemy\Phrasea\Application; use Alchemy\Phrasea\Feed\FeedInterface; -use Doctrine\ORM\Mapping as ORM; /** * Feed @@ -88,7 +87,7 @@ class Feed implements FeedInterface /** * Set public * - * @param boolean $public + * @param boolean $public * @return Feed */ public function setIsPublic($public) @@ -111,7 +110,7 @@ class Feed implements FeedInterface /** * Set icon_url * - * @param boolean $iconUrl + * @param boolean $iconUrl * @return Feed */ public function setIconUrl($iconUrl) @@ -134,7 +133,7 @@ class Feed implements FeedInterface /** * Set base_id * - * @param integer $baseId + * @param integer $baseId * @return Feed */ public function setBaseId($baseId) @@ -157,7 +156,7 @@ class Feed implements FeedInterface /** * Set title * - * @param string $title + * @param string $title * @return Feed */ public function setTitle($title) @@ -180,7 +179,7 @@ class Feed implements FeedInterface /** * Add publishers * - * @param \Entities\FeedPublisher $publishers + * @param \Entities\FeedPublisher $publishers * @return Feed */ public function addPublisher(\Entities\FeedPublisher $publishers) @@ -213,7 +212,7 @@ class Feed implements FeedInterface /** * Add entries * - * @param \Entities\FeedEntry $entries + * @param \Entities\FeedEntry $entries * @return Feed */ public function addEntry(\Entities\FeedEntry $entries) @@ -243,6 +242,7 @@ class Feed implements FeedInterface if (null === $how_many) { return $this->entries; } + return $this->entries->slice($offset_start, $how_many); } @@ -276,6 +276,7 @@ class Feed implements FeedInterface { if ($collection === null) { $this->base_id = null; + return; } $this->base_id = $collection->get_base_id(); @@ -284,7 +285,7 @@ class Feed implements FeedInterface /** * Set created_on * - * @param \DateTime $createdOn + * @param \DateTime $createdOn * @return Feed */ public function setCreatedOn($createdOn) @@ -307,7 +308,7 @@ class Feed implements FeedInterface /** * Set updated_on * - * @param \DateTime $updatedOn + * @param \DateTime $updatedOn * @return Feed */ public function setUpdatedOn($updatedOn) @@ -352,7 +353,7 @@ class Feed implements FeedInterface /** * Set subtitle * - * @param string $subtitle + * @param string $subtitle * @return Feed */ public function setSubtitle($subtitle) @@ -394,7 +395,7 @@ class Feed implements FeedInterface /** * Add tokens * - * @param \Entities\FeedToken $tokens + * @param \Entities\FeedToken $tokens * @return Feed */ public function addToken(\Entities\FeedToken $tokens) @@ -427,7 +428,7 @@ class Feed implements FeedInterface /** * Add entries * - * @param \Entities\FeedEntry $entries + * @param \Entities\FeedEntry $entries * @return Feed */ public function addEntrie(\Entities\FeedEntry $entries) diff --git a/lib/Doctrine/Entities/FeedEntry.php b/lib/Doctrine/Entities/FeedEntry.php index 81ffb1dc36..5592db4b1d 100644 --- a/lib/Doctrine/Entities/FeedEntry.php +++ b/lib/Doctrine/Entities/FeedEntry.php @@ -2,8 +2,6 @@ namespace Entities; -use Doctrine\ORM\Mapping as ORM; - /** * FeedEntry */ @@ -80,7 +78,7 @@ class FeedEntry /** * Set title * - * @param string $title + * @param string $title * @return FeedEntry */ public function setTitle($title) @@ -103,7 +101,7 @@ class FeedEntry /** * Set subtitle * - * @param string $subtitle + * @param string $subtitle * @return FeedEntry */ public function setSubtitle($subtitle) @@ -126,7 +124,7 @@ class FeedEntry /** * Set author_name * - * @param string $authorName + * @param string $authorName * @return FeedEntry */ public function setAuthorName($authorName) @@ -149,7 +147,7 @@ class FeedEntry /** * Set author_email * - * @param string $authorEmail + * @param string $authorEmail * @return FeedEntry */ public function setAuthorEmail($authorEmail) @@ -172,7 +170,7 @@ class FeedEntry /** * Set created * - * @param \DateTime $createdOn + * @param \DateTime $createdOn * @return FeedEntry */ public function setCreatedOn($createdOn) @@ -195,7 +193,7 @@ class FeedEntry /** * Set updated * - * @param \DateTime $updated + * @param \DateTime $updated * @return FeedEntry */ public function setUpdatedOn($updatedOn) @@ -218,7 +216,7 @@ class FeedEntry /** * Add items * - * @param \Entities\FeedItem $items + * @param \Entities\FeedItem $items * @return FeedEntry */ public function addItem(\Entities\FeedItem $items) @@ -251,7 +249,7 @@ class FeedEntry /** * Set publisher * - * @param \Entities\FeedPublisher $publisher + * @param \Entities\FeedPublisher $publisher * @return FeedEntry */ public function setPublisher(\Entities\FeedPublisher $publisher = null) @@ -274,7 +272,7 @@ class FeedEntry /** * Set feed * - * @param \Entities\Feed $feed + * @param \Entities\Feed $feed * @return FeedEntry */ public function setFeed(\Entities\Feed $feed = null) diff --git a/lib/Doctrine/Entities/FeedItem.php b/lib/Doctrine/Entities/FeedItem.php index 552660728f..6faa693113 100644 --- a/lib/Doctrine/Entities/FeedItem.php +++ b/lib/Doctrine/Entities/FeedItem.php @@ -52,7 +52,7 @@ class FeedItem /** * Set record_id * - * @param integer $recordId + * @param integer $recordId * @return FeedItem */ public function setRecordId($recordId) @@ -75,7 +75,7 @@ class FeedItem /** * Set sbas_id * - * @param integer $sbasId + * @param integer $sbasId * @return FeedItem */ public function setSbasId($sbasId) @@ -98,7 +98,7 @@ class FeedItem /** * Set entry * - * @param \Entities\FeedEntry $entry + * @param \Entities\FeedEntry $entry * @return FeedItem */ public function setEntry(\Entities\FeedEntry $entry = null) @@ -122,11 +122,10 @@ class FeedItem */ private $ord; - /** * Set ord * - * @param integer $ord + * @param integer $ord * @return FeedItem */ public function setOrd($ord) @@ -149,7 +148,7 @@ class FeedItem /** * Set created_on * - * @param \DateTime $createdOn + * @param \DateTime $createdOn * @return FeedItem */ public function setCreatedOn($createdOn) @@ -172,7 +171,7 @@ class FeedItem /** * Set updated_on * - * @param \DateTime $updatedOn + * @param \DateTime $updatedOn * @return FeedItem */ public function setUpdatedOn($updatedOn) diff --git a/lib/Doctrine/Entities/FeedPublisher.php b/lib/Doctrine/Entities/FeedPublisher.php index ea72984973..2cd8d4bf89 100644 --- a/lib/Doctrine/Entities/FeedPublisher.php +++ b/lib/Doctrine/Entities/FeedPublisher.php @@ -3,7 +3,6 @@ namespace Entities; use Alchemy\Phrasea\Application; -use Doctrine\ORM\Mapping as ORM; /** * FeedPublisher @@ -35,7 +34,6 @@ class FeedPublisher */ private $feed; - /** * Get id * @@ -49,7 +47,7 @@ class FeedPublisher /** * Set usr_id * - * @param integer $usrId + * @param integer $usrId * @return FeedPublisher */ public function setUsrId($usrId) @@ -72,7 +70,7 @@ class FeedPublisher /** * Set owner * - * @param boolean $owner + * @param boolean $owner * @return FeedPublisher */ public function setIsOwner($owner) @@ -95,7 +93,7 @@ class FeedPublisher /** * Set feed * - * @param \Entities\Feed $feed + * @param \Entities\Feed $feed * @return FeedPublisher */ public function setFeed(\Entities\Feed $feed = null) @@ -115,7 +113,6 @@ class FeedPublisher return $this->feed; } - /** * Get user * @@ -131,7 +128,7 @@ class FeedPublisher /** * Set created_on * - * @param \DateTime $createdOn + * @param \DateTime $createdOn * @return FeedPublisher */ public function setCreatedOn($createdOn) diff --git a/lib/Doctrine/Entities/FeedToken.php b/lib/Doctrine/Entities/FeedToken.php index 7b84961c92..ff34d1b8c3 100644 --- a/lib/Doctrine/Entities/FeedToken.php +++ b/lib/Doctrine/Entities/FeedToken.php @@ -2,8 +2,6 @@ namespace Entities; -use Doctrine\ORM\Mapping as ORM; - class FeedToken { /** @@ -21,7 +19,6 @@ class FeedToken */ private $feed; - /** * Get id * @@ -35,7 +32,7 @@ class FeedToken /** * Set usr_id * - * @param integer $usrId + * @param integer $usrId * @return FeedToken */ public function setUsrId($usrId) @@ -58,7 +55,7 @@ class FeedToken /** * Set feed * - * @param \Entities\Feed $feed + * @param \Entities\Feed $feed * @return FeedToken */ public function setFeed(\Entities\Feed $feed = null) @@ -82,11 +79,10 @@ class FeedToken */ private $value; - /** * Set value * - * @param string $value + * @param string $value * @return FeedToken */ public function setValue($value) diff --git a/lib/Doctrine/Repositories/AggregateTokenRepository.php b/lib/Doctrine/Repositories/AggregateTokenRepository.php index a12579fabc..dd99abba02 100644 --- a/lib/Doctrine/Repositories/AggregateTokenRepository.php +++ b/lib/Doctrine/Repositories/AggregateTokenRepository.php @@ -3,7 +3,6 @@ namespace Repositories; use Doctrine\ORM\EntityRepository; -use Entities\Feed; /** * AggregateTokenRepository diff --git a/lib/Doctrine/Repositories/SessionRepository.php b/lib/Doctrine/Repositories/SessionRepository.php index 129b7d6d93..f0c44306d5 100644 --- a/lib/Doctrine/Repositories/SessionRepository.php +++ b/lib/Doctrine/Repositories/SessionRepository.php @@ -16,7 +16,7 @@ class SessionRepository extends EntityRepository /** * - * @param User_Adapter $user + * @param User_Adapter $user * @return \Doctrine\Common\Collections\Collection */ public function getAllForUser(\User_Adapter $user) diff --git a/lib/classes/API/V1/adapter.php b/lib/classes/API/V1/adapter.php index 92e4bbbf2b..b8359fd1b4 100644 --- a/lib/classes/API/V1/adapter.php +++ b/lib/classes/API/V1/adapter.php @@ -1583,8 +1583,8 @@ class API_V1_adapter extends API_V1_Abstract /** * Retrieve detailled informations about one feed * - * @param Feed $feed - * @param type $user + * @param Feed $feed + * @param type $user * @return array */ protected function list_publication(Feed $feed, $user) @@ -1607,8 +1607,8 @@ class API_V1_adapter extends API_V1_Abstract * Retrieve all entries of one feed * * @param FeedInterface $feed - * @param int $offset_start - * @param int $how_many + * @param int $offset_start + * @param int $how_many * @return array */ protected function list_publications_entries(FeedInterface $feed, $offset_start = 0, $how_many = 5) diff --git a/lib/conf.d/PhraseaFixture/Feed/LoadOneFeed.php b/lib/conf.d/PhraseaFixture/Feed/LoadOneFeed.php index dcdd8a97fc..c45fd6615e 100644 --- a/lib/conf.d/PhraseaFixture/Feed/LoadOneFeed.php +++ b/lib/conf.d/PhraseaFixture/Feed/LoadOneFeed.php @@ -43,8 +43,7 @@ class LoadOneFeed extends AbstractFixture implements FixtureInterface $feed->addPublisher($publisher); if (isset($this->title) && $this->title !== null) { $feed->setTitle($this->title); - } - else { + } else { $feed->setTitle("test"); } From 1764d5f5c4de44e2d2f496edbfaf2dbd09fabaee Mon Sep 17 00:00:00 2001 From: Andrey Date: Wed, 19 Jun 2013 16:09:31 +0200 Subject: [PATCH 25/67] Fixed order in entry/update, fixed a lot of codestyle --- .../Phrasea/Controller/Admin/Publications.php | 42 ++--- lib/Alchemy/Phrasea/Controller/Prod/Feed.php | 107 +++++++------ lib/Alchemy/Phrasea/Controller/Prod/Root.php | 3 + .../Phrasea/Controller/Root/RSSFeeds.php | 15 +- lib/Alchemy/Phrasea/Feed/Aggregate.php | 143 ++++++++++++++---- lib/Alchemy/Phrasea/Feed/AggregateToken.php | 41 ++--- lib/Alchemy/Phrasea/Feed/FeedInterface.php | 46 ++++++ .../Phrasea/Feed/Formatter/AtomFormatter.php | 46 +++--- .../Feed/Formatter/CoolirisFormatter.php | 67 ++++---- .../Feed/Formatter/FeedFormatterAbstract.php | 47 +++--- .../Feed/Formatter/FeedFormatterInterface.php | 28 +++- .../Phrasea/Feed/Formatter/RssFormatter.php | 33 ++-- .../Feed/Link/AggregateLinkGenerator.php | 31 +++- lib/Alchemy/Phrasea/Feed/Link/FeedLink.php | 14 +- .../Phrasea/Feed/Link/FeedLinkGenerator.php | 48 ++++-- .../Phrasea/Feed/Link/FeedLinkInterface.php | 6 + .../Feed/Link/LinkGeneratorCollection.php | 14 ++ .../Feed/Link/LinkGeneratorInterface.php | 29 +++- lib/Doctrine/Entities/Feed.php | 73 ++++++++- lib/Doctrine/Entities/FeedEntry.php | 17 ++- lib/Doctrine/Entities/FeedItem.php | 10 ++ lib/Doctrine/Entities/FeedPublisher.php | 2 +- .../Repositories/AggregateTokenRepository.php | 8 + .../Repositories/FeedTokenRepository.php | 9 ++ .../Repositories/OrderElementRepository.php | 23 ++- .../Repositories/SessionRepository.php | 2 +- .../Repositories/UserSettingRepository.php | 32 ++-- lib/classes/patch/320f.php | 9 +- templates/web/prod/index.html.twig | 6 +- .../Controller/Admin/PublicationTest.php | 6 +- .../Phrasea/Controller/Prod/FeedTest.php | 68 ++++++++- 31 files changed, 719 insertions(+), 306 deletions(-) diff --git a/lib/Alchemy/Phrasea/Controller/Admin/Publications.php b/lib/Alchemy/Phrasea/Controller/Admin/Publications.php index e19bf9d6df..afc5520f9a 100644 --- a/lib/Alchemy/Phrasea/Controller/Admin/Publications.php +++ b/lib/Alchemy/Phrasea/Controller/Admin/Publications.php @@ -48,6 +48,10 @@ class Publications implements ControllerProviderInterface $controllers->post('/create/', function(PhraseaApplication $app, Request $request) { + if ('' === $title = trim($request->request->get('title', ''))) { + $app->abort(400, "Bad request"); + } + $publisher = new FeedPublisher(); $feed = new Feed(); @@ -57,9 +61,8 @@ class Publications implements ControllerProviderInterface $publisher->setIsOwner(true); $feed->addPublisher($publisher); - $feed->setTitle($request->request->get('title')); - $feed->setSubtitle($request->request->get('subtitle')); - $feed->setIconUrl(false); + $feed->setTitle($title); + $feed->setSubtitle($request->request->get('subtitle', '')); if ($request->request->get('public') == '1') { $feed->setIsPublic(true); @@ -88,6 +91,10 @@ class Publications implements ControllerProviderInterface $controllers->post('/feed/{id}/update/', function(PhraseaApplication $app, Request $request, $id) { + if ('' === $title = trim($request->request->get('title', ''))) { + $app->abort(400, "Bad request"); + } + $feed = $app["EM"]->find('Entities\Feed', $id); try { @@ -95,14 +102,10 @@ class Publications implements ControllerProviderInterface } catch (\Exception $e) { $collection = null; } - if (null !== $title = $request->request->get('title')) { - $feed->setTitle($title); - } - if (null !== $subtitle = $request->request->get('subtitle')) { - $feed->setSubtitle($subtitle); - } + $feed->setTitle($title); + $feed->setSubtitle($request->request->get('subtitle', '')); $feed->setCollection($collection); - $feed->setIsPublic($request->request->get('public') === '1' ? true : false); + $feed->setIsPublic('1' === $request->request->get('public')); $app['EM']->persist($feed); $app['EM']->flush(); @@ -110,7 +113,7 @@ class Publications implements ControllerProviderInterface })->before(function(Request $request) use ($app) { $feed = $app["EM"]->find('Entities\Feed', $request->attributes->get('id')); - if (!$feed->getOwner($app['authentication']->getUser())) { + if (!$feed->isOwner($app['authentication']->getUser())) { return $app->redirectPath('admin_feeds_feed', array('id' => $request->attributes->get('id'), 'error' => _('You are not the owner of this feed, you can not edit it'))); } }) @@ -176,16 +179,14 @@ class Publications implements ControllerProviderInterface $app['EM']->persist($feed); $app['EM']->flush(); - $baseDir = realpath(__DIR__ . '/../../../../../'); - - $app['filesystem']->copy($tmpname, $baseDir . '/config/feed_' . $feed->getId() . '.jpg'); + $app['filesystem']->copy($tmpname, $app['root.path'] . '/config/feed_' . $feed->getId() . '.jpg'); $app['filesystem']->copy($tmpname, 'custom/feed_' . $feed->getId() . '.jpg'); $app['filesystem']->remove($tmpname); $datas['success'] = true; } catch (\Exception $e) { - $datas['message'] = _('Unable to add file to Phraseanet') . $e->getMessage(); + $datas['message'] = _('Unable to add file to Phraseanet'); } return $app->json($datas); @@ -202,7 +203,6 @@ class Publications implements ControllerProviderInterface $publisher = new FeedPublisher(); $publisher->setUsrId($user->get_id()); - $publisher->setIsOwner(false); $publisher->setFeed($feed); $feed->addPublisher($publisher); @@ -232,7 +232,7 @@ class Publications implements ControllerProviderInterface } $user = $publisher->getUser($app); - if ($feed->isPublisher($user) === true && $feed->isOwner($user) === false) { + if ($feed->isPublisher($user) && false === $feed->isOwner($user)) { $feed->removePublisher($publisher); $app['EM']->remove($publisher); @@ -249,10 +249,12 @@ class Publications implements ControllerProviderInterface $controllers->post('/feed/{id}/delete/', function(PhraseaApplication $app, $id) { $feed = $app["EM"]->find('Entities\Feed', $id); - $publishers = $feed->getPublishers(); - foreach ($publishers as $publisher) { - $app['EM']->remove($publisher); + + if (true === $feed->getIconURL()) { + unlink($app['root.path'] . '/config/feed_' . $feed->getId() . '.jpg'); + unlink('custom/feed_' . $feed->getId() . '.jpg'); } + $app['EM']->remove($feed); $app['EM']->flush(); diff --git a/lib/Alchemy/Phrasea/Controller/Prod/Feed.php b/lib/Alchemy/Phrasea/Controller/Prod/Feed.php index 16eb2a3342..9929a05e00 100644 --- a/lib/Alchemy/Phrasea/Controller/Prod/Feed.php +++ b/lib/Alchemy/Phrasea/Controller/Prod/Feed.php @@ -53,46 +53,50 @@ class Feed implements ControllerProviderInterface * I've selected a publication for my docs, let's publish them */ $controllers->post('/entry/create/', function(Application $app, Request $request) { - try { - $feed = $app['EM']->getRepository('Entities\Feed')->find($request->request->get('feed_id')); - $publisher = $app['EM']->getRepository('Entities\FeedPublisher')->findByUser($feed, $app['authentication']->getUser()); - $title = $request->request->get('title'); - $subtitle = $request->request->get('subtitle'); - $author_name = $request->request->get('author_name'); - $author_email = $request->request->get('author_mail'); + $feed = $app['EM']->getRepository('Entities\Feed')->find($request->request->get('feed_id')); - $entry = new FeedEntry(); - $entry->setFeed($feed); - $entry->setPublisher($publisher); - $entry->setTitle($title); - $entry->setSubtitle($subtitle); - $entry->setAuthorName($author_name); - $entry->setAuthorEmail($author_email); - - $feed->addEntry($entry); - - $publishing = RecordsRequest::fromRequest($app, $request, true, array(), array('bas_chupub')); - foreach ($publishing as $record) { - $item = new FeedItem(); - $item->setEntry($entry); - $item->setRecordId($record->get_record_id()); - $item->setSbasId($record->get_sbas_id()); - $item->setLastInFeedItem(); - $entry->addItem($item); - $app['EM']->persist($item); - } - - $app['EM']->persist($entry); - $app['EM']->persist($feed); - $app['EM']->flush(); - - $app['events-manager']->trigger('__FEED_ENTRY_CREATE__', array('entry_id' => $entry->getId()), $entry); - - $datas = array('error' => false, 'message' => false); - } catch (\Exception $e) { - $datas = array('error' => true, 'message' => _('An error occured'), 'details' => $e->getMessage()); + if (null === $feed) { + $app->abort(404, "Feed not found"); } + $publisher = $app['EM']->getRepository('Entities\FeedPublisher')->findByUser($feed, $app['authentication']->getUser()); + + if ('' === $title = trim($request->request->get('title', ''))) { + $app->abort(400, "Bad request"); + } + + if (!$feed->isPublisher($app['authentication']->getUser())) { + $app->abort(403, 'Unathorized action'); + } + + $entry = new FeedEntry(); + $entry->setAuthorEmail($request->request->get('author_mail')) + ->setAuthorName($request->request->get('author_name')) + ->setTitle($title) + ->setFeed($feed) + ->setPublisher($publisher) + ->setSubtitle($request->request->get('subtitle', '')); + + $feed->addEntry($entry); + + $publishing = RecordsRequest::fromRequest($app, $request, true, array(), array('bas_chupub')); + foreach ($publishing as $record) { + $item = new FeedItem(); + $item->setEntry($entry) + ->setRecordId($record->get_record_id()) + ->setSbasId($record->get_sbas_id()); + $entry->addItem($item); + $app['EM']->persist($item); + } + + $app['EM']->persist($entry); + $app['EM']->persist($feed); + $app['EM']->flush(); + + $app['events-manager']->trigger('__FEED_ENTRY_CREATE__', array('entry_id' => $entry->getId()), $entry); + + $datas = array('error' => false, 'message' => false); + return $app->json($datas); }) ->bind('prod_feeds_entry_create') @@ -107,7 +111,7 @@ class Feed implements ControllerProviderInterface throw new AccessDeniedHttpException(); } - $feeds = $app['EM']->getRepository('Entities\Feed')->findAll(); + $feeds = $app['EM']->getRepository('Entities\Feed')->getAllForUser($app['authentication']->getUser()); $datas = $app['twig']->render('prod/actions/publish/publish_edit.html.twig', array('entry' => $entry, 'feeds' => $feeds)); @@ -129,20 +133,18 @@ class Feed implements ControllerProviderInterface if (!$entry->isPublisher($app['authentication']->getUser())) { $app->abort(403, 'Unathorized action'); } + if ('' === $title = trim($request->request->get('title', ''))) { + $app->abort(400, "Bad request"); + } - $title = $request->request->get('title'); - $subtitle = $request->request->get('subtitle'); - $author_name = $request->request->get('author_name'); - $author_mail = $request->request->get('author_mail'); - - $entry->setAuthorEmail($author_mail) - ->setAuthorName($author_name) + $entry->setAuthorEmail($request->request->get('author_mail')) + ->setAuthorName($request->request->get('author_name')) ->setTitle($title) - ->setSubtitle($subtitle); + ->setSubtitle($request->request->get('subtitle', '')); $current_feed_id = $entry->getFeed()->getId(); $new_feed_id = $request->request->get('feed_id', $current_feed_id); - if ($current_feed_id != $new_feed_id) { + if ($current_feed_id !== (int) $new_feed_id) { $new_feed = $app['EM']->getRepository('Entities\Feed')->find($new_feed_id); @@ -163,10 +165,7 @@ class Feed implements ControllerProviderInterface if (count($item_sort_datas) != 2) { continue; } - - $item = new FeedItem(); - $item->setEntry($entry); - $entry->addItem($item); + $item = $app['EM']->getRepository('Entities\FeedItem')->find($item_sort_datas[0]); $item->setOrd($item_sort_datas[1]); $app['EM']->persist($item); } @@ -214,7 +213,7 @@ class Feed implements ControllerProviderInterface $page = (int) $request->query->get('page'); $page = $page > 0 ? $page : 1; - $feeds = $app['EM']->getRepository('Entities\Feed')->findAll(); + $feeds = $app['EM']->getRepository('Entities\Feed')->getAllForUser($app['authentication']->getUser()); $datas = $app['twig']->render('prod/feeds/feeds.html.twig' , array( @@ -232,7 +231,7 @@ class Feed implements ControllerProviderInterface $page = $page > 0 ? $page : 1; $feed = $app['EM']->getRepository('Entities\Feed')->loadWithUser($app, $app['authentication']->getUser(), $id); - $feeds = $app['EM']->getRepository('Entities\Feed')->findAll(); + $feeds = $app['EM']->getRepository('Entities\Feed')->getAllForUser($app['authentication']->getUser()); $datas = $app['twig']->render('prod/feeds/feeds.html.twig', array('feed' => $feed, 'feeds' => $feeds, 'page' => $page)); @@ -244,7 +243,7 @@ class Feed implements ControllerProviderInterface $controllers->get('/subscribe/aggregated/', function(Application $app, Request $request) { $renew = ($request->query->get('renew') === 'true'); - $feeds = $app['EM']->getRepository('Entities\Feed')->findAll(); + $feeds = $app['EM']->getRepository('Entities\Feed')->getAllForUser($app['authentication']->getUser()); $aggregate = new Aggregate($app['EM'], $feeds); diff --git a/lib/Alchemy/Phrasea/Controller/Prod/Root.php b/lib/Alchemy/Phrasea/Controller/Prod/Root.php index 68ecbe102d..f457634755 100644 --- a/lib/Alchemy/Phrasea/Controller/Prod/Root.php +++ b/lib/Alchemy/Phrasea/Controller/Prod/Root.php @@ -13,6 +13,7 @@ namespace Alchemy\Phrasea\Controller\Prod; use Alchemy\Phrasea\Application; use Alchemy\Phrasea\Exception\SessionNotFound; +use Alchemy\Phrasea\Feed\Aggregate; use Silex\Application as SilexApplication; use Silex\ControllerProviderInterface; use Symfony\Component\HttpFoundation\Request; @@ -73,6 +74,7 @@ class Root implements ControllerProviderInterface } $feeds = $app['EM']->getRepository('Entities\Feed')->getAllForUser($app['authentication']->getUser()); + $aggregate = Aggregate::createFromUser($app['EM'], $app['authentication']->getUser()); $thjslist = ""; @@ -115,6 +117,7 @@ class Root implements ControllerProviderInterface 'cgus_agreement' => \databox_cgu::askAgreement($app), 'css' => $css, 'feeds' => $feeds, + 'aggregate' => $aggregate, 'GV_google_api' => $app['phraseanet.registry']->get('GV_google_api'), 'queries_topics' => $queries_topics, 'search_status' => \databox_status::getSearchStatus($app), diff --git a/lib/Alchemy/Phrasea/Controller/Root/RSSFeeds.php b/lib/Alchemy/Phrasea/Controller/Root/RSSFeeds.php index ac282593c5..f2e34561eb 100644 --- a/lib/Alchemy/Phrasea/Controller/Root/RSSFeeds.php +++ b/lib/Alchemy/Phrasea/Controller/Root/RSSFeeds.php @@ -27,12 +27,11 @@ class RSSFeeds implements ControllerProviderInterface public function connect(Application $app) { $controllers = $app['controllers_factory']; - $that = $this; $controllers->get('/feed/{id}/{format}/', function(Application $app, $id, $format) { $feed = $app['EM']->getRepository('Entities\Feed')->find($id); - if (!$feed) { + if (null === $feed) { $app->abort(404, 'Feed not found'); } @@ -54,9 +53,8 @@ class RSSFeeds implements ControllerProviderInterface $controllers->get('/userfeed/{token}/{id}/{format}/', function(Application $app, $token, $id, $format) { $token = $app["EM"]->find('Entities\FeedToken', $id); $feed = $token->getFeed(); - $usrId = $token->getUsrId(); - $user = \User_Adapter::getInstance($usrId, $app); + $user = \User_Adapter::getInstance($token->getUsrId(), $app); $request = $app['request']; @@ -71,9 +69,8 @@ class RSSFeeds implements ControllerProviderInterface $controllers->get('/userfeed/aggregated/{token}/{format}/', function(Application $app, $token, $format) { $token = $app['EM']->getRepository('Entities\AggregateToken')->findOneBy(array("value" => $token)); - $usrId = $token->getUsrId(); - $user = \User_Adapter::getInstance($usrId, $app); + $user = \User_Adapter::getInstance($token->getUsrId(), $app); $feeds = $app['EM']->getRepository('Entities\Feed')->getAllForUser($user); @@ -90,8 +87,7 @@ class RSSFeeds implements ControllerProviderInterface ->assert('format', '(rss|atom)'); $controllers->get('/aggregated/{format}/', function(Application $app, $format) { - $feeds = $app['EM']->getRepository('Entities\Feed')->findAllPublic(); - $feed = new Aggregate($app['EM'], $feeds); + $feed = Aggregate::getPublic($app); $request = $app['request']; $page = (int) $request->query->get('page'); @@ -103,8 +99,7 @@ class RSSFeeds implements ControllerProviderInterface ->assert('format', '(rss|atom)'); $controllers->get('/cooliris/', function(Application $app) { - $feeds = $app['EM']->getRepository('Entities\Feed')->findAllPublic(); - $feed = new Aggregate($app['EM'], $feeds); + $feed = Aggregate::getPublic($app); $request = $app['request']; $page = (int) $request->query->get('page'); diff --git a/lib/Alchemy/Phrasea/Feed/Aggregate.php b/lib/Alchemy/Phrasea/Feed/Aggregate.php index 133e66e5c8..ca1a347d7b 100644 --- a/lib/Alchemy/Phrasea/Feed/Aggregate.php +++ b/lib/Alchemy/Phrasea/Feed/Aggregate.php @@ -1,43 +1,51 @@ title = 'AGGREGATE'; @@ -58,6 +66,14 @@ class Aggregate implements FeedInterface return $this; } + /** + * Creates an aggregate from all the feeds available to a given user. + * + * @param EntityManager $em + * @param \User_Adapter $user + * + * @return Aggregate + */ public static function createFromUser(EntityManager $em, \User_Adapter $user) { $feeds = $em->getRepository('Entities\Feed')->getAllForUser($user); @@ -66,6 +82,14 @@ class Aggregate implements FeedInterface return new static($em, $feeds, $token); } + /** + * Creates an aggregate from given Feed id array. + * + * @param EntityManager $em + * @param array $feed_ids + * + * @return Aggregate + */ public static function create(Application $app, array $feed_ids) { $feeds = $this->em->getRepository('Entities\Feed')->findByIdArray($feed_ids); @@ -73,60 +97,101 @@ class Aggregate implements FeedInterface return new static($app, $feeds); } + /** + * {@inheritdoc} + */ public function isAggregated() { return true; } + /** + * {@inheritdoc} + */ public function getEntries($offset_start = null, $how_many = null) { - if (count($this->feeds) == 0) { + if (0 === count($this->feeds)) { return null; } return $this->em->getRepository('Entities\FeedEntry')->findByFeeds($this->feeds, $offset_start, $how_many); } + /** + * {@inheritdoc} + */ public function getSubtitle() { return $this->subtitle; } + /** + * {@inheritdoc} + */ public function getTitle() { return $this->title; } + /** + * {@inheritdoc} + */ public function getIconUrl() { return false; } + /** + * {@inheritdoc} + */ public function getCreatedOn() { return $this->created_on; } + /** + * {@inheritdoc} + */ public function getUpdatedOn() { return $this->updated_on; } + /** + * Get AggregateToken + * + * @return AggregateToken + */ public function getToken() { return $this->token; } + /** + * Set AggregateToken + * + * @param AggregateToken $token + */ public function setToken($token) { $this->token = $token; } + /** + * Get Feeds + * + * @return array + */ public function getFeeds() { return $this->feeds; } + /** + * Returns the total number of entries from all the feeds. + * + * @return int + */ public function getCountTotalEntries() { if (count($this->feeds) > 0) { @@ -136,11 +201,31 @@ class Aggregate implements FeedInterface return 0; } + /** + * {@inheritdoc} + */ public function hasPage($page, $pageSize) { + if (0 >= $pageSize) { + throw new LogicException; + } + $count = $this->getCountTotalEntries(); - if ($page >= $count / $pageSize) + if (0 > $page && $page <= $count / $pageSize) { return true; + } return false; } + + /** + * Creates an Aggregate from all the public feeds. + * + * @param Application $app + * + * @return Aggregate + */ + public static function getPublic(Application $app) + { + return new static($app['EM'], $app['EM']->getRepository('Entities\Feed')->findAllPublic()); + } } diff --git a/lib/Alchemy/Phrasea/Feed/AggregateToken.php b/lib/Alchemy/Phrasea/Feed/AggregateToken.php index 3034d7017e..175c793154 100644 --- a/lib/Alchemy/Phrasea/Feed/AggregateToken.php +++ b/lib/Alchemy/Phrasea/Feed/AggregateToken.php @@ -1,26 +1,31 @@ feed = $feed; + $this->aggregatedFeed = $feed; return $this; } @@ -71,11 +76,11 @@ class AggregateToken /** * Get feed * - * @return \Entities\Feed + * @return Aggregate */ public function getFeed() { - return $this->feed; + return $this->aggregatedFeed; } /** * @var string @@ -86,7 +91,7 @@ class AggregateToken * Set value * * @param string $value - * @return FeedToken + * @return AggregateToken */ public function setValue($value) { diff --git a/lib/Alchemy/Phrasea/Feed/FeedInterface.php b/lib/Alchemy/Phrasea/Feed/FeedInterface.php index 976cc07d6b..3780f31a26 100644 --- a/lib/Alchemy/Phrasea/Feed/FeedInterface.php +++ b/lib/Alchemy/Phrasea/Feed/FeedInterface.php @@ -13,19 +13,65 @@ namespace Alchemy\Phrasea\Feed; interface FeedInterface { + /** + * Returns a boolean indicating whether the feed has a custom icon. + * + * @return boolean + */ public function getIconUrl(); + /** + * Returns an UTF-8 title for the feed. + * + * @return string + */ public function getTitle(); + /** + * Returns a collection of FeedEntry. + * + * @param integer $offset_start + * @param integer $how_many + * + * @return \Doctrine\Common\Collections\Collection + */ public function getEntries($offset_start = 0, $how_many = null); + /** + * Returns an UTF-8 subtitle for the feed. + * + * @return string + */ public function getSubtitle(); + /** + * Returns a boolean indicating whether the feed is aggregated or not. + * + * @return boolean + */ public function isAggregated(); + /** + * Returns the date of creation of the feed. + * + * @return \DateTime + */ public function getCreatedOn(); + /** + * Returns the date of last update of the feed. + * + * @return \DateTime + */ public function getUpdatedOn(); + /** + * Returns a boolean indicating whether the feed has a given page. + * + * @param integer $page + * @param integer $pageSize + * + * @return \DateTime + */ public function hasPage($page, $pageSize); } diff --git a/lib/Alchemy/Phrasea/Feed/Formatter/AtomFormatter.php b/lib/Alchemy/Phrasea/Feed/Formatter/AtomFormatter.php index 6d6c834fc0..8b6a57acd3 100644 --- a/lib/Alchemy/Phrasea/Feed/Formatter/AtomFormatter.php +++ b/lib/Alchemy/Phrasea/Feed/Formatter/AtomFormatter.php @@ -22,24 +22,30 @@ class AtomFormatter extends FeedFormatterAbstract implements FeedFormatterInterf const FORMAT = 'atom'; private $linkGenerator; + /** + * @param LinkGeneratorCollection $generator + */ public function __construct(LinkGeneratorCollection $generator) { $this->linkGenerator = $generator; } - public function createResponse(FeedInterface $feed, $page, \User_Adapter $user = null, $generator = 'Phraseanet') + /** + * {@inheritdoc} + */ + public function createResponse(FeedInterface $feed, $page, \User_Adapter $user = null, $generator = 'Phraseanet', Application $app = null) { - $content = $this->format($feed, $page, $user, $generator); + $content = $this->format($feed, $page, $user, $generator, $app); $response = new Response($content, 200, array('Content-Type' => 'application/atom+xml')); - $response->setCharset('UTF-8'); return $response; } - public function format(FeedInterface $feed, $page, \User_Adapter $user = null, $generator = 'Phraseanet', $app = null) + /** + * {@inheritdoc} + */ + public function format(FeedInterface $feed, $page, \User_Adapter $user = null, $generator = 'Phraseanet', Application $app = null) { - $title = $feed->getTitle(); - $subtitle = $feed->getSubtitle(); $updated_on = $feed->getUpdatedOn(); $document = new \DOMDocument('1.0', 'UTF-8'); @@ -50,29 +56,28 @@ class AtomFormatter extends FeedFormatterAbstract implements FeedFormatterInterf $root->setAttribute('xmlns', 'http://www.w3.org/2005/Atom'); $root->setAttribute('xmlns:media', 'http://search.yahoo.com/mrss/'); - $this->addTag($document, $root, 'title', $title); + $this->addTag($document, $root, 'title', $feed->getTitle()); if ($updated_on instanceof \DateTime) { $updated_on = $updated_on->format(DATE_ATOM); $this->addTag($document, $root, 'updated', $updated_on); } + $next = $prev = null; + if ($feed->hasPage($page + 1, static::PAGE_SIZE)) { if (null === $user) { $next = $this->linkGenerator->generatePublic($feed, static::FORMAT, $page + 1); } else { $next = $this->linkGenerator->generate($feed, $user, static::FORMAT, $page + 1); } - } else { - $next = null; } + if ($feed->hasPage($page - 1, static::PAGE_SIZE)) { if (null === $user) { $prev = $this->linkGenerator->generatePublic($feed, static::FORMAT, $page - 1); } else { $prev = $this->linkGenerator->generate($feed, $user, static::FORMAT, $page - 1); } - } else { - $prev = null; } if (null !== $user) { @@ -100,12 +105,15 @@ class AtomFormatter extends FeedFormatterAbstract implements FeedFormatterInterf $next_link->setAttribute('href', $next->getURI()); } - if (isset($generator)) + if (null !== $generator) { $this->addTag($document, $root, 'generator', $generator); - if (isset($subtitle)) - $this->addTag($document, $root, 'subtitle', $subtitle); - if (isset($this->icon)) + } + if (null !== $feed->getSubtitle()) { + $this->addTag($document, $root, 'subtitle', $feed->getSubtitle()); + } + if (isset($this->icon)) { $this->addTag($document, $root, 'icon', $this->icon); + } if (isset($this->author)) { $author = $this->addTag($document, $root, 'author'); if (isset($this->author_email)) @@ -142,11 +150,13 @@ class AtomFormatter extends FeedFormatterAbstract implements FeedFormatterInterf $this->addTag($document, $entry_node, 'title', $entry->getTitle()); $author = $this->addTag($document, $entry_node, 'author'); - if ($entry->getAuthorEmail()) + if ($entry->getAuthorEmail()) { $this->addTag($document, $author, 'email', $entry->getAuthorEmail()); - if ($entry->getAuthorName()) + } + if ($entry->getAuthorName()) { $this->addTag($document, $author, 'name', $entry->getAuthorName()); - + } + $this->addTag($document, $entry_node, 'content', $entry->getSubtitle()); foreach ($entry->getItems() as $content) { diff --git a/lib/Alchemy/Phrasea/Feed/Formatter/CoolirisFormatter.php b/lib/Alchemy/Phrasea/Feed/Formatter/CoolirisFormatter.php index ef0a830c18..3caf35f83d 100644 --- a/lib/Alchemy/Phrasea/Feed/Formatter/CoolirisFormatter.php +++ b/lib/Alchemy/Phrasea/Feed/Formatter/CoolirisFormatter.php @@ -23,24 +23,30 @@ class CoolirisFormatter extends FeedFormatterAbstract implements FeedFormatterIn const VERSION = '2.0'; private $linkGenerator; + /** + * @param LinkGeneratorCollection $generator + */ public function __construct(LinkGeneratorCollection $generator) { $this->linkGenerator = $generator; } - public function createResponse(FeedInterface $feed, $page, \User_Adapter $user = null, $generator = 'Phraseanet', $app = null) + /** + * {@inheritdoc} + */ + public function createResponse(FeedInterface $feed, $page, \User_Adapter $user = null, $generator = 'Phraseanet', Application $app = null) { $content = $this->format($feed, $page, $user, $generator, $app); $response = new Response($content, 200, array('Content-Type' => 'application/rss+xml')); - $response->setCharset('UTF-8'); return $response; } - public function format(FeedInterface $feed, $page, \User_Adapter $user = null, $generator = 'Phraseanet', $app = null) + /** + * {@inheritdoc} + */ + public function format(FeedInterface $feed, $page, \User_Adapter $user = null, $generator = 'Phraseanet', Application $app = null) { - $title = $feed->getTitle(); - $subtitle = $feed->getSubtitle(); $updated_on = $feed->getUpdatedOn(); $doc = new \DOMDocument('1.0', 'UTF-8'); @@ -56,9 +62,9 @@ class CoolirisFormatter extends FeedFormatterAbstract implements FeedFormatterIn $channel = $this->addTag($doc, $root, 'channel'); - $this->addTag($doc, $channel, 'title', $title); - $this->addTag($doc, $channel, 'dc:title', $title); - $this->addTag($doc, $channel, 'description', $subtitle); + $this->addTag($doc, $channel, 'title', $feed->getTitle()); + $this->addTag($doc, $channel, 'dc:title', $feed->getTitle()); + $this->addTag($doc, $channel, 'description', $feed->getSubtitle()); if (null !== $user) { $link = $this->linkGenerator->generate($feed, $user, static::FORMAT, $page); @@ -66,8 +72,9 @@ class CoolirisFormatter extends FeedFormatterAbstract implements FeedFormatterIn $link = $this->linkGenerator->generatePublic($feed, static::FORMAT, $page); } - if ($link instanceof FeedLink) + if ($link instanceof FeedLink) { $this->addTag($doc, $channel, 'link', $link->getURI()); + } if (isset($this->language)) $this->addTag($doc, $channel, 'language', $this->language); @@ -126,23 +133,22 @@ class CoolirisFormatter extends FeedFormatterAbstract implements FeedFormatterIn $self_link->setAttribute('href', $link->getURI()); } + $next = $prev = null; + if ($feed->hasPage($page + 1, static::PAGE_SIZE)) { if (null === $user) { $next = $this->linkGenerator->generatePublic($feed, static::FORMAT, $page + 1); } else { $next = $this->linkGenerator->generate($feed, $user, static::FORMAT, $page + 1); } - } else { - $next = null; } + if ($feed->hasPage($page - 1, static::PAGE_SIZE)) { if (null === $user) { $prev = $this->linkGenerator->generatePublic($feed, static::FORMAT, $page - 1); } else { $prev = $this->linkGenerator->generate($feed, $user, static::FORMAT, $page - 1); } - } else { - $prev = null; } $prefix = 'atom'; @@ -175,7 +181,6 @@ class CoolirisFormatter extends FeedFormatterAbstract implements FeedFormatterIn protected function addContent(Application $app, \DOMDocument $document, \DOMNode $node, FeedItem $content) { - $preview_sd = $content->getRecord($app)->get_subdef('preview'); $preview_permalink = $preview_sd->get_permalink(); $thumbnail_sd = $content->getRecord($app)->get_thumbnail(); @@ -187,7 +192,7 @@ class CoolirisFormatter extends FeedFormatterAbstract implements FeedFormatterIn return $this; } - if (! $preview_permalink || ! $thumbnail_permalink) { + if (null === $preview_permalink || null === $thumbnail_permalink) { return $this; } @@ -197,7 +202,7 @@ class CoolirisFormatter extends FeedFormatterAbstract implements FeedFormatterIn $caption = $content->getRecord($app)->get_caption(); $title_field = $caption->get_dc_field(databox_Field_DCESAbstract::Title); - if ($title_field) { + if (null !== $title_field) { $str_title = $title_field->get_serialized_values(' '); } else { $str_title = $content->getRecord($app)->get_title(); @@ -207,7 +212,7 @@ class CoolirisFormatter extends FeedFormatterAbstract implements FeedFormatterIn $title = $this->addTag($document, $item, 'title', $str_title); $desc_field = $caption->get_dc_field(databox_Field_DCESAbstract::Description); - if ($desc_field) { + if (null !== $desc_field) { $str_desc = $desc_field->get_serialized_values(' '); } else { $str_desc = ''; @@ -218,7 +223,7 @@ class CoolirisFormatter extends FeedFormatterAbstract implements FeedFormatterIn $duration = $content->getRecord($app)->get_duration(); - if ($preview_permalink) { + if (null !== $preview_permalink) { $preview = $this->addTag($document, $item, 'media:content'); $preview->setAttribute('url', $preview_permalink->get_url()); @@ -228,23 +233,28 @@ class CoolirisFormatter extends FeedFormatterAbstract implements FeedFormatterIn $preview->setAttribute('expression', 'full'); $preview->setAttribute('isDefault', 'true'); - if ($preview_sd->get_width()) + if (null !== $preview_sd->get_width()) { $preview->setAttribute('width', $preview_sd->get_width()); - if ($preview_sd->get_height()) + } + if (null !== $preview_sd->get_height()) { $preview->setAttribute('height', $preview_sd->get_height()); - if ($duration) + } + if (null !== $duration) { $preview->setAttribute('duration', $duration); + } } - if ($thumbnail_permalink) { + if (null !== $thumbnail_permalink) { $thumbnail = $this->addTag($document, $item, 'media:thumbnail'); $thumbnail->setAttribute('url', $thumbnail_permalink->get_url()); - if ($thumbnail_sd->get_width()) + if (null !== $thumbnail_sd->get_width()) { $thumbnail->setAttribute('width', $thumbnail_sd->get_width()); - if ($thumbnail_sd->get_height()) + } + if (null !== $thumbnail_sd->get_height()) { $thumbnail->setAttribute('height', $thumbnail_sd->get_height()); + } $thumbnail = $this->addTag($document, $item, 'media:content'); @@ -254,12 +264,15 @@ class CoolirisFormatter extends FeedFormatterAbstract implements FeedFormatterIn $thumbnail->setAttribute('medium', $medium); $thumbnail->setAttribute('isDefault', 'false'); - if ($thumbnail_sd->get_width()) + if (null !== $thumbnail_sd->get_width()) { $thumbnail->setAttribute('width', $thumbnail_sd->get_width()); - if ($thumbnail_sd->get_height()) + } + if (null !== $thumbnail_sd->get_height()) { $thumbnail->setAttribute('height', $thumbnail_sd->get_height()); - if ($duration) + } + if (null !== $duration) { $thumbnail->setAttribute('duration', $duration); + } } return $this; diff --git a/lib/Alchemy/Phrasea/Feed/Formatter/FeedFormatterAbstract.php b/lib/Alchemy/Phrasea/Feed/Formatter/FeedFormatterAbstract.php index a2a6b6ca2c..0a77fe9b51 100644 --- a/lib/Alchemy/Phrasea/Feed/Formatter/FeedFormatterAbstract.php +++ b/lib/Alchemy/Phrasea/Feed/Formatter/FeedFormatterAbstract.php @@ -29,8 +29,9 @@ abstract class FeedFormatterAbstract { $tag = $document->createElement($tagname); - if (trim($tagcontent) !== '') + if (trim($tagcontent) !== '') { $tag->appendChild($document->createTextNode($tagcontent)); + } $node->appendChild($tag); return $tag; @@ -56,7 +57,7 @@ abstract class FeedFormatterAbstract return $this; } - if (! $preview_permalink || ! $thumbnail_permalink) { + if (null === $preview_permalink || null === $thumbnail_permalink) { return $this; } @@ -65,21 +66,21 @@ abstract class FeedFormatterAbstract $caption = $content->getRecord($app)->get_caption(); $title_field = $caption->get_dc_field(databox_Field_DCESAbstract::Title); - if ($title_field) { + if (null !== $title_field) { $str_title = $title_field->get_serialized_values(' '); $title = $this->addTag($document, $group, 'media:title', $str_title); $title->setAttribute('type', 'plain'); } $desc_field = $caption->get_dc_field(databox_Field_DCESAbstract::Description); - if ($desc_field) { + if (null !== $desc_field) { $str_desc = $desc_field->get_serialized_values(' '); $desc = $this->addTag($document, $group, 'media:description', $str_desc); $desc->setAttribute('type', 'plain'); } $contrib_field = $caption->get_dc_field(databox_Field_DCESAbstract::Contributor); - if ($contrib_field) { + if (null !== $contrib_field) { $str_contrib = $contrib_field->get_serialized_values(' '); $contrib = $this->addTag($document, $group, 'media:credit', $str_contrib); $contrib->setAttribute('role', 'contributor'); @@ -87,7 +88,7 @@ abstract class FeedFormatterAbstract } $director_field = $caption->get_dc_field(databox_Field_DCESAbstract::Creator); - if ($director_field) { + if (null !== $director_field) { $str_director = $director_field->get_serialized_values(' '); $director = $this->addTag($document, $group, 'media:credit', $str_director); $director->setAttribute('role', 'director'); @@ -95,7 +96,7 @@ abstract class FeedFormatterAbstract } $publisher_field = $caption->get_dc_field(databox_Field_DCESAbstract::Publisher); - if ($publisher_field) { + if (null !== $publisher_field) { $str_publisher = $publisher_field->get_serialized_values(' '); $publisher = $this->addTag($document, $group, 'media:credit', $str_publisher); $publisher->setAttribute('role', 'publisher'); @@ -103,20 +104,20 @@ abstract class FeedFormatterAbstract } $rights_field = $caption->get_dc_field(databox_Field_DCESAbstract::Rights); - if ($rights_field) { + if (null !== $rights_field) { $str_rights = $rights_field->get_serialized_values(' '); $rights = $this->addTag($document, $group, 'media:copyright', $str_rights); } $keyword_field = $caption->get_dc_field(databox_Field_DCESAbstract::Subject); - if ($keyword_field) { + if (null !== $keyword_field) { $str_keywords = $keyword_field->get_serialized_values(', '); $keywords = $this->addTag($document, $group, 'media:keywords', $str_keywords); } $duration = $content->get_record()->get_duration(); - if ($preview_permalink) { + if (null !== $preview_permalink) { $preview = $this->addTag($document, $group, 'media:content'); $preview->setAttribute('url', $preview_permalink->get_url()); @@ -126,23 +127,28 @@ abstract class FeedFormatterAbstract $preview->setAttribute('expression', 'full'); $preview->setAttribute('isDefault', 'true'); - if ($preview_sd->get_width()) + if (null !== $preview_sd->get_width()) { $preview->setAttribute('width', $preview_sd->get_width()); - if ($preview_sd->get_height()) + } + if (null !== $preview_sd->get_height()) { $preview->setAttribute('height', $preview_sd->get_height()); - if ($duration) + } + if (null !== $duration) { $preview->setAttribute('duration', $duration); + } } - if ($thumbnail_permalink) { + if (null !== $thumbnail_permalink) { $thumbnail = $this->addTag($document, $group, 'media:thumbnail'); $thumbnail->setAttribute('url', $thumbnail_permalink->get_url()); - if ($thumbnail_sd->get_width()) + if (null !== $thumbnail_sd->get_width()) { $thumbnail->setAttribute('width', $thumbnail_sd->get_width()); - if ($thumbnail_sd->get_height()) + } + if (null !== $thumbnail_sd->get_height()) { $thumbnail->setAttribute('height', $thumbnail_sd->get_height()); + } $thumbnail = $this->addTag($document, $group, 'media:content'); @@ -152,12 +158,15 @@ abstract class FeedFormatterAbstract $thumbnail->setAttribute('medium', $medium); $thumbnail->setAttribute('isDefault', 'false'); - if ($thumbnail_sd->get_width()) + if (null !== $thumbnail_sd->get_width()) { $thumbnail->setAttribute('width', $thumbnail_sd->get_width()); - if ($thumbnail_sd->get_height()) + } + if (null !== $thumbnail_sd->get_height()) { $thumbnail->setAttribute('height', $thumbnail_sd->get_height()); - if ($duration) + } + if (null !== $duration) { $thumbnail->setAttribute('duration', $duration); + } } return $this; diff --git a/lib/Alchemy/Phrasea/Feed/Formatter/FeedFormatterInterface.php b/lib/Alchemy/Phrasea/Feed/Formatter/FeedFormatterInterface.php index 7b7c4daf33..75f810a43a 100644 --- a/lib/Alchemy/Phrasea/Feed/Formatter/FeedFormatterInterface.php +++ b/lib/Alchemy/Phrasea/Feed/Formatter/FeedFormatterInterface.php @@ -1,20 +1,44 @@ linkGenerator = $generator; } - public function createResponse(FeedInterface $feed, $page, \User_Adapter $user = null, $generator = 'Phraseanet') + /** + * {@inheritdoc} + */ + public function createResponse(FeedInterface $feed, $page, \User_Adapter $user = null, $generator = 'Phraseanet', Application $app = null) { - $content = $this->format($feed, $page, $user, $generator); + $content = $this->format($feed, $page, $user, $generator, $app); $response = new Response($content, 200, array('Content-Type' => 'application/rss+xml')); - $response->setCharset('UTF-8'); return $response; } - public function format(FeedInterface $feed, $page, \User_Adapter $user = null, $generator = 'Phraseanet', $app = null) + /** + * {@inheritdoc} + */ + public function format(FeedInterface $feed, $page, \User_Adapter $user = null, $generator = 'Phraseanet', Application $app = null) { - $title = $feed->getTitle(); - $subtitle = $feed->getSubtitle(); $updated_on = $feed->getUpdatedOn(); + $next = $prev = null; + if ($feed->hasPage($page + 1, static::PAGE_SIZE)) { if (null === $user) { $next = $this->linkGenerator->generatePublic($feed, static::FORMAT, $page + 1); } else { $next = $this->linkGenerator->generate($feed, $user, static::FORMAT, $page + 1); } - } else { - $next = null; } if ($feed->hasPage($page - 1, static::PAGE_SIZE)) { if (null === $user) { @@ -59,8 +65,6 @@ class RssFormatter extends FeedFormatterAbstract implements FeedFormatterInterfa } else { $prev = $this->linkGenerator->generate($feed, $user, static::FORMAT, $page - 1); } - } else { - $prev = null; } if (null !== $user) { @@ -82,11 +86,12 @@ class RssFormatter extends FeedFormatterAbstract implements FeedFormatterInterfa $channel = $this->addTag($doc, $root, 'channel'); - $this->addTag($doc, $channel, 'title', $title); - $this->addTag($doc, $channel, 'dc:title', $title); - $this->addTag($doc, $channel, 'description', $subtitle); - if ($link instanceof FeedLink) + $this->addTag($doc, $channel, 'title', $feed->getTitle()); + $this->addTag($doc, $channel, 'dc:title', $feed->getTitle()); + $this->addTag($doc, $channel, 'description', $feed->getSubtitle()); + if ($link instanceof FeedLink) { $this->addTag($doc, $channel, 'link', $link->getURI()); + } if (isset($this->language)) $this->addTag($doc, $channel, 'language', $this->language); diff --git a/lib/Alchemy/Phrasea/Feed/Link/AggregateLinkGenerator.php b/lib/Alchemy/Phrasea/Feed/Link/AggregateLinkGenerator.php index 93ff9ca774..8f5625b6d6 100644 --- a/lib/Alchemy/Phrasea/Feed/Link/AggregateLinkGenerator.php +++ b/lib/Alchemy/Phrasea/Feed/Link/AggregateLinkGenerator.php @@ -5,6 +5,7 @@ namespace Alchemy\Phrasea\Feed\Link; use Alchemy\Phrasea\Exception\InvalidArgumentException; use Alchemy\Phrasea\Feed\Aggregate; use Alchemy\Phrasea\Feed\FeedInterface; +use Alchemy\Phrasea\Feed\Link\FeedLink; use Entities\AggregateToken; use Doctrine\ORM\EntityManager; use Symfony\Component\Routing\Generator\UrlGenerator; @@ -18,6 +19,11 @@ class AggregateLinkGenerator implements LinkGeneratorInterface private $generator; private $random; + /** + * @param UrlGenerator $generator + * @param EntityManager $em + * @param \random $random + */ public function __construct(UrlGenerator $generator, EntityManager $em, \random $random) { $this->generator = $generator; @@ -25,6 +31,9 @@ class AggregateLinkGenerator implements LinkGeneratorInterface $this->random = $random; } + /** + * {@inheritdoc} + */ public function generate(FeedInterface $aggregate, \User_Adapter $user, $format, $page = null, $renew = false) { if (!$this->supports($aggregate)) { @@ -33,8 +42,10 @@ class AggregateLinkGenerator implements LinkGeneratorInterface switch ($format) { case self::FORMAT_ATOM: - $params = array('token' => $this->getAggregateToken($user, $renew)->getValue(), - 'format' => 'atom'); + $params = array( + 'token' => $this->getAggregateToken($user, $renew)->getValue(), + 'format' => 'atom' + ); if (null !== $page) { $params['page'] = $page; } @@ -44,10 +55,11 @@ class AggregateLinkGenerator implements LinkGeneratorInterface sprintf('%s - %s', $aggregate->getTitle(), 'Atom'), 'application/atom+xml' ); - break; case self::FORMAT_RSS: - $params = array('token' => $this->getAggregateToken($user, $renew)->getValue(), - 'format' => 'rss'); + $params = array( + 'token' => $this->getAggregateToken($user, $renew)->getValue(), + 'format' => 'rss' + ); if (null !== $page) { $params['page'] = $page; } @@ -57,17 +69,22 @@ class AggregateLinkGenerator implements LinkGeneratorInterface sprintf('%s - %s', $aggregate->getTitle(), 'RSS'), 'application/rss+xml' ); - break; default: throw new InvalidArgumentException(sprintf('Format %s is not recognized.', $format)); } } + /** + * {@inheritdoc} + */ public function supports(FeedInterface $feed) { return $feed instanceof Aggregate; } + /** + * {@inheritdoc} + */ public function generatePublic(FeedInterface $aggregate, $format, $page = null) { if (!$this->supports($aggregate)) { @@ -86,7 +103,6 @@ class AggregateLinkGenerator implements LinkGeneratorInterface sprintf('%s - %s', $aggregate->getTitle(), 'Atom'), 'application/atom+xml' ); - break; case self::FORMAT_RSS: $params = array('format' => 'rss'); if (null !== $page) { @@ -98,7 +114,6 @@ class AggregateLinkGenerator implements LinkGeneratorInterface sprintf('%s - %s', $aggregate->getTitle(), 'RSS'), 'application/rss+xml' ); - break; default: throw new InvalidArgumentException(sprintf('Format %s is not recognized.', $format)); } diff --git a/lib/Alchemy/Phrasea/Feed/Link/FeedLink.php b/lib/Alchemy/Phrasea/Feed/Link/FeedLink.php index 9845e19c98..a82c8deef4 100644 --- a/lib/Alchemy/Phrasea/Feed/Link/FeedLink.php +++ b/lib/Alchemy/Phrasea/Feed/Link/FeedLink.php @@ -13,27 +13,19 @@ namespace Alchemy\Phrasea\Feed\Link; class FeedLink implements FeedLinkInterface { - /** - * @var string - */ + /** @var string */ protected $mimetype; - /** - * @var string - */ + /** @var string */ protected $title; - /** - * @var string - */ + /** @var string */ protected $uri; /** * @param string $uri * @param string $title * @param string $mimetype - * - * @return FeedLink */ public function __construct($uri, $title, $mimetype) { diff --git a/lib/Alchemy/Phrasea/Feed/Link/FeedLinkGenerator.php b/lib/Alchemy/Phrasea/Feed/Link/FeedLinkGenerator.php index 9eb0267de6..d720969dd9 100644 --- a/lib/Alchemy/Phrasea/Feed/Link/FeedLinkGenerator.php +++ b/lib/Alchemy/Phrasea/Feed/Link/FeedLinkGenerator.php @@ -12,9 +12,9 @@ namespace Alchemy\Phrasea\Feed\Link; use Alchemy\Phrasea\Exception\InvalidArgumentException; +use Alchemy\Phrasea\Feed\FeedInterface; use Doctrine\ORM\EntityManager; use Entities\Feed; -use Alchemy\Phrasea\Feed\FeedInterface; use Entities\FeedToken; use Symfony\Component\Routing\Generator\UrlGenerator; @@ -27,6 +27,11 @@ class FeedLinkGenerator implements LinkGeneratorInterface private $generator; private $random; + /** + * @param UrlGenerator $generator + * @param EntityManager $em + * @param \random $random + */ public function __construct(UrlGenerator $generator, EntityManager $em, \random $random) { $this->generator = $generator; @@ -34,6 +39,9 @@ class FeedLinkGenerator implements LinkGeneratorInterface $this->random = $random; } + /** + * {@inheritdoc} + */ public function generate(FeedInterface $feed, \User_Adapter $user, $format, $page = null, $renew = false) { if (!$this->supports($feed)) { @@ -42,9 +50,11 @@ class FeedLinkGenerator implements LinkGeneratorInterface switch ($format) { case self::FORMAT_ATOM: - $params = array('token' => $this->getFeedToken($feed, $user, $renew)->getValue(), - 'id' => $feed->getId(), - 'format' => 'atom'); + $params = array( + 'token' => $this->getFeedToken($feed, $user, $renew)->getValue(), + 'id' => $feed->getId(), + 'format' => 'atom' + ); if (null !== $page) { $params['page'] = $page; } @@ -54,11 +64,12 @@ class FeedLinkGenerator implements LinkGeneratorInterface sprintf('%s - %s', $feed->getTitle(), 'Atom'), 'application/atom+xml' ); - break; case self::FORMAT_RSS: - $params = array('token' => $this->getFeedToken($feed, $user, $renew)->getValue(), - 'id' => $feed->getId(), - 'format' => 'rss'); + $params = array( + 'token' => $this->getFeedToken($feed, $user, $renew)->getValue(), + 'id' => $feed->getId(), + 'format' => 'rss' + ); if (null !== $page) { $params['page'] = $page; } @@ -68,17 +79,22 @@ class FeedLinkGenerator implements LinkGeneratorInterface sprintf('%s - %s', $feed->getTitle(), 'RSS'), 'application/rss+xml' ); - break; default: throw new InvalidArgumentException(sprintf('Format %s is not recognized.', $format)); } } + /** + * {@inheritdoc} + */ public function supports(FeedInterface $feed) { return $feed instanceof Feed; } + /** + * {@inheritdoc} + */ public function generatePublic(FeedInterface $feed, $format, $page = null) { if (!$this->supports($feed)) { @@ -87,8 +103,10 @@ class FeedLinkGenerator implements LinkGeneratorInterface switch ($format) { case self::FORMAT_ATOM: - $params = array('id' => $feed->getId(), - 'format' => 'atom'); + $params = array( + 'id' => $feed->getId(), + 'format' => 'atom' + ); if (null !== $page) { $params['page'] = $page; } @@ -98,10 +116,11 @@ class FeedLinkGenerator implements LinkGeneratorInterface sprintf('%s - %s', $feed->getTitle(), 'Atom'), 'application/atom+xml' ); - break; case self::FORMAT_RSS: - $params = array('id' => $feed->getId(), - 'format' => 'rss'); + $params = array( + 'id' => $feed->getId(), + 'format' => 'rss' + ); if (null !== $page) { $params['page'] = $page; } @@ -111,7 +130,6 @@ class FeedLinkGenerator implements LinkGeneratorInterface sprintf('%s - %s', $feed->getTitle(), 'RSS'), 'application/rss+xml' ); - break; default: throw new InvalidArgumentException(sprintf('Format %s is not recognized.', $format)); } diff --git a/lib/Alchemy/Phrasea/Feed/Link/FeedLinkInterface.php b/lib/Alchemy/Phrasea/Feed/Link/FeedLinkInterface.php index 6e158bdc23..29f946b161 100644 --- a/lib/Alchemy/Phrasea/Feed/Link/FeedLinkInterface.php +++ b/lib/Alchemy/Phrasea/Feed/Link/FeedLinkInterface.php @@ -14,16 +14,22 @@ namespace Alchemy\Phrasea\Feed\Link; interface FeedLinkInterface { /** + * Returns the mimetype of the link. + * * @return string */ public function getMimetype(); /** + * Returns the title of the link. + * * @return string */ public function getTitle(); /** + * Returns the URI of the link. + * * @return string */ public function getURI(); diff --git a/lib/Alchemy/Phrasea/Feed/Link/LinkGeneratorCollection.php b/lib/Alchemy/Phrasea/Feed/Link/LinkGeneratorCollection.php index 2fe35944fd..81a9089898 100644 --- a/lib/Alchemy/Phrasea/Feed/Link/LinkGeneratorCollection.php +++ b/lib/Alchemy/Phrasea/Feed/Link/LinkGeneratorCollection.php @@ -9,11 +9,19 @@ class LinkGeneratorCollection implements LinkGeneratorInterface { private $generators = array(); + /** + * Adds a LinkGeneratorInterface to the internal array. + * + * @param LinkGeneratorInterface $generator + */ public function pushGenerator(LinkGeneratorInterface $generator) { $this->generators[] = $generator; } + /** + * {@inheritdoc} + */ public function generate(FeedInterface $feed, \User_Adapter $user, $format, $page = null, $renew = false) { if (null === $generator = $this->findGenerator($feed)) { @@ -23,6 +31,9 @@ class LinkGeneratorCollection implements LinkGeneratorInterface return $generator->generate($feed, $user, $format, $page); } + /** + * {@inheritdoc} + */ public function generatePublic(FeedInterface $feed, $format, $page = null) { if (null === $generator = $this->findGenerator($feed)) { @@ -32,6 +43,9 @@ class LinkGeneratorCollection implements LinkGeneratorInterface return $generator->generatePublic($feed, $format, $page); } + /** + * {@inheritdoc} + */ public function supports(FeedInterface $feed) { return null !== $this->findGenerator($feed); diff --git a/lib/Alchemy/Phrasea/Feed/Link/LinkGeneratorInterface.php b/lib/Alchemy/Phrasea/Feed/Link/LinkGeneratorInterface.php index 65d9be33ec..312e757039 100644 --- a/lib/Alchemy/Phrasea/Feed/Link/LinkGeneratorInterface.php +++ b/lib/Alchemy/Phrasea/Feed/Link/LinkGeneratorInterface.php @@ -7,26 +7,39 @@ use Alchemy\Phrasea\Feed\FeedInterface; interface LinkGeneratorInterface { /** + * Generates a FeedLink based on given FeedInterface and User_Adapter. * - * @param \Alchemy\Phrasea\Feed\FeedInterface $feed - * @param \User_Adapter $user - * @param type $format - * @param type $page - * @param type $renew + * @param FeedInterface $feed + * @param \User_Adapter $user + * @param type $format + * @param type $page + * @param type $renew + * + * @return FeedLink * * @throws InvalidArgumentException */ public function generate(FeedInterface $feed, \User_Adapter $user, $format, $page = null, $renew = false); /** + * Generates a public FeedLink based on given FeedInterface. * - * @param \Alchemy\Phrasea\Feed\FeedInterface $feed - * @param type $format - * @param type $page + * @param FeedInterface $feed + * @param type $format + * @param type $page + * + * @return FeedLink * * @throws InvalidArgumentException */ public function generatePublic(FeedInterface $feed, $format, $page = null); + /** + * Returns an instance of FeedInterface supported by the class. + * + * @param \Alchemy\Phrasea\Feed\FeedInterface $feed + * + * @return FeedInterface + */ public function supports(FeedInterface $feed); } diff --git a/lib/Doctrine/Entities/Feed.php b/lib/Doctrine/Entities/Feed.php index 09dcd16b37..b4d2eea8ad 100644 --- a/lib/Doctrine/Entities/Feed.php +++ b/lib/Doctrine/Entities/Feed.php @@ -246,6 +246,11 @@ class Feed implements FeedInterface return $this->entries->slice($offset_start, $how_many); } + /** + * Returns the owner of the feed. + * + * @return FeedPublisher + */ public function getOwner() { foreach ($this->getPublishers() as $publisher) { @@ -255,6 +260,13 @@ class Feed implements FeedInterface } } + /** + * Returns a boolean indicating whether the given User_Adapter is the owner of the feed. + * + * @param \User_Adapter $user + * + * @return boolean + */ public function isOwner(\User_Adapter $user) { $owner = $this->getOwner(); @@ -265,6 +277,13 @@ class Feed implements FeedInterface return false; } + /** + * Returns the collection to which the feed belongs. + * + * @param Application $app + * + * @return type + */ public function getCollection(Application $app) { if ($this->getBaseId() !== null) { @@ -272,6 +291,13 @@ class Feed implements FeedInterface } } + /** + * Sets the collection. + * + * @param \collection $collection + * + * @return type + */ public function setCollection(\collection $collection = null) { if ($collection === null) { @@ -328,6 +354,13 @@ class Feed implements FeedInterface return $this->updated_on; } + /** + * Returns a boolean indicating whether the given User_Adapter is a publisher of the feed. + * + * @param \User_Adapter $user + * + * @return boolean + */ public function isPublisher(\User_Adapter $user) { foreach ($this->getPublishers() as $publisher) { @@ -339,6 +372,13 @@ class Feed implements FeedInterface return false; } + /** + * Returns an instance of FeedPublisher matching to the given User_Adapter + * + * @param \User_Adapter $user + * + * @return FeedPublisher + */ public function getPublisher(\User_Adapter $user) { foreach ($this->getPublishers() as $publisher) { @@ -373,16 +413,34 @@ class Feed implements FeedInterface return $this->subtitle; } + /** + * Returns a boolean indicating whether the feed is aggregated. + * + * @return boolean + */ public function isAggregated() { return false; } + /** + * Returns the number of entries the feed contains + * + * @return integer + */ public function getCountTotalEntries() { return (count($this->entries)); } + /** + * Returns a boolean indicating whether the given User_Adapter has access to the feed + * + * @param \User_Adapter $user + * @param Application $app + * + * @return boolean + */ public function hasAccess(\User_Adapter $user, Application $app) { if ($this->getCollection($app) instanceof collection) { @@ -448,11 +506,24 @@ class Feed implements FeedInterface $this->entries->removeElement($entries); } + /** + * Returns a boolean indicating whether the feed contains a given page, assuming a given page size. + * + * @param integer $page + * @param integer $pageSize + * + * @return boolean + */ public function hasPage($page, $pageSize) { + if (0 >= $pageSize) { + throw new LogicException; + } + $count = $this->getCountTotalEntries(); - if ($page >= $count / $pageSize + $pageSize) + if (0 > $page && $page <= $count / $pageSize) { return true; + } return false; } } diff --git a/lib/Doctrine/Entities/FeedEntry.php b/lib/Doctrine/Entities/FeedEntry.php index 5592db4b1d..a0a6e17d2a 100644 --- a/lib/Doctrine/Entities/FeedEntry.php +++ b/lib/Doctrine/Entities/FeedEntry.php @@ -292,16 +292,31 @@ class FeedEntry return $this->feed; } + /** + * Returns a boolean indicating whether the given User_Adapter is the publisher of the entry. + * + * @param \User_Adapter $user + * + * @return boolean + */ public function isPublisher(\User_Adapter $user) { if ($this->publisher) { - if ($this->publisher->getUsrId() === $user->get_id()) + if ($this->publisher->getUsrId() === $user->get_id()) { return true; + } } return false; } + /** + * Returns the item from a given id. + * + * @param int $id + * + * @return null + */ public function getItem($id) { foreach ($this->items as $item) { diff --git a/lib/Doctrine/Entities/FeedItem.php b/lib/Doctrine/Entities/FeedItem.php index 6faa693113..985fc1357f 100644 --- a/lib/Doctrine/Entities/FeedItem.php +++ b/lib/Doctrine/Entities/FeedItem.php @@ -191,11 +191,21 @@ class FeedItem return $this->updated_on; } + /** + * Marks this item as the last added. + */ public function setLastInFeedItem() { $this->setOrd($this->getEntry()->getItems()->count() + 1); } + /** + * Returns the record_adapter associated to this FeedItem. + * + * @param Application $app + * + * @return \record_adapter + */ public function getRecord(Application $app) { return new \record_adapter($app, $this->getSbasId(), $this->getRecordId(), $this->getOrd()); diff --git a/lib/Doctrine/Entities/FeedPublisher.php b/lib/Doctrine/Entities/FeedPublisher.php index 2cd8d4bf89..9e8062ee94 100644 --- a/lib/Doctrine/Entities/FeedPublisher.php +++ b/lib/Doctrine/Entities/FeedPublisher.php @@ -22,7 +22,7 @@ class FeedPublisher /** * @var boolean */ - private $owner; + private $owner = false; /** * @var \DateTime diff --git a/lib/Doctrine/Repositories/AggregateTokenRepository.php b/lib/Doctrine/Repositories/AggregateTokenRepository.php index dd99abba02..a84ddd5b0a 100644 --- a/lib/Doctrine/Repositories/AggregateTokenRepository.php +++ b/lib/Doctrine/Repositories/AggregateTokenRepository.php @@ -3,6 +3,7 @@ namespace Repositories; use Doctrine\ORM\EntityRepository; +use Entities\AggregateToken; /** * AggregateTokenRepository @@ -12,6 +13,13 @@ use Doctrine\ORM\EntityRepository; */ class AggregateTokenRepository extends EntityRepository { + /** + * Finds an AggregateToken based on given User_Adapter. + * + * @param \User_Adapter $user + * + * @return AggregateToken + */ public function findByUser(\User_Adapter $user) { $dql = 'SELECT t diff --git a/lib/Doctrine/Repositories/FeedTokenRepository.php b/lib/Doctrine/Repositories/FeedTokenRepository.php index c592dd4611..ff01aa47b8 100644 --- a/lib/Doctrine/Repositories/FeedTokenRepository.php +++ b/lib/Doctrine/Repositories/FeedTokenRepository.php @@ -4,6 +4,7 @@ namespace Repositories; use Doctrine\ORM\EntityRepository; use Entities\Feed; +use Entities\FeedToken; /** * FeedTokenRepository @@ -13,6 +14,14 @@ use Entities\Feed; */ class FeedTokenRepository extends EntityRepository { + /** + * Finds a FeedToken based on given Feed and User_Adapter. + * + * @param Feed $feed + * @param \User_Adapter $user + * + * @return FeedToken + */ public function findByFeedAndUser(Feed $feed, \User_Adapter $user) { $dql = 'SELECT t diff --git a/lib/Doctrine/Repositories/OrderElementRepository.php b/lib/Doctrine/Repositories/OrderElementRepository.php index 916c536108..424cd60c2f 100644 --- a/lib/Doctrine/Repositories/OrderElementRepository.php +++ b/lib/Doctrine/Repositories/OrderElementRepository.php @@ -3,6 +3,8 @@ namespace Repositories; use Doctrine\ORM\EntityRepository; +use Entities\Feed; +use Entities\FeedPublisher; /** * OrderElementRepository @@ -12,18 +14,15 @@ use Doctrine\ORM\EntityRepository; */ class OrderElementRepository extends EntityRepository { - public function find($id) - { - $dql = 'SELECT f FROM Entities\FeedPublisher f - WHERE f.id = :id '; - - $query = $this->_em->createQuery($dql); - $query->setParameter('id', $id); - - return $query->getOneOrNullResult(); - } - - public function findByUser(\Entities\Feed $feed, \User_Adapter $user) + /** + * Finds a FeedPublisher based on a given Feed and a User_Adapter. + * + * @param Feed $feed + * @param \User_Adapter $user + * + * @return FeedPublisher + */ + public function findByUser(Feed $feed, \User_Adapter $user) { $dql = 'SELECT f FROM Entities\FeedPublisher f WHERE f.usr_id = :usrId AND f.feed = :feed'; diff --git a/lib/Doctrine/Repositories/SessionRepository.php b/lib/Doctrine/Repositories/SessionRepository.php index f0c44306d5..cd2ee6832c 100644 --- a/lib/Doctrine/Repositories/SessionRepository.php +++ b/lib/Doctrine/Repositories/SessionRepository.php @@ -13,10 +13,10 @@ use Doctrine\ORM\EntityRepository; */ class SessionRepository extends EntityRepository { - /** * * @param User_Adapter $user + * * @return \Doctrine\Common\Collections\Collection */ public function getAllForUser(\User_Adapter $user) diff --git a/lib/Doctrine/Repositories/UserSettingRepository.php b/lib/Doctrine/Repositories/UserSettingRepository.php index 193df37898..5ec02bb1e9 100644 --- a/lib/Doctrine/Repositories/UserSettingRepository.php +++ b/lib/Doctrine/Repositories/UserSettingRepository.php @@ -12,29 +12,15 @@ use Doctrine\ORM\EntityRepository; */ class UserSettingRepository extends EntityRepository { - public function find($id) - { - $dql = 'SELECT f FROM Entities\FeedEntry f - WHERE f.id = :id '; - - $query = $this->_em->createQuery($dql); - $query->setParameter('id', $id); - - return $query->getOneOrNullResult(); - } - - public function findByFeed($feed, $id) - { - $dql = 'SELECT f FROM Entities\FeedEntry f - WHERE f.id = :id AND f.feed = :feed'; - - $query = $this->_em->createQuery($dql); - $query->setParameter('id', $id); - $query->setParameter('feed', $feed); - - return $query->getOneOrNullResult(); - } - + /** + * Returns a collection of FeedEntry from given feeds, limited to $how_many results, starting with $offset_start + * + * @param array $feeds + * @param integer $offset_start + * @param integer $how_many + * + * @return \Doctrine\Common\Collections\Collection + */ public function findByFeeds($feeds, $offset_start = null, $how_many = null) { $dql = 'SELECT f FROM Entities\FeedEntry f diff --git a/lib/classes/patch/320f.php b/lib/classes/patch/320f.php index cf2ead259e..cb4d2f07b8 100644 --- a/lib/classes/patch/320f.php +++ b/lib/classes/patch/320f.php @@ -127,7 +127,6 @@ class patch_320f implements patchInterface $entry->addItem($item); $item->setRecordId($record->get_record_id()); $item->setSbasId($record->get_sbas_id()); - $item->setLastInFeedItem(); $app['EM']->persist($item); } catch (NotFoundHttpException $e) { @@ -164,12 +163,13 @@ class patch_320f implements patchInterface protected function get_feed(appbox $appbox, User_Adapter $user, $pub_restrict, $homelink, Application $app) { $user_key = 'user_' . $user->get_id(); - if ($homelink == '1') + if ($homelink == '1') { $feed_key = 'feed_homelink'; - elseif ($pub_restrict == '1') + } elseif ($pub_restrict == '1') { $feed_key = 'feed_restricted'; - else + } else { $feed_key = 'feed_public'; + } if ( ! array_key_exists($user_key, self::$feeds) || ! isset(self::$feeds[$user_key][$feed_key])) { if ($homelink == '1') @@ -183,7 +183,6 @@ class patch_320f implements patchInterface $publisher = new FeedPublisher(); $feed->setTitle('title'); $feed->setSubtitle(''); - $feed->setIconUrl(false); $feed->addPublisher($publisher); $publisher->setFeed($feed); $publisher->setOwner(true); diff --git a/templates/web/prod/index.html.twig b/templates/web/prod/index.html.twig index c8594d97d9..cce1d5a898 100644 --- a/templates/web/prod/index.html.twig +++ b/templates/web/prod/index.html.twig @@ -55,9 +55,13 @@ {% for feed in feeds %} {% set link = app['feed.user-link-generator'].generate(feed, app['authentication'].getUser(), 'rss') %} - {% set link = app['feed.user-link-generator'].generate(feed, app['authentication'].getUser(), 'rss') %} + {% set link = app['feed.user-link-generator'].generate(feed, app['authentication'].getUser(), 'atom') %} {% endfor %} + {% set link = app['feed.aggregate-link-generator'].generate(aggregate, app['authentication'].getUser(), 'rss') %} + + {% set link = app['feed.aggregate-link-generator'].generate(aggregate, app['authentication'].getUser(), 'atom') %} + {% endblock %} {% block stylesheet %} diff --git a/tests/Alchemy/Tests/Phrasea/Controller/Admin/PublicationTest.php b/tests/Alchemy/Tests/Phrasea/Controller/Admin/PublicationTest.php index ef2f01b15a..624966da44 100644 --- a/tests/Alchemy/Tests/Phrasea/Controller/Admin/PublicationTest.php +++ b/tests/Alchemy/Tests/Phrasea/Controller/Admin/PublicationTest.php @@ -17,10 +17,12 @@ class Module_Admin_Route_PublicationTest extends \PhraseanetWebTestCaseAuthentic foreach ($feeds as $feed) { $this->assertRegExp('/\/admin\/publications\/feed\/' . $feed->getId() . '/', $pageContent); - if ($feed->getCollection() != null) + if ($feed->getCollection() != null) { $this->assertRegExp('/' . $feed->getCollection()->get_label(self::$DI['app']['locale.I18n']) . '/', $pageContent); - if ($feed->isOwner(self::$DI['user'])) + } + if ($feed->isOwner(self::$DI['user'])) { $this->assertEquals(1, $crawler->filterXPath("//form[@action='/admin/publications/feed/" . $feed->getId() . "/delete/']")->count()); + } } } diff --git a/tests/Alchemy/Tests/Phrasea/Controller/Prod/FeedTest.php b/tests/Alchemy/Tests/Phrasea/Controller/Prod/FeedTest.php index 9caa3fa0d6..9011f44890 100644 --- a/tests/Alchemy/Tests/Phrasea/Controller/Prod/FeedTest.php +++ b/tests/Alchemy/Tests/Phrasea/Controller/Prod/FeedTest.php @@ -3,6 +3,7 @@ namespace Alchemy\Tests\Phrasea\Controller\Prod; use Alchemy\Phrasea\Application; +use Entities\FeedItem; use Symfony\Component\CssSelector\CssSelector; class FeedTest extends \PhraseanetWebTestCaseAuthenticatedAbstract @@ -72,12 +73,32 @@ class FeedTest extends \PhraseanetWebTestCaseAuthenticatedAbstract , 'lst' => self::$DI['record_1']->get_serialize_key() ); $crawler = self::$DI['client']->request('POST', '/prod/feeds/entry/create/', $params); - $this->assertTrue(self::$DI['client']->getResponse()->isOk()); - $this->assertEquals("application/json", self::$DI['client']->getResponse()->headers->get("content-type")); - $pageContent = json_decode(self::$DI['client']->getResponse()->getContent()); - $this->assertTrue(is_object($pageContent)); - $this->assertTrue($pageContent->error); - $this->assertTrue(is_string($pageContent->message)); + $this->assertFalse(self::$DI['client']->getResponse()->isOk()); + $this->assertEquals(404, self::$DI['client']->getResponse()->getStatusCode()); + } + + public function testEntryCreateUnauthorized() + { + $feed = $this->insertOneFeed(self::$DI['user_alt1']); + + self::$DI['app']['notification.deliverer'] = $this->getMockBuilder('Alchemy\Phrasea\Notification\Deliverer') + ->disableOriginalConstructor() + ->getMock(); + + self::$DI['app']['notification.deliverer']->expects($this->never()) + ->method('deliver'); + + $params = array( + "feed_id" => $feed->getId() + , "title" => "salut" + , "subtitle" => "coucou" + , "author_name" => "robert" + , "author_mail" => "robert@kikoo.mail" + , 'lst' => self::$DI['record_1']->get_serialize_key() + ); + + $crawler = self::$DI['client']->request('POST', '/prod/feeds/entry/create/', $params); + $this->assertEquals(403, self::$DI['client']->getResponse()->getStatusCode()); } public function testEntryEdit() @@ -259,6 +280,41 @@ class FeedTest extends \PhraseanetWebTestCaseAuthenticatedAbstract $this->assertEquals(403, self::$DI['client']->getResponse()->getStatusCode());; } + public function testEntryUpdateChangeOrder() + { + $item1 = $this->insertOneFeedItem(self::$DI['user']); + $entry = $item1->getEntry(); + $item2 = new FeedItem(); + $item2->setEntry($entry) + ->setRecordId(self::$DI['record_2']->get_record_id()) + ->setSbasId(self::$DI['record_2']->get_sbas_id()); + $entry->addItem($item2); + + self::$DI['app']['EM']->persist($entry); + self::$DI['app']['EM']->persist($item2); + self::$DI['app']['EM']->flush(); + + $ord1 = $item1->getOrd(); + $ord2 = $item2->getOrd(); + + $params = array( + "title" => $entry->getTitle(), + "author_name" => $entry->getAuthorName(), + "author_mail" => $entry->getAuthorEmail(), + 'sorted_lst' => $item1->getId() . '_' . $item2->getOrd() . ';' + . $item2->getId() . '_' . $item1->getOrd() + ); + + $crawler = self::$DI['client']->request('POST', '/prod/feeds/entry/' . $entry->getId() . '/update/', $params); + $this->assertTrue(self::$DI['client']->getResponse()->isOk()); + + $newItem1 = self::$DI['app']['EM']->getRepository('Entities\FeedItem')->find($item1->getId()); + $newItem2 = self::$DI['app']['EM']->getRepository('Entities\FeedItem')->find($item2->getId()); + + $this->assertEquals($ord1, (int) $newItem2->getOrd()); + $this->assertEquals($ord2, (int) $newItem1->getOrd()); + } + public function testDelete() { $entry = $this->insertOneFeedEntry(self::$DI['user']); From 946240c5c5ec0d2ae8abceca7cd4718111a2ec74 Mon Sep 17 00:00:00 2001 From: Andrey Date: Wed, 19 Jun 2013 16:29:10 +0200 Subject: [PATCH 26/67] Fixed codestyle with cs-fixer --- lib/Alchemy/Phrasea/Feed/Aggregate.php | 7 +- lib/Alchemy/Phrasea/Feed/AggregateToken.php | 6 +- .../Phrasea/Feed/Formatter/AtomFormatter.php | 2 +- lib/Doctrine/Entities/Feed.php | 3 +- .../Proxies/__CG__EntitiesLazaretCheck.php | 106 ---------- .../__CG__EntitiesValidationParticipant.php | 196 ------------------ .../Repositories/OrderElementRepository.php | 2 +- .../Repositories/SessionRepository.php | 31 ++- .../Phrasea/Controller/Root/RSSFeedTest.php | 2 - .../Feed/AggregateLinkGeneratorTest.php | 3 +- .../Phrasea/Feed/FeedLinkGeneratorTest.php | 6 +- 11 files changed, 38 insertions(+), 326 deletions(-) delete mode 100644 lib/Doctrine/Proxies/__CG__EntitiesLazaretCheck.php delete mode 100644 lib/Doctrine/Proxies/__CG__EntitiesValidationParticipant.php diff --git a/lib/Alchemy/Phrasea/Feed/Aggregate.php b/lib/Alchemy/Phrasea/Feed/Aggregate.php index ca1a347d7b..ea83dab3c2 100644 --- a/lib/Alchemy/Phrasea/Feed/Aggregate.php +++ b/lib/Alchemy/Phrasea/Feed/Aggregate.php @@ -40,8 +40,8 @@ class Aggregate implements FeedInterface private $em; /** - * @param EntityManager $em - * @param array $feeds + * @param EntityManager $em + * @param array $feeds * @param AggregateToken $token * * @return Aggregate @@ -86,7 +86,7 @@ class Aggregate implements FeedInterface * Creates an aggregate from given Feed id array. * * @param EntityManager $em - * @param array $feed_ids + * @param array $feed_ids * * @return Aggregate */ @@ -214,6 +214,7 @@ class Aggregate implements FeedInterface if (0 > $page && $page <= $count / $pageSize) { return true; } + return false; } diff --git a/lib/Alchemy/Phrasea/Feed/AggregateToken.php b/lib/Alchemy/Phrasea/Feed/AggregateToken.php index 175c793154..96edf496c0 100644 --- a/lib/Alchemy/Phrasea/Feed/AggregateToken.php +++ b/lib/Alchemy/Phrasea/Feed/AggregateToken.php @@ -40,7 +40,7 @@ class AggregateToken /** * Set usr_id * - * @param integer $usrId + * @param integer $usrId * @return AggregateToken */ public function setUsrId($usrId) @@ -63,7 +63,7 @@ class AggregateToken /** * Set feed * - * @param Aggregate $feed + * @param Aggregate $feed * @return AggregateToken */ public function setFeed(\Entities\Feed $feed = null) @@ -90,7 +90,7 @@ class AggregateToken /** * Set value * - * @param string $value + * @param string $value * @return AggregateToken */ public function setValue($value) diff --git a/lib/Alchemy/Phrasea/Feed/Formatter/AtomFormatter.php b/lib/Alchemy/Phrasea/Feed/Formatter/AtomFormatter.php index 8b6a57acd3..6498cd4beb 100644 --- a/lib/Alchemy/Phrasea/Feed/Formatter/AtomFormatter.php +++ b/lib/Alchemy/Phrasea/Feed/Formatter/AtomFormatter.php @@ -156,7 +156,7 @@ class AtomFormatter extends FeedFormatterAbstract implements FeedFormatterInterf if ($entry->getAuthorName()) { $this->addTag($document, $author, 'name', $entry->getAuthorName()); } - + $this->addTag($document, $entry_node, 'content', $entry->getSubtitle()); foreach ($entry->getItems() as $content) { diff --git a/lib/Doctrine/Entities/Feed.php b/lib/Doctrine/Entities/Feed.php index b4d2eea8ad..62b0cc5595 100644 --- a/lib/Doctrine/Entities/Feed.php +++ b/lib/Doctrine/Entities/Feed.php @@ -280,7 +280,7 @@ class Feed implements FeedInterface /** * Returns the collection to which the feed belongs. * - * @param Application $app + * @param Application $app * * @return type */ @@ -524,6 +524,7 @@ class Feed implements FeedInterface if (0 > $page && $page <= $count / $pageSize) { return true; } + return false; } } diff --git a/lib/Doctrine/Proxies/__CG__EntitiesLazaretCheck.php b/lib/Doctrine/Proxies/__CG__EntitiesLazaretCheck.php deleted file mode 100644 index 0f5f7fb556..0000000000 --- a/lib/Doctrine/Proxies/__CG__EntitiesLazaretCheck.php +++ /dev/null @@ -1,106 +0,0 @@ -_entityPersister = $entityPersister; - $this->_identifier = $identifier; - } - /** @private */ - public function __load() - { - if (!$this->__isInitialized__ && $this->_entityPersister) { - $this->__isInitialized__ = true; - - if (method_exists($this, "__wakeup")) { - // call this after __isInitialized__to avoid infinite recursion - // but before loading to emulate what ClassMetadata::newInstance() - // provides. - $this->__wakeup(); - } - - if ($this->_entityPersister->load($this->_identifier, $this) === null) { - throw new \Doctrine\ORM\EntityNotFoundException(); - } - unset($this->_entityPersister, $this->_identifier); - } - } - - /** @private */ - public function __isInitialized() - { - return $this->__isInitialized__; - } - - - public function getId() - { - if ($this->__isInitialized__ === false) { - return (int) $this->_identifier["id"]; - } - $this->__load(); - return parent::getId(); - } - - public function setCheckClassname($checkClassname) - { - $this->__load(); - return parent::setCheckClassname($checkClassname); - } - - public function getCheckClassname() - { - $this->__load(); - return parent::getCheckClassname(); - } - - public function setLazaretFile(\Entities\LazaretFile $lazaretFile = NULL) - { - $this->__load(); - return parent::setLazaretFile($lazaretFile); - } - - public function getLazaretFile() - { - $this->__load(); - return parent::getLazaretFile(); - } - - public function getMessage() - { - $this->__load(); - return parent::getMessage(); - } - - - public function __sleep() - { - return array('__isInitialized__', 'id', 'checkClassname', 'lazaretFile'); - } - - public function __clone() - { - if (!$this->__isInitialized__ && $this->_entityPersister) { - $this->__isInitialized__ = true; - $class = $this->_entityPersister->getClassMetadata(); - $original = $this->_entityPersister->load($this->_identifier); - if ($original === null) { - throw new \Doctrine\ORM\EntityNotFoundException(); - } - foreach ($class->reflFields as $field => $reflProperty) { - $reflProperty->setValue($this, $reflProperty->getValue($original)); - } - unset($this->_entityPersister, $this->_identifier); - } - - } -} \ No newline at end of file diff --git a/lib/Doctrine/Proxies/__CG__EntitiesValidationParticipant.php b/lib/Doctrine/Proxies/__CG__EntitiesValidationParticipant.php deleted file mode 100644 index cef3296458..0000000000 --- a/lib/Doctrine/Proxies/__CG__EntitiesValidationParticipant.php +++ /dev/null @@ -1,196 +0,0 @@ -_entityPersister = $entityPersister; - $this->_identifier = $identifier; - } - /** @private */ - public function __load() - { - if (!$this->__isInitialized__ && $this->_entityPersister) { - $this->__isInitialized__ = true; - - if (method_exists($this, "__wakeup")) { - // call this after __isInitialized__to avoid infinite recursion - // but before loading to emulate what ClassMetadata::newInstance() - // provides. - $this->__wakeup(); - } - - if ($this->_entityPersister->load($this->_identifier, $this) === null) { - throw new \Doctrine\ORM\EntityNotFoundException(); - } - unset($this->_entityPersister, $this->_identifier); - } - } - - /** @private */ - public function __isInitialized() - { - return $this->__isInitialized__; - } - - - public function getId() - { - if ($this->__isInitialized__ === false) { - return (int) $this->_identifier["id"]; - } - $this->__load(); - return parent::getId(); - } - - public function setUsrId($usrId) - { - $this->__load(); - return parent::setUsrId($usrId); - } - - public function getUsrId() - { - $this->__load(); - return parent::getUsrId(); - } - - public function setUser(\User_Adapter $user) - { - $this->__load(); - return parent::setUser($user); - } - - public function getUser(\Alchemy\Phrasea\Application $app) - { - $this->__load(); - return parent::getUser($app); - } - - public function setIsAware($isAware) - { - $this->__load(); - return parent::setIsAware($isAware); - } - - public function getIsAware() - { - $this->__load(); - return parent::getIsAware(); - } - - public function setIsConfirmed($isConfirmed) - { - $this->__load(); - return parent::setIsConfirmed($isConfirmed); - } - - public function getIsConfirmed() - { - $this->__load(); - return parent::getIsConfirmed(); - } - - public function setCanAgree($canAgree) - { - $this->__load(); - return parent::setCanAgree($canAgree); - } - - public function getCanAgree() - { - $this->__load(); - return parent::getCanAgree(); - } - - public function setCanSeeOthers($canSeeOthers) - { - $this->__load(); - return parent::setCanSeeOthers($canSeeOthers); - } - - public function getCanSeeOthers() - { - $this->__load(); - return parent::getCanSeeOthers(); - } - - public function setReminded($reminded) - { - $this->__load(); - return parent::setReminded($reminded); - } - - public function getReminded() - { - $this->__load(); - return parent::getReminded(); - } - - public function addData(\Entities\ValidationData $datas) - { - $this->__load(); - return parent::addData($datas); - } - - public function removeData(\Entities\ValidationData $datas) - { - $this->__load(); - return parent::removeData($datas); - } - - public function getDatas() - { - $this->__load(); - return parent::getDatas(); - } - - public function setSession(\Entities\ValidationSession $session = NULL) - { - $this->__load(); - return parent::setSession($session); - } - - public function getSession() - { - $this->__load(); - return parent::getSession(); - } - - public function isReleasable() - { - $this->__load(); - return parent::isReleasable(); - } - - - public function __sleep() - { - return array('__isInitialized__', 'id', 'usr_id', 'is_aware', 'is_confirmed', 'can_agree', 'can_see_others', 'reminded', 'datas', 'session'); - } - - public function __clone() - { - if (!$this->__isInitialized__ && $this->_entityPersister) { - $this->__isInitialized__ = true; - $class = $this->_entityPersister->getClassMetadata(); - $original = $this->_entityPersister->load($this->_identifier); - if ($original === null) { - throw new \Doctrine\ORM\EntityNotFoundException(); - } - foreach ($class->reflFields as $field => $reflProperty) { - $reflProperty->setValue($this, $reflProperty->getValue($original)); - } - unset($this->_entityPersister, $this->_identifier); - } - - } -} \ No newline at end of file diff --git a/lib/Doctrine/Repositories/OrderElementRepository.php b/lib/Doctrine/Repositories/OrderElementRepository.php index 424cd60c2f..0aa3eaed4b 100644 --- a/lib/Doctrine/Repositories/OrderElementRepository.php +++ b/lib/Doctrine/Repositories/OrderElementRepository.php @@ -17,7 +17,7 @@ class OrderElementRepository extends EntityRepository /** * Finds a FeedPublisher based on a given Feed and a User_Adapter. * - * @param Feed $feed + * @param Feed $feed * @param \User_Adapter $user * * @return FeedPublisher diff --git a/lib/Doctrine/Repositories/SessionRepository.php b/lib/Doctrine/Repositories/SessionRepository.php index cd2ee6832c..d4a5d8a268 100644 --- a/lib/Doctrine/Repositories/SessionRepository.php +++ b/lib/Doctrine/Repositories/SessionRepository.php @@ -4,6 +4,7 @@ namespace Repositories; use Alchemy\Phrasea\Application; use Doctrine\ORM\EntityRepository; +use Entities\Feed; /** * SessionRepository @@ -14,9 +15,9 @@ use Doctrine\ORM\EntityRepository; class SessionRepository extends EntityRepository { /** + * Returns all the feeds a user can access. * * @param User_Adapter $user - * * @return \Doctrine\Common\Collections\Collection */ public function getAllForUser(\User_Adapter $user) @@ -35,11 +36,15 @@ class SessionRepository extends EntityRepository ORDER BY f.updated_on DESC'; $query = $this->_em->createQuery($dql); - $feeds = $query->getResult(); - return $feeds; + return $query->getResult(); } + /** + * Returns all the public feeds. + * + * @return Collection + */ public function findAllPublic() { $dql = 'SELECT f FROM Entities\Feed f @@ -47,11 +52,18 @@ class SessionRepository extends EntityRepository ORDER BY f.updated_on DESC'; $query = $this->_em->createQuery($dql); - $feeds = $query->getResult(); - return $feeds; + return $query->getResult(); } + /** + * Returns the given feed if the user can access to it. + * + * @param Application $app + * @param \User_Adapter $user + * @param type $id + * @return Feed + */ public function loadWithUser(Application $app, \User_Adapter $user, $id) { $feed = $this->find($id); @@ -67,6 +79,12 @@ class SessionRepository extends EntityRepository return null; } + /** + * Returns all the feeds from a given array containing their id. + * + * @param array $feed_id + * @return Collection + */ public function findByIdArray(array $feed_id) { $dql = 'SELECT f FROM Entities\Feed f @@ -74,8 +92,7 @@ class SessionRepository extends EntityRepository WHERE f.id IN (' . implode(",", $feed_id) . ')'; $query = $this->_em->createQuery($dql); - $feeds = $query->getResult(); - return $feeds; + return $query->getResult(); } } diff --git a/tests/Alchemy/Tests/Phrasea/Controller/Root/RSSFeedTest.php b/tests/Alchemy/Tests/Phrasea/Controller/Root/RSSFeedTest.php index 4e05f601d5..3ddaac7e6f 100644 --- a/tests/Alchemy/Tests/Phrasea/Controller/Root/RSSFeedTest.php +++ b/tests/Alchemy/Tests/Phrasea/Controller/Root/RSSFeedTest.php @@ -5,11 +5,9 @@ namespace Alchemy\Tests\Phrasea\Controller\Root; require_once __DIR__ . '/../../../../../classes/FeedValidator.inc'; use Alchemy\Phrasea\Application; -use Alchemy\Phrasea\Feed\Aggregate; use Entities\Feed; use Entities\FeedEntry; use Entities\FeedItem; -use Alchemy\Phrasea\Feed\FeedLink; use Symfony\Component\HttpFoundation\Response; class RssFeedTest extends \PhraseanetWebTestCaseAbstract diff --git a/tests/Alchemy/Tests/Phrasea/Feed/AggregateLinkGeneratorTest.php b/tests/Alchemy/Tests/Phrasea/Feed/AggregateLinkGeneratorTest.php index ad5e7424cc..8d58c0d815 100644 --- a/tests/Alchemy/Tests/Phrasea/Feed/AggregateLinkGeneratorTest.php +++ b/tests/Alchemy/Tests/Phrasea/Feed/AggregateLinkGeneratorTest.php @@ -52,8 +52,7 @@ class AggregateLinkGeneratorTest extends \PhraseanetPHPUnitAbstract if ($format == "atom") { $this->assertSame("application/atom+xml", $link->getMimetype()); $this->assertSame("AGGREGATE - Atom", $link->getTitle()); - } - elseif ($format == "rss") { + } elseif ($format == "rss") { $this->assertSame("application/rss+xml", $link->getMimetype()); $this->assertSame("AGGREGATE - RSS", $link->getTitle()); } diff --git a/tests/Alchemy/Tests/Phrasea/Feed/FeedLinkGeneratorTest.php b/tests/Alchemy/Tests/Phrasea/Feed/FeedLinkGeneratorTest.php index 90e417a925..20bd194795 100644 --- a/tests/Alchemy/Tests/Phrasea/Feed/FeedLinkGeneratorTest.php +++ b/tests/Alchemy/Tests/Phrasea/Feed/FeedLinkGeneratorTest.php @@ -44,8 +44,7 @@ class FeedLinkGeneratorTest extends \PhraseanetPHPUnitAbstract if ($format == "atom") { $this->assertSame("application/atom+xml", $link->getMimetype()); $this->assertSame("Title - Atom", $link->getTitle()); - } - elseif ($format == "rss") { + } elseif ($format == "rss") { $this->assertSame("application/rss+xml", $link->getMimetype()); $this->assertSame("Title - RSS", $link->getTitle()); } @@ -133,8 +132,7 @@ class FeedLinkGeneratorTest extends \PhraseanetPHPUnitAbstract if ($format == "atom") { $this->assertSame("application/atom+xml", $link->getMimetype()); $this->assertSame("Title - Atom", $link->getTitle()); - } - elseif ($format == "rss") { + } elseif ($format == "rss") { $this->assertSame("application/rss+xml", $link->getMimetype()); $this->assertSame("Title - RSS", $link->getTitle()); } From 0b7819107677e93729a045bcb41a61af6a9c8033 Mon Sep 17 00:00:00 2001 From: Andrey Date: Wed, 19 Jun 2013 16:33:23 +0200 Subject: [PATCH 27/67] Add forgotten headers --- lib/Doctrine/Entities/AggregateToken.php | 9 +++++++++ lib/Doctrine/Entities/Feed.php | 9 +++++++++ lib/Doctrine/Entities/FeedEntry.php | 9 +++++++++ lib/Doctrine/Entities/FeedItem.php | 9 +++++++++ lib/Doctrine/Entities/FeedPublisher.php | 9 +++++++++ lib/Doctrine/Entities/FeedToken.php | 9 +++++++++ 6 files changed, 54 insertions(+) diff --git a/lib/Doctrine/Entities/AggregateToken.php b/lib/Doctrine/Entities/AggregateToken.php index 3b92c2db1b..910dd83fd7 100644 --- a/lib/Doctrine/Entities/AggregateToken.php +++ b/lib/Doctrine/Entities/AggregateToken.php @@ -1,5 +1,14 @@ Date: Wed, 31 Jul 2013 13:26:06 +0200 Subject: [PATCH 28/67] Added Doctrine annotations --- lib/Doctrine/Entities/AggregateToken.php | 16 ++++++--- lib/Doctrine/Entities/Feed.php | 44 +++++++++++++++++------- lib/Doctrine/Entities/FeedEntry.php | 37 ++++++++++++++------ lib/Doctrine/Entities/FeedItem.php | 28 ++++++++++----- lib/Doctrine/Entities/FeedPublisher.php | 19 ++++++---- lib/Doctrine/Entities/FeedToken.php | 18 +++++++--- 6 files changed, 116 insertions(+), 46 deletions(-) diff --git a/lib/Doctrine/Entities/AggregateToken.php b/lib/Doctrine/Entities/AggregateToken.php index 910dd83fd7..45a4d6f32b 100644 --- a/lib/Doctrine/Entities/AggregateToken.php +++ b/lib/Doctrine/Entities/AggregateToken.php @@ -11,23 +11,29 @@ namespace Entities; +use Doctrine\ORM\Mapping as ORM; +use Gedmo\Mapping\Annotation as Gedmo; + /** - * AggregateToken + * @ORM\Table(name="AggregateTokens") + * @ORM\Entity(repositoryClass="Repositories\AggregateTokenRepository") */ class AggregateToken { - /** - * @var integer + /** + * @ORM\Column(type="integer") + * @ORM\Id + * @ORM\GeneratedValue */ private $id; /** - * @var integer + * @ORM\Column(type="integer") */ private $usr_id; /** - * @var string + * @ORM\Column(type="string", length=128) */ private $value; diff --git a/lib/Doctrine/Entities/Feed.php b/lib/Doctrine/Entities/Feed.php index 39e6d7a8dc..dc6fa6410a 100644 --- a/lib/Doctrine/Entities/Feed.php +++ b/lib/Doctrine/Entities/Feed.php @@ -13,64 +13,84 @@ namespace Entities; use Alchemy\Phrasea\Application; use Alchemy\Phrasea\Feed\FeedInterface; +use Doctrine\ORM\Mapping as ORM; +use Gedmo\Mapping\Annotation as Gedmo; /** - * Feed + * @ORM\Table(name="Feeds") + * @ORM\Entity(repositoryClass="Repositories\FeedRepository") */ class Feed implements FeedInterface { /** - * @var integer + * @ORM\Column(type="integer") + * @ORM\Id + * @ORM\GeneratedValue */ private $id; /** - * @var boolean + * @ORM\Column(type="boolean") */ private $public = false; /** - * @var boolean + * @ORM\Column(type="boolean") */ private $icon_url = false; /** - * @var integer + * @ORM\Column(type="integer") */ private $base_id; /** - * @var string + * @ORM\Column(type="string", length=128) */ private $title; /** - * @var string + * @ORM\Column(type="string", length=128) */ private $subtitle; /** - * @var \DateTime + * @Gedmo\Timestampable(on="create") + * @ORM\Column(type="datetime") */ private $created_on; /** - * @var \DateTime + * @Gedmo\Timestampable(on="update") + * @ORM\Column(type="datetime") */ private $updated_on; /** - * @var \Doctrine\Common\Collections\Collection + * @ORM\OneToMany( + * targetEntity="FeedPublisher", + * mappedBy="feed", + * cascade=["ALL"] + * ) */ private $publishers; /** - * @var \Doctrine\Common\Collections\Collection + * @ORM\OneToMany( + * targetEntity="FeedEntry", + * mappedBy="feed", + * cascade=["ALL"] + * ) + * @ORM\OrderBy({"created_on" = "ASC"}) */ private $entries; /** - * @var \Doctrine\Common\Collections\Collection + * @ORM\OneToMany( + * targetEntity="FeedToken", + * mappedBy="feed", + * cascade=["ALL"] + * ) */ private $tokens; diff --git a/lib/Doctrine/Entities/FeedEntry.php b/lib/Doctrine/Entities/FeedEntry.php index 4aea25fd63..a87c5bb0b6 100644 --- a/lib/Doctrine/Entities/FeedEntry.php +++ b/lib/Doctrine/Entities/FeedEntry.php @@ -11,58 +11,73 @@ namespace Entities; +use Doctrine\ORM\Mapping as ORM; +use Gedmo\Mapping\Annotation as Gedmo; + /** - * FeedEntry + * @ORM\Table(name="FeedEntries") + * @ORM\Entity(repositoryClass="Repositories\FeedEntryRepository") */ class FeedEntry { /** - * @var integer + * @ORM\Column(type="integer") + * @ORM\Id + * @ORM\GeneratedValue */ private $id; /** - * @var string + * @ORM\Column(type="string", length=128) */ private $title; /** - * @var string + * @ORM\Column(type="string", length=128) */ private $subtitle; /** - * @var string + * @ORM\Column(type="string", length=128) */ private $author_name; /** - * @var string + * @ORM\Column(type="string", length=128) */ private $author_email; /** - * @var \DateTime + * @Gedmo\Timestampable(on="create") + * @ORM\Column(type="datetime") */ private $created_on; /** - * @var \DateTime + * @Gedmo\Timestampable(on="update") + * @ORM\Column(type="datetime") */ private $updated_on; /** - * @var \Doctrine\Common\Collections\Collection + * @ORM\OneToMany( + * targetEntity="FeedItem", + * mappedBy="entry", + * cascade=["ALL"] + * ) + * @ORM\OrderBy({"ord" = "ASC"}) */ private $items; /** - * @var \Entities\FeedPublisher + * @ORM\ManyToOne(targetEntity="FeedPublisher", cascade={"persist"}) + * @ORM\JoinColumn(name="publisher_id", referencedColumnName="id") */ private $publisher; /** - * @var \Entities\Feed + * @ORM\ManyToOne(targetEntity="Feed", inversedBy="entries", cascade={"persist"}) + * @ORM\JoinColumn(name="feed_id", referencedColumnName="id") */ private $feed; diff --git a/lib/Doctrine/Entities/FeedItem.php b/lib/Doctrine/Entities/FeedItem.php index 308226a2ea..83f8123e90 100644 --- a/lib/Doctrine/Entities/FeedItem.php +++ b/lib/Doctrine/Entities/FeedItem.php @@ -13,38 +13,50 @@ namespace Entities; use Alchemy\Phrasea\Application; +use Doctrine\ORM\Mapping as ORM; +use Gedmo\Mapping\Annotation as Gedmo; + /** - * FeedItem + * @ORM\Table(name="FeedItems", uniqueConstraints={@ORM\UniqueConstraint(name="lookup_unique_idx", columns={ + * "entry_id","sbas_id","record_id" + * }}) + * @ORM\Entity(repositoryClass="Repositories\FeedItemRepository") + * @HasLifecycleCallbacks */ class FeedItem { /** - * @var integer + * @ORM\Column(type="integer") + * @ORM\Id + * @ORM\GeneratedValue */ private $id; /** - * @var integer + * @ORM\Column(type="integer") */ private $record_id; /** - * @var integer + * @ORM\Column(type="integer") */ private $sbas_id; /** - * @var \DateTime + * @Gedmo\Timestampable(on="create") + * @ORM\Column(type="datetime") */ private $created_on; /** - * @var \DateTime + * @Gedmo\Timestampable(on="update") + * @ORM\Column(type="datetime") */ private $updated_on; /** - * @var \Entities\FeedEntry + * @ORM\ManyToOne(targetEntity="FeedEntry", inversedBy="items", cascade={"persist"}) + * @ORM\JoinColumn(name="items", referencedColumnName="id") */ private $entry; @@ -201,7 +213,7 @@ class FeedItem } /** - * Marks this item as the last added. + * @PrePersist */ public function setLastInFeedItem() { diff --git a/lib/Doctrine/Entities/FeedPublisher.php b/lib/Doctrine/Entities/FeedPublisher.php index 585746d7e4..1e261da02b 100644 --- a/lib/Doctrine/Entities/FeedPublisher.php +++ b/lib/Doctrine/Entities/FeedPublisher.php @@ -12,34 +12,41 @@ namespace Entities; use Alchemy\Phrasea\Application; +use Doctrine\ORM\Mapping as ORM; +use Gedmo\Mapping\Annotation as Gedmo; /** - * FeedPublisher + * @ORM\Table(name="FeedPublishers") + * @ORM\Entity(repositoryClass="Repositories\FeedPublisherRepository") */ class FeedPublisher { /** - * @var integer + * @ORM\Column(type="integer") + * @ORM\Id + * @ORM\GeneratedValue */ private $id; /** - * @var integer + * @ORM\Column(type="integer") */ private $usr_id; /** - * @var boolean + * @ORM\Column(type="boolean") */ private $owner = false; /** - * @var \DateTime + * @Gedmo\Timestampable(on="create") + * @ORM\Column(type="datetime") */ private $created_on; /** - * @var \Entities\Feed + * @ORM\ManyToOne(targetEntity="Feed", inversedBy="publishers", cascade={"persist"}) + * @ORM\JoinColumn(name="feed_id", referencedColumnName="id") */ private $feed; diff --git a/lib/Doctrine/Entities/FeedToken.php b/lib/Doctrine/Entities/FeedToken.php index 706513d8a9..704e9104b3 100644 --- a/lib/Doctrine/Entities/FeedToken.php +++ b/lib/Doctrine/Entities/FeedToken.php @@ -11,20 +11,30 @@ namespace Entities; +use Doctrine\ORM\Mapping as ORM; +use Gedmo\Mapping\Annotation as Gedmo; + +/** + * @ORM\Table(name="FeedTokens") + * @ORM\Entity(repositoryClass="Repositories\FeedTokenRepository") + */ class FeedToken { /** - * @var integer + * @ORM\Column(type="integer") + * @ORM\Id + * @ORM\GeneratedValue */ private $id; /** - * @var integer + * @ORM\Column(type="integer") */ private $usr_id; /** - * @var \Entities\Feed + * @ORM\ManyToOne(targetEntity="Feed", inversedBy="tokens", cascade={"persist"}) + * @ORM\JoinColumn(name="feed_id", referencedColumnName="id") */ private $feed; @@ -84,7 +94,7 @@ class FeedToken return $this->feed; } /** - * @var string + * @ORM\Column(type="string", length=128) */ private $value; From 718eb4866967f0792d3fc9f33ebc0832e22e88f1 Mon Sep 17 00:00:00 2001 From: Andrey Date: Tue, 6 Aug 2013 16:47:20 +0200 Subject: [PATCH 29/67] Corrected incoherences in entities --- lib/Doctrine/Entities/AggregateToken.php | 2 +- lib/Doctrine/Entities/Feed.php | 22 +++++----------------- lib/Doctrine/Entities/FeedEntry.php | 6 +----- lib/Doctrine/Entities/FeedItem.php | 13 ++++++------- lib/Doctrine/Entities/FeedToken.php | 9 +++++---- 5 files changed, 18 insertions(+), 34 deletions(-) diff --git a/lib/Doctrine/Entities/AggregateToken.php b/lib/Doctrine/Entities/AggregateToken.php index 45a4d6f32b..3956e51c18 100644 --- a/lib/Doctrine/Entities/AggregateToken.php +++ b/lib/Doctrine/Entities/AggregateToken.php @@ -33,7 +33,7 @@ class AggregateToken private $usr_id; /** - * @ORM\Column(type="string", length=128) + * @ORM\Column(type="string", length=12, nullable=true) */ private $value; diff --git a/lib/Doctrine/Entities/Feed.php b/lib/Doctrine/Entities/Feed.php index dc6fa6410a..5d17381901 100644 --- a/lib/Doctrine/Entities/Feed.php +++ b/lib/Doctrine/Entities/Feed.php @@ -40,7 +40,7 @@ class Feed implements FeedInterface private $icon_url = false; /** - * @ORM\Column(type="integer") + * @ORM\Column(type="integer", nullable=true) */ private $base_id; @@ -50,7 +50,7 @@ class Feed implements FeedInterface private $title; /** - * @ORM\Column(type="string", length=128) + * @ORM\Column(type="string", length=1024, nullable=true) */ private $subtitle; @@ -67,30 +67,18 @@ class Feed implements FeedInterface private $updated_on; /** - * @ORM\OneToMany( - * targetEntity="FeedPublisher", - * mappedBy="feed", - * cascade=["ALL"] - * ) + * @ORM\OneToMany(targetEntity="FeedPublisher", mappedBy="feed", cascade={"ALL"}) */ private $publishers; /** - * @ORM\OneToMany( - * targetEntity="FeedEntry", - * mappedBy="feed", - * cascade=["ALL"] - * ) + * @ORM\OneToMany(targetEntity="FeedEntry", mappedBy="feed", cascade={"ALL"}) * @ORM\OrderBy({"created_on" = "ASC"}) */ private $entries; /** - * @ORM\OneToMany( - * targetEntity="FeedToken", - * mappedBy="feed", - * cascade=["ALL"] - * ) + * @ORM\OneToMany(targetEntity="FeedToken", mappedBy="feed", cascade={"ALL"}) */ private $tokens; diff --git a/lib/Doctrine/Entities/FeedEntry.php b/lib/Doctrine/Entities/FeedEntry.php index a87c5bb0b6..6c21006d0e 100644 --- a/lib/Doctrine/Entities/FeedEntry.php +++ b/lib/Doctrine/Entities/FeedEntry.php @@ -60,11 +60,7 @@ class FeedEntry private $updated_on; /** - * @ORM\OneToMany( - * targetEntity="FeedItem", - * mappedBy="entry", - * cascade=["ALL"] - * ) + * @ORM\OneToMany(targetEntity="FeedItem", mappedBy="entry", cascade={"ALL"}) * @ORM\OrderBy({"ord" = "ASC"}) */ private $items; diff --git a/lib/Doctrine/Entities/FeedItem.php b/lib/Doctrine/Entities/FeedItem.php index 83f8123e90..a23135cfb5 100644 --- a/lib/Doctrine/Entities/FeedItem.php +++ b/lib/Doctrine/Entities/FeedItem.php @@ -17,9 +17,7 @@ use Doctrine\ORM\Mapping as ORM; use Gedmo\Mapping\Annotation as Gedmo; /** - * @ORM\Table(name="FeedItems", uniqueConstraints={@ORM\UniqueConstraint(name="lookup_unique_idx", columns={ - * "entry_id","sbas_id","record_id" - * }}) + * @ORM\Table(name="FeedItems", uniqueConstraints={@ORM\UniqueConstraint(name="lookup_unique_idx", columns={"entry_id","sbas_id","record_id"})}) * @ORM\Entity(repositoryClass="Repositories\FeedItemRepository") * @HasLifecycleCallbacks */ @@ -42,6 +40,11 @@ class FeedItem */ private $sbas_id; + /** + * @ORM\Column(type="integer") + */ + private $ord; + /** * @Gedmo\Timestampable(on="create") * @ORM\Column(type="datetime") @@ -138,10 +141,6 @@ class FeedItem { return $this->entry; } - /** - * @var integer - */ - private $ord; /** * Set ord diff --git a/lib/Doctrine/Entities/FeedToken.php b/lib/Doctrine/Entities/FeedToken.php index 704e9104b3..b8a12206cb 100644 --- a/lib/Doctrine/Entities/FeedToken.php +++ b/lib/Doctrine/Entities/FeedToken.php @@ -32,6 +32,11 @@ class FeedToken */ private $usr_id; + /** + * @ORM\Column(type="string", length=12, nullable=true) + */ + private $value; + /** * @ORM\ManyToOne(targetEntity="Feed", inversedBy="tokens", cascade={"persist"}) * @ORM\JoinColumn(name="feed_id", referencedColumnName="id") @@ -93,10 +98,6 @@ class FeedToken { return $this->feed; } - /** - * @ORM\Column(type="string", length=128) - */ - private $value; /** * Set value From 4e58500fe96c96f76e50bf1c2a3d7c94d31876de Mon Sep 17 00:00:00 2001 From: Andrey Date: Wed, 7 Aug 2013 11:12:57 +0200 Subject: [PATCH 30/67] Added forgotten namespace in feeditem --- lib/Doctrine/Entities/FeedItem.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/Doctrine/Entities/FeedItem.php b/lib/Doctrine/Entities/FeedItem.php index a23135cfb5..b27935a27b 100644 --- a/lib/Doctrine/Entities/FeedItem.php +++ b/lib/Doctrine/Entities/FeedItem.php @@ -19,7 +19,7 @@ use Gedmo\Mapping\Annotation as Gedmo; /** * @ORM\Table(name="FeedItems", uniqueConstraints={@ORM\UniqueConstraint(name="lookup_unique_idx", columns={"entry_id","sbas_id","record_id"})}) * @ORM\Entity(repositoryClass="Repositories\FeedItemRepository") - * @HasLifecycleCallbacks + * @ORM\HasLifecycleCallbacks */ class FeedItem { From 85aa5959bd4c3492dda975980895b957aedd5c94 Mon Sep 17 00:00:00 2001 From: Andrey Date: Wed, 7 Aug 2013 11:23:39 +0200 Subject: [PATCH 31/67] Fixed minor mapping errors Fixed mapping error in FeedItem Fixed merging error --- lib/Doctrine/Entities/FeedItem.php | 4 ++-- tests/Alchemy/Tests/Phrasea/Application/OverviewTest.php | 4 ---- 2 files changed, 2 insertions(+), 6 deletions(-) diff --git a/lib/Doctrine/Entities/FeedItem.php b/lib/Doctrine/Entities/FeedItem.php index b27935a27b..e806aa723a 100644 --- a/lib/Doctrine/Entities/FeedItem.php +++ b/lib/Doctrine/Entities/FeedItem.php @@ -59,7 +59,7 @@ class FeedItem /** * @ORM\ManyToOne(targetEntity="FeedEntry", inversedBy="items", cascade={"persist"}) - * @ORM\JoinColumn(name="items", referencedColumnName="id") + * @ORM\JoinColumn(name="entry_id", referencedColumnName="id") */ private $entry; @@ -212,7 +212,7 @@ class FeedItem } /** - * @PrePersist + * @ORM\PrePersist */ public function setLastInFeedItem() { diff --git a/tests/Alchemy/Tests/Phrasea/Application/OverviewTest.php b/tests/Alchemy/Tests/Phrasea/Application/OverviewTest.php index bfb7eef1ab..6b9be430d4 100644 --- a/tests/Alchemy/Tests/Phrasea/Application/OverviewTest.php +++ b/tests/Alchemy/Tests/Phrasea/Application/OverviewTest.php @@ -217,11 +217,7 @@ class ApplicationOverviewTest extends \PhraseanetWebTestCaseAuthenticatedAbstrac $this->assertEquals($value, $response->headers->get($name)); } -<<<<<<< HEAD $this->assertEquals(rtrim(self::$DI['app']['phraseanet.configuration']['main']['servername'], '/') . "/permalink/v1/1/". self::$DI['record_1']->get_record_id()."/caption/?token=".$token, $response->headers->get("Link")); -======= - $this->assertEquals($response->headers->get("Link"), "/permalink/v1/1/". self::$DI['record_24']->get_record_id()."/caption/?token=".$token); ->>>>>>> Rebased, fixed minor bugs $this->assertEquals(200, $response->getStatusCode()); } From 92f2ceb756a610d7bd40eee3238182cd1faa0160 Mon Sep 17 00:00:00 2001 From: Andrey Date: Thu, 8 Aug 2013 15:59:57 +0200 Subject: [PATCH 32/67] Removed extra tables from xml conf --- lib/conf.d/bases_structure.xml | 434 --------------------------------- 1 file changed, 434 deletions(-) diff --git a/lib/conf.d/bases_structure.xml b/lib/conf.d/bases_structure.xml index 187bdb4f7c..74092ee22f 100644 --- a/lib/conf.d/bases_structure.xml +++ b/lib/conf.d/bases_structure.xml @@ -2498,440 +2498,6 @@ InnoDB - - - - id - int(11) unsigned - - auto_increment - - - - - usr_id - int(11) unsigned - - - - - - - feed_id - int(11) unsigned - - - - - - - owner - tinyint(11) unsigned - YES - - - - - - created_on - datetime - - - - - - - added_by - int(11) unsigned - - - - - - - - - id - PRIMARY - - id - - - - couple - UNIQUE - - usr_id - feed_id - - - - owners - UNIQUE - - owner - feed_id - - - - InnoDB -
    - - - - - - - - id - int(11) unsigned - - auto_increment - - - - - title - varchar(128) - - - - - - - subtitle - varchar(8192) - - - - - - - created_on - datetime - - - - - - - updated_on - datetime - - - - - - - base_id - int(11) unsigned - YES - - - - - - public - tinyint(1) unsigned - - - 0 - - - - - - id - PRIMARY - - id - - - - base_id - INDEX - - base_id - - - - InnoDB -
    - - - - - - - - - - id - int(11) unsigned - - auto_increment - - - - - token - varchar(12) - - - - - - - feed_id - int(11) unsigned - YES - - - - - - usr_id - int(11) unsigned - - - - - - - aggregated - tinyint(1) unsigned - YES - - - - - - - - id - PRIMARY - - id - - - - token - INDEX - - token - - - - usr_id - INDEX - - usr_id - - - - feed_id - INDEX - - feed_id - - - - aggregated - INDEX - - aggregated - - - - unikaggregated - UNIQUE - - aggregated - usr_id - - - - unikfeed - UNIQUE - - feed_id - usr_id - - - - InnoDB -
    - - - - - - - - id - int(11) unsigned - - auto_increment - - - - - feed_id - int(11) unsigned - - - - - - - publisher - int(11) unsigned - - - - - - - title - varchar(128) - - - - - - - author_name - varchar(128) - - - - - - - author_email - varchar(128) - - - - - - - description - varchar(8192) - - - - - - - created_on - datetime - - - - - - - updated_on - datetime - - - - - - - - - id - PRIMARY - - id - - - - InnoDB -
    - - - - - - - - - id - int(11) unsigned - - auto_increment - - - - - entry_id - int(11) unsigned - - - - - - - sbas_id - int(11) unsigned - - - - - - - record_id - int(11) unsigned - - - - - - - ord - int(11) unsigned - - - - - - - - - id - PRIMARY - - id - - - - element - INDEX - - sbas_id - record_id - - - - sbas_id - INDEX - - sbas_id - - - - record_id - INDEX - - record_id - - - - InnoDB -
    From 578eab4901da38bb553a236344ca5f1a29c025a3 Mon Sep 17 00:00:00 2001 From: Andrey Date: Thu, 8 Aug 2013 16:00:26 +0200 Subject: [PATCH 33/67] Replaced record_24 with record_1 --- .../Phrasea/Application/OverviewTest.php | 36 +++++++++---------- 1 file changed, 18 insertions(+), 18 deletions(-) diff --git a/tests/Alchemy/Tests/Phrasea/Application/OverviewTest.php b/tests/Alchemy/Tests/Phrasea/Application/OverviewTest.php index 6b9be430d4..501b04c31a 100644 --- a/tests/Alchemy/Tests/Phrasea/Application/OverviewTest.php +++ b/tests/Alchemy/Tests/Phrasea/Application/OverviewTest.php @@ -9,19 +9,19 @@ class ApplicationOverviewTest extends \PhraseanetWebTestCaseAuthenticatedAbstrac { public function testDatafilesRouteAuthenticated() { - $crawler = self::$DI['client']->request('GET', '/datafiles/' . self::$DI['record_24']->get_sbas_id() . '/' . self::$DI['record_24']->get_record_id() . '/preview/'); + $crawler = self::$DI['client']->request('GET', '/datafiles/' . self::$DI['record_1']->get_sbas_id() . '/' . self::$DI['record_1']->get_record_id() . '/preview/'); $response = self::$DI['client']->getResponse(); $this->assertEquals(200, $response->getStatusCode()); $content_disposition = explode(';', $response->headers->get('content-disposition')); $this->assertEquals('inline', $content_disposition[0]); - $this->assertEquals(self::$DI['record_24']->get_preview()->get_mime(), $response->headers->get('content-type')); - $this->assertEquals(self::$DI['record_24']->get_preview()->get_size(), $response->headers->get('content-length')); + $this->assertEquals(self::$DI['record_1']->get_preview()->get_mime(), $response->headers->get('content-type')); + $this->assertEquals(self::$DI['record_1']->get_preview()->get_size(), $response->headers->get('content-length')); } public function testDatafilesNonExistentSubdef() { - self::$DI['client']->request('GET', '/datafiles/' . self::$DI['record_24']->get_sbas_id() . '/' . self::$DI['record_24']->get_record_id() . '/asubdefthatdoesnotexists/'); + self::$DI['client']->request('GET', '/datafiles/' . self::$DI['record_1']->get_sbas_id() . '/' . self::$DI['record_1']->get_record_id() . '/asubdefthatdoesnotexists/'); $this->assertNotFoundResponse(self::$DI['client']->getResponse()); } @@ -56,7 +56,7 @@ class ApplicationOverviewTest extends \PhraseanetWebTestCaseAuthenticatedAbstrac public function testDatafilesRouteNotAuthenticated() { self::$DI['app']['authentication']->closeAccount(); - self::$DI['client']->request('GET', '/datafiles/' . self::$DI['record_24']->get_sbas_id() . '/' . self::$DI['record_24']->get_record_id() . '/preview/'); + self::$DI['client']->request('GET', '/datafiles/' . self::$DI['record_1']->get_sbas_id() . '/' . self::$DI['record_1']->get_record_id() . '/preview/'); $this->assertForbiddenResponse(self::$DI['client']->getResponse()); } @@ -64,7 +64,7 @@ class ApplicationOverviewTest extends \PhraseanetWebTestCaseAuthenticatedAbstrac public function testDatafilesRouteNotAuthenticatedUnknownSubdef() { self::$DI['app']['authentication']->closeAccount(); - self::$DI['client']->request('GET', '/datafiles/' . self::$DI['record_24']->get_sbas_id() . '/' . self::$DI['record_24']->get_record_id() . '/notfoundreview/'); + self::$DI['client']->request('GET', '/datafiles/' . self::$DI['record_1']->get_sbas_id() . '/' . self::$DI['record_1']->get_record_id() . '/notfoundreview/'); $this->assertForbiddenResponse(self::$DI['client']->getResponse()); } @@ -105,7 +105,7 @@ class ApplicationOverviewTest extends \PhraseanetWebTestCaseAuthenticatedAbstrac { $this->assertTrue(self::$DI['app']['authentication']->isAuthenticated()); $token = "unexisting_token"; - $url = '/permalink/v1/' . self::$DI['record_24']->get_sbas_id() . "/" . self::$DI['record_24']->get_record_id() . '/caption/?token='.$token; + $url = '/permalink/v1/' . self::$DI['record_1']->get_sbas_id() . "/" . self::$DI['record_1']->get_record_id() . '/caption/?token='.$token; $crawler = self::$DI['client']->request('GET', $url); $response = self::$DI['client']->getResponse(); @@ -158,8 +158,8 @@ class ApplicationOverviewTest extends \PhraseanetWebTestCaseAuthenticatedAbstrac protected function get_a_caption(array $headers = array()) { - $token = self::$DI['record_24']->get_thumbnail()->get_permalink()->get_token(); - $url = '/permalink/v1/' . self::$DI['record_24']->get_sbas_id() . "/" . self::$DI['record_24']->get_record_id() . '/caption/?token='.$token; + $token = self::$DI['record_1']->get_thumbnail()->get_permalink()->get_token(); + $url = '/permalink/v1/' . self::$DI['record_1']->get_sbas_id() . "/" . self::$DI['record_1']->get_record_id() . '/caption/?token='.$token; $crawler = self::$DI['client']->request('GET', $url); $response = self::$DI['client']->getResponse(); @@ -168,15 +168,15 @@ class ApplicationOverviewTest extends \PhraseanetWebTestCaseAuthenticatedAbstrac $this->assertEquals($value, $response->headers->get($name)); } - $caption = self::$DI['record_24']->get_caption()->serialize(\caption_record::SERIALIZE_JSON); + $caption = self::$DI['record_1']->get_caption()->serialize(\caption_record::SERIALIZE_JSON); $this->assertEquals($caption, $response->getContent()); $this->assertEquals(200, $response->getStatusCode()); } protected function get_a_permalinkBCcompatibility(array $headers = array()) { - $token = self::$DI['record_24']->get_preview()->get_permalink()->get_token(); - $url = '/permalink/v1/whateverIwannt/' . self::$DI['record_24']->get_sbas_id() . '/' . self::$DI['record_24']->get_record_id() . '/' . $token . '/preview/'; + $token = self::$DI['record_1']->get_preview()->get_permalink()->get_token(); + $url = '/permalink/v1/whateverIwannt/' . self::$DI['record_1']->get_sbas_id() . '/' . self::$DI['record_1']->get_record_id() . '/' . $token . '/preview/'; $crawler = self::$DI['client']->request('GET', $url); $response = self::$DI['client']->getResponse(); @@ -191,8 +191,8 @@ class ApplicationOverviewTest extends \PhraseanetWebTestCaseAuthenticatedAbstrac protected function get_a_permaviewBCcompatibility(array $headers = array()) { - $token = self::$DI['record_24']->get_preview()->get_permalink()->get_token(); - $url = '/permalink/v1/whateverIwannt/' . self::$DI['record_24']->get_sbas_id() . '/' . self::$DI['record_24']->get_record_id() . '/' . $token . '/preview/'; + $token = self::$DI['record_1']->get_preview()->get_permalink()->get_token(); + $url = '/permalink/v1/whateverIwannt/' . self::$DI['record_1']->get_sbas_id() . '/' . self::$DI['record_1']->get_record_id() . '/' . $token . '/preview/'; $url = $url . 'view/'; $crawler = self::$DI['client']->request('GET', $url); @@ -207,8 +207,8 @@ class ApplicationOverviewTest extends \PhraseanetWebTestCaseAuthenticatedAbstrac protected function get_a_permalink(array $headers = array()) { - $token = self::$DI['record_24']->get_preview()->get_permalink()->get_token(); - $url = '/permalink/v1/' . self::$DI['record_24']->get_sbas_id() . '/' . self::$DI['record_24']->get_record_id() . '/preview/whateverIwannt.jpg?token=' . $token . ''; + $token = self::$DI['record_1']->get_preview()->get_permalink()->get_token(); + $url = '/permalink/v1/' . self::$DI['record_1']->get_sbas_id() . '/' . self::$DI['record_1']->get_record_id() . '/preview/whateverIwannt.jpg?token=' . $token . ''; $crawler = self::$DI['client']->request('GET', $url); $response = self::$DI['client']->getResponse(); @@ -223,8 +223,8 @@ class ApplicationOverviewTest extends \PhraseanetWebTestCaseAuthenticatedAbstrac protected function get_a_permaview(array $headers = array()) { - $token = self::$DI['record_24']->get_preview()->get_permalink()->get_token(); - $url = '/permalink/v1/' . self::$DI['record_24']->get_sbas_id() . '/' . self::$DI['record_24']->get_record_id() . '/preview/?token=' . $token . ''; + $token = self::$DI['record_1']->get_preview()->get_permalink()->get_token(); + $url = '/permalink/v1/' . self::$DI['record_1']->get_sbas_id() . '/' . self::$DI['record_1']->get_record_id() . '/preview/?token=' . $token . ''; $crawler = self::$DI['client']->request('GET', $url); $response = self::$DI['client']->getResponse(); From 7796c55ab7b22e1c717b5a7ac7fe8a6f51c46cb3 Mon Sep 17 00:00:00 2001 From: Andrey Date: Thu, 8 Aug 2013 16:18:15 +0200 Subject: [PATCH 34/67] Renamed and fixed entry update/delete bindings --- lib/Alchemy/Phrasea/Controller/Prod/Feed.php | 2 +- templates/web/prod/feeds/entry_macro.html.twig | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/lib/Alchemy/Phrasea/Controller/Prod/Feed.php b/lib/Alchemy/Phrasea/Controller/Prod/Feed.php index 9929a05e00..690b126336 100644 --- a/lib/Alchemy/Phrasea/Controller/Prod/Feed.php +++ b/lib/Alchemy/Phrasea/Controller/Prod/Feed.php @@ -203,7 +203,7 @@ class Feed implements ControllerProviderInterface return $app->json($datas); }) - ->bind('feed_entry_delete') + ->bind('prod_feeds_entry_delete') ->assert('id', '\d+')->before(function(Request $request) use ($app) { $app['firewall']->requireRight('bas_chupub'); }); diff --git a/templates/web/prod/feeds/entry_macro.html.twig b/templates/web/prod/feeds/entry_macro.html.twig index 6b856d65e6..cba0e2d12f 100644 --- a/templates/web/prod/feeds/entry_macro.html.twig +++ b/templates/web/prod/feeds/entry_macro.html.twig @@ -20,10 +20,10 @@
    {% if entry.getFeed().isOwner(app['authentication'].getUser()) or entry.isPublisher(app['authentication'].getUser()) %} - + - + {% endif %} From f8c40417335a440f06ffce159a145462e10dfb4a Mon Sep 17 00:00:00 2001 From: Andrey Date: Thu, 8 Aug 2013 16:58:00 +0200 Subject: [PATCH 35/67] Removed yaml files --- .../Doctrine/Entities.AggregateToken.dcm.yml | 19 --------------- .../Doctrine/Entities.FeedToken.dcm.yml | 24 ------------------- 2 files changed, 43 deletions(-) delete mode 100644 lib/conf.d/Doctrine/Entities.AggregateToken.dcm.yml delete mode 100644 lib/conf.d/Doctrine/Entities.FeedToken.dcm.yml diff --git a/lib/conf.d/Doctrine/Entities.AggregateToken.dcm.yml b/lib/conf.d/Doctrine/Entities.AggregateToken.dcm.yml deleted file mode 100644 index 67851464a5..0000000000 --- a/lib/conf.d/Doctrine/Entities.AggregateToken.dcm.yml +++ /dev/null @@ -1,19 +0,0 @@ -Entities\AggregateToken: - type: entity - repositoryClass: Repositories\AggregateTokenRepository - table: AggregateTokens - uniqueConstraints: - unique_aggregate_token_index: - columns: usr_id - id: - id: - type: integer - generator: - strategy: AUTO - fields: - usr_id: - type: integer - value: - type: string - length: 12 - nullable: true diff --git a/lib/conf.d/Doctrine/Entities.FeedToken.dcm.yml b/lib/conf.d/Doctrine/Entities.FeedToken.dcm.yml deleted file mode 100644 index c4efc5b43e..0000000000 --- a/lib/conf.d/Doctrine/Entities.FeedToken.dcm.yml +++ /dev/null @@ -1,24 +0,0 @@ -Entities\FeedToken: - type: entity - repositoryClass: Repositories\FeedTokenRepository - table: FeedTokens - id: - id: - type: integer - generator: - strategy: AUTO - fields: - usr_id: - type: integer - value: - type: string - length: 12 - nullable: true - manyToOne: - feed: - targetEntity: Feed - inversedBy: tokens - joinColumn: - name: feed_id - referencedColumnName: id - cascade: ["persist"] From cedd924e317c6345dd813cc44573922b198a4bb9 Mon Sep 17 00:00:00 2001 From: Andrey Date: Tue, 13 Aug 2013 17:28:32 +0200 Subject: [PATCH 36/67] Fixed codestyle --- .../Phrasea/Controller/Admin/Publications.php | 2 -- lib/Alchemy/Phrasea/Controller/Prod/Feed.php | 20 ++++++++++--------- lib/Alchemy/Phrasea/Feed/Aggregate.php | 6 +++--- lib/Alchemy/Phrasea/Feed/FeedInterface.php | 6 +++--- lib/Doctrine/Entities/Feed.php | 7 +++---- .../Repositories/AggregateTokenRepository.php | 9 +++++++++ .../Repositories/FeedTokenRepository.php | 9 +++++++++ .../Repositories/OrderElementRepository.php | 9 +++++++++ .../Repositories/SessionModuleRepository.php | 9 +++++++++ .../Repositories/SessionRepository.php | 9 +++++++++ .../Repositories/UserSettingRepository.php | 9 +++++++++ lib/classes/eventsmanager/notify/feed.php | 1 - 12 files changed, 74 insertions(+), 22 deletions(-) diff --git a/lib/Alchemy/Phrasea/Controller/Admin/Publications.php b/lib/Alchemy/Phrasea/Controller/Admin/Publications.php index afc5520f9a..6e62116fbc 100644 --- a/lib/Alchemy/Phrasea/Controller/Admin/Publications.php +++ b/lib/Alchemy/Phrasea/Controller/Admin/Publications.php @@ -37,7 +37,6 @@ class Publications implements ControllerProviderInterface }); $controllers->get('/list/', function(PhraseaApplication $app) { - $feeds = $app['EM']->getRepository('Entities\Feed')->getAllForUser( $app['authentication']->getUser() ); @@ -47,7 +46,6 @@ class Publications implements ControllerProviderInterface })->bind('admin_feeds_list'); $controllers->post('/create/', function(PhraseaApplication $app, Request $request) { - if ('' === $title = trim($request->request->get('title', ''))) { $app->abort(400, "Bad request"); } diff --git a/lib/Alchemy/Phrasea/Controller/Prod/Feed.php b/lib/Alchemy/Phrasea/Controller/Prod/Feed.php index 690b126336..a2858c9756 100644 --- a/lib/Alchemy/Phrasea/Controller/Prod/Feed.php +++ b/lib/Alchemy/Phrasea/Controller/Prod/Feed.php @@ -134,7 +134,7 @@ class Feed implements ControllerProviderInterface $app->abort(403, 'Unathorized action'); } if ('' === $title = trim($request->request->get('title', ''))) { - $app->abort(400, "Bad request"); + $app->abort(400, "Bad request"); } $entry->setAuthorEmail($request->request->get('author_mail')) @@ -215,13 +215,11 @@ class Feed implements ControllerProviderInterface $feeds = $app['EM']->getRepository('Entities\Feed')->getAllForUser($app['authentication']->getUser()); - $datas = $app['twig']->render('prod/feeds/feeds.html.twig' - , array( - 'feeds' => $feeds - , 'feed' => new Aggregate($app['EM'], $feeds) - , 'page' => $page - ) - ); + $datas = $app['twig']->render('prod/feeds/feeds.html.twig', array( + 'feeds' => $feeds, + 'feed' => new Aggregate($app['EM'], $feeds), + 'page' => $page + )); return new Response($datas); })->bind('prod_feeds'); @@ -247,7 +245,11 @@ class Feed implements ControllerProviderInterface $aggregate = new Aggregate($app['EM'], $feeds); - $link = $app['feed.aggregate-link-generator']->generate($aggregate, $app['authentication']->getUser(), AggregateLinkGenerator::FORMAT_RSS, null, $renew); + $link = $app['feed.aggregate-link-generator']->generate($aggregate, + $app['authentication']->getUser(), + AggregateLinkGenerator::FORMAT_RSS, + null, $renew + ); $output = array( 'texte' => '

    ' . _('publication::Voici votre fil RSS personnel. Il vous permettra d\'etre tenu au courrant des publications.') diff --git a/lib/Alchemy/Phrasea/Feed/Aggregate.php b/lib/Alchemy/Phrasea/Feed/Aggregate.php index ea83dab3c2..11572d3366 100644 --- a/lib/Alchemy/Phrasea/Feed/Aggregate.php +++ b/lib/Alchemy/Phrasea/Feed/Aggregate.php @@ -204,14 +204,14 @@ class Aggregate implements FeedInterface /** * {@inheritdoc} */ - public function hasPage($page, $pageSize) + public function hasPage($pageNumber, $nbEntriesByPage) { - if (0 >= $pageSize) { + if (0 >= $nbEntriesByPage) { throw new LogicException; } $count = $this->getCountTotalEntries(); - if (0 > $page && $page <= $count / $pageSize) { + if (0 > $pageNumber && $pageNumber <= $count / $nbEntriesByPage) { return true; } diff --git a/lib/Alchemy/Phrasea/Feed/FeedInterface.php b/lib/Alchemy/Phrasea/Feed/FeedInterface.php index 3780f31a26..caf4a7db5c 100644 --- a/lib/Alchemy/Phrasea/Feed/FeedInterface.php +++ b/lib/Alchemy/Phrasea/Feed/FeedInterface.php @@ -68,10 +68,10 @@ interface FeedInterface /** * Returns a boolean indicating whether the feed has a given page. * - * @param integer $page - * @param integer $pageSize + * @param integer $pageNumber + * @param integer $nbEntriesByPage * * @return \DateTime */ - public function hasPage($page, $pageSize); + public function hasPage($pageNumber, $nbEntriesByPage); } diff --git a/lib/Doctrine/Entities/Feed.php b/lib/Doctrine/Entities/Feed.php index 5d17381901..b8bc4078f8 100644 --- a/lib/Doctrine/Entities/Feed.php +++ b/lib/Doctrine/Entities/Feed.php @@ -531,14 +531,13 @@ class Feed implements FeedInterface * * @return boolean */ - public function hasPage($page, $pageSize) + public function hasPage($pageNumber, $nbEntriesByPage) { - if (0 >= $pageSize) { + if (0 >= $nbEntriesByPage) { throw new LogicException; } - $count = $this->getCountTotalEntries(); - if (0 > $page && $page <= $count / $pageSize) { + if (0 > $pageNumber && $pageNumber <= $count / $nbEntriesByPage) { return true; } diff --git a/lib/Doctrine/Repositories/AggregateTokenRepository.php b/lib/Doctrine/Repositories/AggregateTokenRepository.php index a84ddd5b0a..7e104f3a42 100644 --- a/lib/Doctrine/Repositories/AggregateTokenRepository.php +++ b/lib/Doctrine/Repositories/AggregateTokenRepository.php @@ -1,5 +1,14 @@ broker->notify($user_to_notif->get_id(), __CLASS__, $datas, $mailed); - } $start += $perLoop; } while (count($results) > 0); From 444d45b25cea1e387dcda3eada8cc42fca1080c5 Mon Sep 17 00:00:00 2001 From: Andrey Date: Tue, 13 Aug 2013 17:39:22 +0200 Subject: [PATCH 37/67] Fixed codestyle and replaced static with self in link generator classes --- .../Phrasea/Feed/Formatter/AtomFormatter.php | 16 ++++++++-------- .../Feed/Formatter/CoolirisFormatter.php | 16 ++++++++-------- .../Phrasea/Feed/Formatter/RssFormatter.php | 18 +++++++++--------- .../Feed/Link/AggregateLinkGenerator.php | 4 ++-- .../Phrasea/Feed/Link/FeedLinkGenerator.php | 8 ++++---- 5 files changed, 31 insertions(+), 31 deletions(-) diff --git a/lib/Alchemy/Phrasea/Feed/Formatter/AtomFormatter.php b/lib/Alchemy/Phrasea/Feed/Formatter/AtomFormatter.php index 6498cd4beb..5a3ffd45c3 100644 --- a/lib/Alchemy/Phrasea/Feed/Formatter/AtomFormatter.php +++ b/lib/Alchemy/Phrasea/Feed/Formatter/AtomFormatter.php @@ -64,26 +64,26 @@ class AtomFormatter extends FeedFormatterAbstract implements FeedFormatterInterf $next = $prev = null; - if ($feed->hasPage($page + 1, static::PAGE_SIZE)) { + if ($feed->hasPage($page + 1, self::PAGE_SIZE)) { if (null === $user) { - $next = $this->linkGenerator->generatePublic($feed, static::FORMAT, $page + 1); + $next = $this->linkGenerator->generatePublic($feed, self::FORMAT, $page + 1); } else { - $next = $this->linkGenerator->generate($feed, $user, static::FORMAT, $page + 1); + $next = $this->linkGenerator->generate($feed, $user, self::FORMAT, $page + 1); } } - if ($feed->hasPage($page - 1, static::PAGE_SIZE)) { + if ($feed->hasPage($page - 1, self::PAGE_SIZE)) { if (null === $user) { - $prev = $this->linkGenerator->generatePublic($feed, static::FORMAT, $page - 1); + $prev = $this->linkGenerator->generatePublic($feed, self::FORMAT, $page - 1); } else { - $prev = $this->linkGenerator->generate($feed, $user, static::FORMAT, $page - 1); + $prev = $this->linkGenerator->generate($feed, $user, self::FORMAT, $page - 1); } } if (null !== $user) { - $feedlink = $this->linkGenerator->generate($feed, $user, static::FORMAT, $page); + $feedlink = $this->linkGenerator->generate($feed, $user, self::FORMAT, $page); } else { - $feedlink = $this->linkGenerator->generatePublic($feed, static::FORMAT, $page); + $feedlink = $this->linkGenerator->generatePublic($feed, self::FORMAT, $page); } if ($feedlink instanceof FeedLink) { diff --git a/lib/Alchemy/Phrasea/Feed/Formatter/CoolirisFormatter.php b/lib/Alchemy/Phrasea/Feed/Formatter/CoolirisFormatter.php index 3caf35f83d..0e9d91af41 100644 --- a/lib/Alchemy/Phrasea/Feed/Formatter/CoolirisFormatter.php +++ b/lib/Alchemy/Phrasea/Feed/Formatter/CoolirisFormatter.php @@ -67,9 +67,9 @@ class CoolirisFormatter extends FeedFormatterAbstract implements FeedFormatterIn $this->addTag($doc, $channel, 'description', $feed->getSubtitle()); if (null !== $user) { - $link = $this->linkGenerator->generate($feed, $user, static::FORMAT, $page); + $link = $this->linkGenerator->generate($feed, $user, self::FORMAT, $page); } else { - $link = $this->linkGenerator->generatePublic($feed, static::FORMAT, $page); + $link = $this->linkGenerator->generatePublic($feed, self::FORMAT, $page); } if ($link instanceof FeedLink) { @@ -135,19 +135,19 @@ class CoolirisFormatter extends FeedFormatterAbstract implements FeedFormatterIn $next = $prev = null; - if ($feed->hasPage($page + 1, static::PAGE_SIZE)) { + if ($feed->hasPage($page + 1, self::PAGE_SIZE)) { if (null === $user) { - $next = $this->linkGenerator->generatePublic($feed, static::FORMAT, $page + 1); + $next = $this->linkGenerator->generatePublic($feed, self::FORMAT, $page + 1); } else { - $next = $this->linkGenerator->generate($feed, $user, static::FORMAT, $page + 1); + $next = $this->linkGenerator->generate($feed, $user, self::FORMAT, $page + 1); } } - if ($feed->hasPage($page - 1, static::PAGE_SIZE)) { + if ($feed->hasPage($page - 1, self::PAGE_SIZE)) { if (null === $user) { - $prev = $this->linkGenerator->generatePublic($feed, static::FORMAT, $page - 1); + $prev = $this->linkGenerator->generatePublic($feed, self::FORMAT, $page - 1); } else { - $prev = $this->linkGenerator->generate($feed, $user, static::FORMAT, $page - 1); + $prev = $this->linkGenerator->generate($feed, $user, self::FORMAT, $page - 1); } } diff --git a/lib/Alchemy/Phrasea/Feed/Formatter/RssFormatter.php b/lib/Alchemy/Phrasea/Feed/Formatter/RssFormatter.php index de20f787d4..754f5d3ce6 100644 --- a/lib/Alchemy/Phrasea/Feed/Formatter/RssFormatter.php +++ b/lib/Alchemy/Phrasea/Feed/Formatter/RssFormatter.php @@ -52,25 +52,25 @@ class RssFormatter extends FeedFormatterAbstract implements FeedFormatterInterfa $next = $prev = null; - if ($feed->hasPage($page + 1, static::PAGE_SIZE)) { + if ($feed->hasPage($page + 1, self::PAGE_SIZE)) { if (null === $user) { - $next = $this->linkGenerator->generatePublic($feed, static::FORMAT, $page + 1); + $next = $this->linkGenerator->generatePublic($feed, self::FORMAT, $page + 1); } else { - $next = $this->linkGenerator->generate($feed, $user, static::FORMAT, $page + 1); + $next = $this->linkGenerator->generate($feed, $user, self::FORMAT, $page + 1); } } - if ($feed->hasPage($page - 1, static::PAGE_SIZE)) { + if ($feed->hasPage($page - 1, self::PAGE_SIZE)) { if (null === $user) { - $prev = $this->linkGenerator->generatePublic($feed, static::FORMAT, $page - 1); + $prev = $this->linkGenerator->generatePublic($feed, self::FORMAT, $page - 1); } else { - $prev = $this->linkGenerator->generate($feed, $user, static::FORMAT, $page - 1); + $prev = $this->linkGenerator->generate($feed, $user, self::FORMAT, $page - 1); } } if (null !== $user) { - $link = $this->linkGenerator->generate($feed, $user, static::FORMAT, $page); + $link = $this->linkGenerator->generate($feed, $user, self::FORMAT, $page); } else { - $link = $this->linkGenerator->generatePublic($feed, static::FORMAT, $page); + $link = $this->linkGenerator->generatePublic($feed, self::FORMAT, $page); } $doc = new \DOMDocument('1.0', 'UTF-8'); @@ -79,7 +79,7 @@ class RssFormatter extends FeedFormatterAbstract implements FeedFormatterInterfa $root = $this->addTag($doc, $doc, 'rss'); - $root->setAttribute('version', static::VERSION); + $root->setAttribute('version', self::VERSION); $root->setAttribute('xmlns:media', 'http://search.yahoo.com/mrss/'); $root->setAttribute('xmlns:atom', 'http://www.w3.org/2005/Atom'); $root->setAttribute('xmlns:dc', 'http://purl.org/dc/elements/1.1/'); diff --git a/lib/Alchemy/Phrasea/Feed/Link/AggregateLinkGenerator.php b/lib/Alchemy/Phrasea/Feed/Link/AggregateLinkGenerator.php index 8f5625b6d6..7fb9d562a3 100644 --- a/lib/Alchemy/Phrasea/Feed/Link/AggregateLinkGenerator.php +++ b/lib/Alchemy/Phrasea/Feed/Link/AggregateLinkGenerator.php @@ -45,7 +45,7 @@ class AggregateLinkGenerator implements LinkGeneratorInterface $params = array( 'token' => $this->getAggregateToken($user, $renew)->getValue(), 'format' => 'atom' - ); + ); if (null !== $page) { $params['page'] = $page; } @@ -59,7 +59,7 @@ class AggregateLinkGenerator implements LinkGeneratorInterface $params = array( 'token' => $this->getAggregateToken($user, $renew)->getValue(), 'format' => 'rss' - ); + ); if (null !== $page) { $params['page'] = $page; } diff --git a/lib/Alchemy/Phrasea/Feed/Link/FeedLinkGenerator.php b/lib/Alchemy/Phrasea/Feed/Link/FeedLinkGenerator.php index d720969dd9..635599b777 100644 --- a/lib/Alchemy/Phrasea/Feed/Link/FeedLinkGenerator.php +++ b/lib/Alchemy/Phrasea/Feed/Link/FeedLinkGenerator.php @@ -54,7 +54,7 @@ class FeedLinkGenerator implements LinkGeneratorInterface 'token' => $this->getFeedToken($feed, $user, $renew)->getValue(), 'id' => $feed->getId(), 'format' => 'atom' - ); + ); if (null !== $page) { $params['page'] = $page; } @@ -69,7 +69,7 @@ class FeedLinkGenerator implements LinkGeneratorInterface 'token' => $this->getFeedToken($feed, $user, $renew)->getValue(), 'id' => $feed->getId(), 'format' => 'rss' - ); + ); if (null !== $page) { $params['page'] = $page; } @@ -106,7 +106,7 @@ class FeedLinkGenerator implements LinkGeneratorInterface $params = array( 'id' => $feed->getId(), 'format' => 'atom' - ); + ); if (null !== $page) { $params['page'] = $page; } @@ -120,7 +120,7 @@ class FeedLinkGenerator implements LinkGeneratorInterface $params = array( 'id' => $feed->getId(), 'format' => 'rss' - ); + ); if (null !== $page) { $params['page'] = $page; } From c732d4139adbffb29ffe212aa9cc778a9a7a173b Mon Sep 17 00:00:00 2001 From: Andrey Date: Tue, 13 Aug 2013 18:58:41 +0200 Subject: [PATCH 38/67] Fixed exception issues --- lib/Alchemy/Phrasea/Controller/Admin/Publications.php | 4 ++++ lib/classes/eventsmanager/notify/feed.php | 6 +----- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/lib/Alchemy/Phrasea/Controller/Admin/Publications.php b/lib/Alchemy/Phrasea/Controller/Admin/Publications.php index 6e62116fbc..6d22473c64 100644 --- a/lib/Alchemy/Phrasea/Controller/Admin/Publications.php +++ b/lib/Alchemy/Phrasea/Controller/Admin/Publications.php @@ -248,6 +248,10 @@ class Publications implements ControllerProviderInterface $controllers->post('/feed/{id}/delete/', function(PhraseaApplication $app, $id) { $feed = $app["EM"]->find('Entities\Feed', $id); + if (null === $feed) { + $app->abort(404); + } + if (true === $feed->getIconURL()) { unlink($app['root.path'] . '/config/feed_' . $feed->getId() . '.jpg'); unlink('custom/feed_' . $feed->getId() . '.jpg'); diff --git a/lib/classes/eventsmanager/notify/feed.php b/lib/classes/eventsmanager/notify/feed.php index 0b9a8e5b30..6caf6ce81b 100644 --- a/lib/classes/eventsmanager/notify/feed.php +++ b/lib/classes/eventsmanager/notify/feed.php @@ -138,11 +138,7 @@ class eventsmanager_notify_feed extends eventsmanager_notifyAbstract { $sx = simplexml_load_string($datas); - try { - $entry = $this->app['EM']->getRepository('Entities\FeedEntry')->find((int) $sx->entry_id); - } catch (\Exception $e) { - return array(); - } + $entry = $this->app['EM']->getRepository('Entities\FeedEntry')->find((int) $sx->entry_id); if (null === $entry) { return array(); From 06bf968e39adc589a67def71af1035092cbaf6ca Mon Sep 17 00:00:00 2001 From: Andrey Date: Tue, 13 Aug 2013 19:11:35 +0200 Subject: [PATCH 39/67] Fixed codestyle by removing extra assignments --- .../Phrasea/Controller/Client/Root.php | 4 +--- lib/Alchemy/Phrasea/Controller/Prod/Feed.php | 20 +++++++++---------- .../Phrasea/Controller/Root/RSSFeeds.php | 6 ++---- 3 files changed, 12 insertions(+), 18 deletions(-) diff --git a/lib/Alchemy/Phrasea/Controller/Client/Root.php b/lib/Alchemy/Phrasea/Controller/Client/Root.php index 99235cbd1b..182675355f 100644 --- a/lib/Alchemy/Phrasea/Controller/Client/Root.php +++ b/lib/Alchemy/Phrasea/Controller/Client/Root.php @@ -539,10 +539,8 @@ class Root implements ControllerProviderInterface */ private function getPublicationStartPage(Application $app) { - $aggregate = Aggregate::createFromUser($app['EM'], $app['authentication']->getUser()); - return $app['twig']->render('client/home_inter_pub_basket.html.twig', array( - 'feeds' => $aggregate, + 'feeds' => Aggregate::createFromUser($app['EM'], $app['authentication']->getUser()), 'image_size' => (int) $app['authentication']->getUser()->getPrefs('images_size') )); } diff --git a/lib/Alchemy/Phrasea/Controller/Prod/Feed.php b/lib/Alchemy/Phrasea/Controller/Prod/Feed.php index a2858c9756..1ac79b37f5 100644 --- a/lib/Alchemy/Phrasea/Controller/Prod/Feed.php +++ b/lib/Alchemy/Phrasea/Controller/Prod/Feed.php @@ -173,11 +173,13 @@ class Feed implements ControllerProviderInterface $app['EM']->persist($entry); $app['EM']->flush(); - $entry = $app['twig']->render('prod/feeds/entry.html.twig', array('entry' => $entry)); - - $datas = array('error' => false, 'message' => 'succes', 'datas' => $entry); - - return $app->json($datas); + return $app->json(array( + 'error' => false, + 'message' => 'succes', + 'datas' => $app['twig']->render('prod/feeds/entry.html.twig', array( + 'entry' => $entry + )) + )); }) ->bind('prod_feeds_entry_update') ->assert('id', '\d+')->before(function(Request $request) use ($app) { @@ -199,9 +201,7 @@ class Feed implements ControllerProviderInterface $app['EM']->remove($entry); $app['EM']->flush(); - $datas = array('error' => false, 'message' => 'succes'); - - return $app->json($datas); + return $app->json(array('error' => false, 'message' => 'succes')); }) ->bind('prod_feeds_entry_delete') ->assert('id', '\d+')->before(function(Request $request) use ($app) { @@ -243,9 +243,7 @@ class Feed implements ControllerProviderInterface $feeds = $app['EM']->getRepository('Entities\Feed')->getAllForUser($app['authentication']->getUser()); - $aggregate = new Aggregate($app['EM'], $feeds); - - $link = $app['feed.aggregate-link-generator']->generate($aggregate, + $link = $app['feed.aggregate-link-generator']->generate(new Aggregate($app['EM'], $feeds), $app['authentication']->getUser(), AggregateLinkGenerator::FORMAT_RSS, null, $renew diff --git a/lib/Alchemy/Phrasea/Controller/Root/RSSFeeds.php b/lib/Alchemy/Phrasea/Controller/Root/RSSFeeds.php index f2e34561eb..4edc13333e 100644 --- a/lib/Alchemy/Phrasea/Controller/Root/RSSFeeds.php +++ b/lib/Alchemy/Phrasea/Controller/Root/RSSFeeds.php @@ -52,16 +52,14 @@ class RSSFeeds implements ControllerProviderInterface $controllers->get('/userfeed/{token}/{id}/{format}/', function(Application $app, $token, $id, $format) { $token = $app["EM"]->find('Entities\FeedToken', $id); - $feed = $token->getFeed(); - - $user = \User_Adapter::getInstance($token->getUsrId(), $app); $request = $app['request']; $page = (int) $request->query->get('page'); $page = $page < 1 ? 1 : $page; - return $app['feed.formatter-strategy']($format)->createResponse($feed, $page, $user); + return $app['feed.formatter-strategy']($format) + ->createResponse($token->getFeed(), $page, \User_Adapter::getInstance($token->getUsrId(), $app)); }) ->bind('feed_user') ->assert('id', '\d+') From 3f09a919ed059a5c59cb0f2062bd1c107b57e9bc Mon Sep 17 00:00:00 2001 From: Andrey Date: Tue, 13 Aug 2013 19:27:34 +0200 Subject: [PATCH 40/67] removed findallpublic method --- lib/Alchemy/Phrasea/Controller/Root/Login.php | 2 +- lib/Alchemy/Phrasea/Feed/Aggregate.php | 2 +- lib/Doctrine/Repositories/SessionRepository.php | 16 ---------------- 3 files changed, 2 insertions(+), 18 deletions(-) diff --git a/lib/Alchemy/Phrasea/Controller/Root/Login.php b/lib/Alchemy/Phrasea/Controller/Root/Login.php index af346af770..a04a55cdf8 100644 --- a/lib/Alchemy/Phrasea/Controller/Root/Login.php +++ b/lib/Alchemy/Phrasea/Controller/Root/Login.php @@ -725,7 +725,7 @@ class Login implements ControllerProviderInterface $app->addFlash('error', _('login::erreur: No available connection - Please contact sys-admin')); } - $feeds = $app['EM']->getRepository('Entities\Feed')->findAllPublic(); + $feeds = $app['EM']->getRepository('Entities\Feed')->findBy(array('public' => true), array('updated_on' => 'DESC')); $form = $app->form(new PhraseaAuthenticationForm()); $form->setData(array( diff --git a/lib/Alchemy/Phrasea/Feed/Aggregate.php b/lib/Alchemy/Phrasea/Feed/Aggregate.php index 11572d3366..e3eac68393 100644 --- a/lib/Alchemy/Phrasea/Feed/Aggregate.php +++ b/lib/Alchemy/Phrasea/Feed/Aggregate.php @@ -227,6 +227,6 @@ class Aggregate implements FeedInterface */ public static function getPublic(Application $app) { - return new static($app['EM'], $app['EM']->getRepository('Entities\Feed')->findAllPublic()); + return new static($app['EM'], $app['EM']->getRepository('Entities\Feed')->findBy(array('public' => true), array('updated_on' => 'DESC'))); } } diff --git a/lib/Doctrine/Repositories/SessionRepository.php b/lib/Doctrine/Repositories/SessionRepository.php index db28453105..0c3909b012 100644 --- a/lib/Doctrine/Repositories/SessionRepository.php +++ b/lib/Doctrine/Repositories/SessionRepository.php @@ -49,22 +49,6 @@ class SessionRepository extends EntityRepository return $query->getResult(); } - /** - * Returns all the public feeds. - * - * @return Collection - */ - public function findAllPublic() - { - $dql = 'SELECT f FROM Entities\Feed f - WHERE f.public = true - ORDER BY f.updated_on DESC'; - - $query = $this->_em->createQuery($dql); - - return $query->getResult(); - } - /** * Returns the given feed if the user can access to it. * From 3b3d08a9e100a448ce8f33a01be767894c1f70f4 Mon Sep 17 00:00:00 2001 From: Andrey Date: Tue, 13 Aug 2013 19:28:45 +0200 Subject: [PATCH 41/67] removed findbyfeedanduser method --- .../Phrasea/Feed/Link/FeedLinkGenerator.php | 2 +- .../Repositories/FeedTokenRepository.php | 23 ------------------- 2 files changed, 1 insertion(+), 24 deletions(-) diff --git a/lib/Alchemy/Phrasea/Feed/Link/FeedLinkGenerator.php b/lib/Alchemy/Phrasea/Feed/Link/FeedLinkGenerator.php index 635599b777..5040a0bd9c 100644 --- a/lib/Alchemy/Phrasea/Feed/Link/FeedLinkGenerator.php +++ b/lib/Alchemy/Phrasea/Feed/Link/FeedLinkGenerator.php @@ -139,7 +139,7 @@ class FeedLinkGenerator implements LinkGeneratorInterface { $token = $this->em ->getRepository('Entities\FeedToken') - ->findByFeedAndUser($feed, $user); + ->findOneBy(array('usr_id' => $user->get_id(), 'feed' => $feed->getId())); if (null === $token || true === $renew) { if (null === $token) { diff --git a/lib/Doctrine/Repositories/FeedTokenRepository.php b/lib/Doctrine/Repositories/FeedTokenRepository.php index 15ec6bb37c..f3b3df1630 100644 --- a/lib/Doctrine/Repositories/FeedTokenRepository.php +++ b/lib/Doctrine/Repositories/FeedTokenRepository.php @@ -23,27 +23,4 @@ use Entities\FeedToken; */ class FeedTokenRepository extends EntityRepository { - /** - * Finds a FeedToken based on given Feed and User_Adapter. - * - * @param Feed $feed - * @param \User_Adapter $user - * - * @return FeedToken - */ - public function findByFeedAndUser(Feed $feed, \User_Adapter $user) - { - $dql = 'SELECT t - FROM Entities\FeedToken t - WHERE t.feed = :feed - AND t.usr_id = :usr_id'; - - $query = $this->_em->createQuery($dql); - $query->setParameters(array( - ':feed' => $feed, - ':usr_id' => $user->get_id()) - ); - - return $query->getOneOrNullResult(); - } } From 090f230dd9f1d97dd3bfe07a9db1970a518e770b Mon Sep 17 00:00:00 2001 From: Andrey Date: Tue, 13 Aug 2013 19:57:21 +0200 Subject: [PATCH 42/67] replaced repository methods with query-builder ones --- lib/Alchemy/Phrasea/Feed/Aggregate.php | 14 +++++++-- .../Repositories/SessionRepository.php | 18 ++++++----- .../Repositories/UserSettingRepository.php | 31 ++++++++++--------- 3 files changed, 38 insertions(+), 25 deletions(-) diff --git a/lib/Alchemy/Phrasea/Feed/Aggregate.php b/lib/Alchemy/Phrasea/Feed/Aggregate.php index e3eac68393..e536aa8d0a 100644 --- a/lib/Alchemy/Phrasea/Feed/Aggregate.php +++ b/lib/Alchemy/Phrasea/Feed/Aggregate.php @@ -92,7 +92,7 @@ class Aggregate implements FeedInterface */ public static function create(Application $app, array $feed_ids) { - $feeds = $this->em->getRepository('Entities\Feed')->findByIdArray($feed_ids); + $feeds = $this->em->getRepository('Entities\Feed')->findByIds($feed_ids); return new static($app, $feeds); } @@ -114,7 +114,11 @@ class Aggregate implements FeedInterface return null; } - return $this->em->getRepository('Entities\FeedEntry')->findByFeeds($this->feeds, $offset_start, $how_many); + $feedIds = array(); + foreach ($this->feeds as $feed) { + $feedIds[] = $feed->getId(); + } + return $this->em->getRepository('Entities\FeedEntry')->findByFeeds($feedIds, $offset_start, $how_many); } /** @@ -195,7 +199,11 @@ class Aggregate implements FeedInterface public function getCountTotalEntries() { if (count($this->feeds) > 0) { - return count($this->em->getRepository('Entities\FeedEntry')->findByFeeds($this->feeds)); + $feedIds = array(); + foreach ($this->feeds as $feed) { + $feedIds[] = $feed->getId(); + } + return count($this->em->getRepository('Entities\FeedEntry')->findByFeeds($feedIds)); } return 0; diff --git a/lib/Doctrine/Repositories/SessionRepository.php b/lib/Doctrine/Repositories/SessionRepository.php index 0c3909b012..7175398674 100644 --- a/lib/Doctrine/Repositories/SessionRepository.php +++ b/lib/Doctrine/Repositories/SessionRepository.php @@ -78,14 +78,16 @@ class SessionRepository extends EntityRepository * @param array $feed_id * @return Collection */ - public function findByIdArray(array $feed_id) - { - $dql = 'SELECT f FROM Entities\Feed f - ORDER BY f.created_on DESC - WHERE f.id IN (' . implode(",", $feed_id) . ')'; +public function findByIds(array $feedIds) +{ + $qb = $this->createQueryBuilder('f'); - $query = $this->_em->createQuery($dql); - - return $query->getResult(); + if (!empty($feedIds)) { + $qb->Where($qb->expr()->in('f.id', $feedIds)); } + + $qb->orderBy('f.updated_on', 'DESC'); + + return $qb->getQuery()->getResult(); +} } diff --git a/lib/Doctrine/Repositories/UserSettingRepository.php b/lib/Doctrine/Repositories/UserSettingRepository.php index db389947ad..6b1ed462fd 100644 --- a/lib/Doctrine/Repositories/UserSettingRepository.php +++ b/lib/Doctrine/Repositories/UserSettingRepository.php @@ -25,26 +25,29 @@ class UserSettingRepository extends EntityRepository * Returns a collection of FeedEntry from given feeds, limited to $how_many results, starting with $offset_start * * @param array $feeds - * @param integer $offset_start - * @param integer $how_many + * @param integer $offsetStart + * @param integer $howMany * * @return \Doctrine\Common\Collections\Collection */ - public function findByFeeds($feeds, $offset_start = null, $how_many = null) + public function findByFeeds($feeds, $offsetStart = null, $perPage = null) { - $dql = 'SELECT f FROM Entities\FeedEntry f - WHERE f.feed IN (:feeds) order by f.updated_on DESC'; + $qb = $this->createQueryBuilder('f'); - $query = $this->_em->createQuery($dql); - $query->setParameter('feeds', $feeds); - - if (null !== $offset_start && 0 !== $offset_start) { - $query->setFirstResult($offset_start); - } - if (null !== $how_many) { - $query->setMaxResults($how_many); + if (!empty($feeds)) { + $qb->Where($qb->expr()->in('f.feed', $feeds)); } - return $query->getResult(); + $qb->orderBy('f.updated_on', 'DESC'); + + if ($offsetStart) { + $qb->setFirstResult(max(0, (int) $offsetStart)); + } + + if ($perPage) { + $qb->setMaxResults(max(5, (int) $perPage)); + } + + return $qb->getQuery()->getResult(); } } From f36173aea90c0685e4be82f8ca32c2ecbf887e13 Mon Sep 17 00:00:00 2001 From: Andrey Date: Wed, 14 Aug 2013 09:46:25 +0200 Subject: [PATCH 43/67] replaced missing methods in test files --- tests/Alchemy/Tests/Phrasea/Controller/Root/RSSFeedTest.php | 4 ++-- tests/Alchemy/Tests/Phrasea/Feed/FeedLinkGeneratorTest.php | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/tests/Alchemy/Tests/Phrasea/Controller/Root/RSSFeedTest.php b/tests/Alchemy/Tests/Phrasea/Controller/Root/RSSFeedTest.php index 3ddaac7e6f..4a217c9e15 100644 --- a/tests/Alchemy/Tests/Phrasea/Controller/Root/RSSFeedTest.php +++ b/tests/Alchemy/Tests/Phrasea/Controller/Root/RSSFeedTest.php @@ -173,7 +173,7 @@ class RssFeedTest extends \PhraseanetWebTestCaseAbstract $this->insertOneFeed(self::$DI['user'], "test1", true); $this->insertOneFeed(self::$DI['user'], "test2", true); - $all_feeds = self::$DI['app']['EM']->getRepository('Entities\Feed')->findAllPublic(); + $all_feeds = self::$DI['app']['EM']->getRepository('Entities\Feed')->findBy(array('public' => true), array('updated_on' => 'DESC')); foreach ($all_feeds as $feed) { $this->assertTrue($feed->isPublic()); @@ -190,7 +190,7 @@ class RssFeedTest extends \PhraseanetWebTestCaseAbstract $this->insertOneFeed(self::$DI['user'], "test1", true); $this->insertOneFeed(self::$DI['user'], "test2", true); - $all_feeds = self::$DI['app']['EM']->getRepository('Entities\Feed')->findAllPublic(); + $all_feeds = self::$DI['app']['EM']->getRepository('Entities\Feed')->findBy(array('public' => true), array('updated_on' => 'DESC')); foreach ($all_feeds as $feed) { $this->assertTrue($feed->isPublic()); diff --git a/tests/Alchemy/Tests/Phrasea/Feed/FeedLinkGeneratorTest.php b/tests/Alchemy/Tests/Phrasea/Feed/FeedLinkGeneratorTest.php index 20bd194795..0463a30785 100644 --- a/tests/Alchemy/Tests/Phrasea/Feed/FeedLinkGeneratorTest.php +++ b/tests/Alchemy/Tests/Phrasea/Feed/FeedLinkGeneratorTest.php @@ -95,7 +95,7 @@ class FeedLinkGeneratorTest extends \PhraseanetPHPUnitAbstract } $token = self::$DI['app']['EM'] ->getRepository('Entities\FeedToken') - ->findByFeedAndUser($feed, $user); + ->findOneBy(array('usr_id' => $user->get_id(), 'feed' => $feed->getId())); self::$DI['app']['EM']->remove($token); self::$DI['app']['EM']->flush(); } From 42830efef5a2e592ea27639faf9907f94e81bd22 Mon Sep 17 00:00:00 2001 From: Andrey Date: Wed, 14 Aug 2013 10:23:35 +0200 Subject: [PATCH 44/67] Removed findbyuser methods --- lib/Alchemy/Phrasea/Controller/Prod/Feed.php | 2 +- lib/Alchemy/Phrasea/Feed/Aggregate.php | 2 +- .../Feed/Link/AggregateLinkGenerator.php | 2 +- .../Repositories/AggregateTokenRepository.php | 21 ------------------- .../Repositories/FeedTokenRepository.php | 2 -- .../Repositories/OrderElementRepository.php | 21 ------------------- .../Feed/AggregateLinkGeneratorTest.php | 2 +- 7 files changed, 4 insertions(+), 48 deletions(-) diff --git a/lib/Alchemy/Phrasea/Controller/Prod/Feed.php b/lib/Alchemy/Phrasea/Controller/Prod/Feed.php index 1ac79b37f5..65b1b9c215 100644 --- a/lib/Alchemy/Phrasea/Controller/Prod/Feed.php +++ b/lib/Alchemy/Phrasea/Controller/Prod/Feed.php @@ -59,7 +59,7 @@ class Feed implements ControllerProviderInterface $app->abort(404, "Feed not found"); } - $publisher = $app['EM']->getRepository('Entities\FeedPublisher')->findByUser($feed, $app['authentication']->getUser()); + $publisher = $app['EM']->getRepository('Entities\FeedPublisher')->findOneBy(array('feed' => $feed, 'usr_id' => $app['authentication']->getUser()->get_id())); if ('' === $title = trim($request->request->get('title', ''))) { $app->abort(400, "Bad request"); diff --git a/lib/Alchemy/Phrasea/Feed/Aggregate.php b/lib/Alchemy/Phrasea/Feed/Aggregate.php index e536aa8d0a..a2b863a581 100644 --- a/lib/Alchemy/Phrasea/Feed/Aggregate.php +++ b/lib/Alchemy/Phrasea/Feed/Aggregate.php @@ -77,7 +77,7 @@ class Aggregate implements FeedInterface public static function createFromUser(EntityManager $em, \User_Adapter $user) { $feeds = $em->getRepository('Entities\Feed')->getAllForUser($user); - $token = $em->getRepository('Entities\AggregateToken')->findByUser($user); + $token = $em->getRepository('Entities\AggregateToken')->findOneBy(array('usr_id' => $user->get_id())); return new static($em, $feeds, $token); } diff --git a/lib/Alchemy/Phrasea/Feed/Link/AggregateLinkGenerator.php b/lib/Alchemy/Phrasea/Feed/Link/AggregateLinkGenerator.php index 7fb9d562a3..30cc30b3a9 100644 --- a/lib/Alchemy/Phrasea/Feed/Link/AggregateLinkGenerator.php +++ b/lib/Alchemy/Phrasea/Feed/Link/AggregateLinkGenerator.php @@ -123,7 +123,7 @@ class AggregateLinkGenerator implements LinkGeneratorInterface { $token = $this->em ->getRepository('Entities\AggregateToken') - ->findByUser($user); + ->findOneBy(array('usr_id' => $user->get_id())); if (null === $token || true === $renew) { if (null === $token) { diff --git a/lib/Doctrine/Repositories/AggregateTokenRepository.php b/lib/Doctrine/Repositories/AggregateTokenRepository.php index 7e104f3a42..ec72a2544f 100644 --- a/lib/Doctrine/Repositories/AggregateTokenRepository.php +++ b/lib/Doctrine/Repositories/AggregateTokenRepository.php @@ -12,7 +12,6 @@ namespace Repositories; use Doctrine\ORM\EntityRepository; -use Entities\AggregateToken; /** * AggregateTokenRepository @@ -22,24 +21,4 @@ use Entities\AggregateToken; */ class AggregateTokenRepository extends EntityRepository { - /** - * Finds an AggregateToken based on given User_Adapter. - * - * @param \User_Adapter $user - * - * @return AggregateToken - */ - public function findByUser(\User_Adapter $user) - { - $dql = 'SELECT t - FROM Entities\AggregateToken t - WHERE t.usr_id = :usr_id'; - - $query = $this->_em->createQuery($dql); - $query->setParameters(array( - ':usr_id' => $user->get_id()) - ); - - return $query->getOneOrNullResult(); - } } diff --git a/lib/Doctrine/Repositories/FeedTokenRepository.php b/lib/Doctrine/Repositories/FeedTokenRepository.php index f3b3df1630..8ef8e64a01 100644 --- a/lib/Doctrine/Repositories/FeedTokenRepository.php +++ b/lib/Doctrine/Repositories/FeedTokenRepository.php @@ -12,8 +12,6 @@ namespace Repositories; use Doctrine\ORM\EntityRepository; -use Entities\Feed; -use Entities\FeedToken; /** * FeedTokenRepository diff --git a/lib/Doctrine/Repositories/OrderElementRepository.php b/lib/Doctrine/Repositories/OrderElementRepository.php index 6f10930516..67c86325b8 100644 --- a/lib/Doctrine/Repositories/OrderElementRepository.php +++ b/lib/Doctrine/Repositories/OrderElementRepository.php @@ -12,8 +12,6 @@ namespace Repositories; use Doctrine\ORM\EntityRepository; -use Entities\Feed; -use Entities\FeedPublisher; /** * OrderElementRepository @@ -23,23 +21,4 @@ use Entities\FeedPublisher; */ class OrderElementRepository extends EntityRepository { - /** - * Finds a FeedPublisher based on a given Feed and a User_Adapter. - * - * @param Feed $feed - * @param \User_Adapter $user - * - * @return FeedPublisher - */ - public function findByUser(Feed $feed, \User_Adapter $user) - { - $dql = 'SELECT f FROM Entities\FeedPublisher f - WHERE f.usr_id = :usrId AND f.feed = :feed'; - - $query = $this->_em->createQuery($dql); - $query->setParameter('usrId', $user->get_id()); - $query->setParameter('feed', $feed); - - return $query->getOneOrNullResult(); - } } diff --git a/tests/Alchemy/Tests/Phrasea/Feed/AggregateLinkGeneratorTest.php b/tests/Alchemy/Tests/Phrasea/Feed/AggregateLinkGeneratorTest.php index 8d58c0d815..ead1fd04e0 100644 --- a/tests/Alchemy/Tests/Phrasea/Feed/AggregateLinkGeneratorTest.php +++ b/tests/Alchemy/Tests/Phrasea/Feed/AggregateLinkGeneratorTest.php @@ -100,7 +100,7 @@ class AggregateLinkGeneratorTest extends \PhraseanetPHPUnitAbstract } $token = self::$DI['app']['EM'] ->getRepository('Entities\AggregateToken') - ->findByUser($user); + ->findOneBy(array('usr_id' => $user->get_id())); self::$DI['app']['EM']->remove($token); self::$DI['app']['EM']->flush(); } From c1910a188e05e295bf78980eca15fcca222b1f25 Mon Sep 17 00:00:00 2001 From: Andrey Date: Wed, 14 Aug 2013 14:43:35 +0200 Subject: [PATCH 45/67] Replaced underscores in variable names to make them camelcase --- lib/Alchemy/Phrasea/Controller/Prod/Feed.php | 2 +- lib/Alchemy/Phrasea/Controller/Root/Login.php | 2 +- lib/Alchemy/Phrasea/Feed/Aggregate.php | 4 +-- .../Feed/Link/AggregateLinkGenerator.php | 2 +- .../Phrasea/Feed/Link/FeedLinkGenerator.php | 2 +- lib/Doctrine/Entities/AggregateToken.php | 8 ++--- lib/Doctrine/Entities/Feed.php | 36 +++++++++---------- lib/Doctrine/Entities/FeedEntry.php | 32 ++++++++--------- lib/Doctrine/Entities/FeedItem.php | 32 ++++++++--------- lib/Doctrine/Entities/FeedPublisher.php | 16 ++++----- lib/Doctrine/Entities/FeedToken.php | 8 ++--- .../Phrasea/Controller/Root/RSSFeedTest.php | 4 +-- .../Feed/AggregateLinkGeneratorTest.php | 2 +- .../Phrasea/Feed/FeedLinkGeneratorTest.php | 2 +- 14 files changed, 76 insertions(+), 76 deletions(-) diff --git a/lib/Alchemy/Phrasea/Controller/Prod/Feed.php b/lib/Alchemy/Phrasea/Controller/Prod/Feed.php index 65b1b9c215..cc7492e470 100644 --- a/lib/Alchemy/Phrasea/Controller/Prod/Feed.php +++ b/lib/Alchemy/Phrasea/Controller/Prod/Feed.php @@ -59,7 +59,7 @@ class Feed implements ControllerProviderInterface $app->abort(404, "Feed not found"); } - $publisher = $app['EM']->getRepository('Entities\FeedPublisher')->findOneBy(array('feed' => $feed, 'usr_id' => $app['authentication']->getUser()->get_id())); + $publisher = $app['EM']->getRepository('Entities\FeedPublisher')->findOneBy(array('feed' => $feed, 'usrId' => $app['authentication']->getUser()->get_id())); if ('' === $title = trim($request->request->get('title', ''))) { $app->abort(400, "Bad request"); diff --git a/lib/Alchemy/Phrasea/Controller/Root/Login.php b/lib/Alchemy/Phrasea/Controller/Root/Login.php index a04a55cdf8..67a08fc48a 100644 --- a/lib/Alchemy/Phrasea/Controller/Root/Login.php +++ b/lib/Alchemy/Phrasea/Controller/Root/Login.php @@ -725,7 +725,7 @@ class Login implements ControllerProviderInterface $app->addFlash('error', _('login::erreur: No available connection - Please contact sys-admin')); } - $feeds = $app['EM']->getRepository('Entities\Feed')->findBy(array('public' => true), array('updated_on' => 'DESC')); + $feeds = $app['EM']->getRepository('Entities\Feed')->findBy(array('public' => true), array('updatedOn' => 'DESC')); $form = $app->form(new PhraseaAuthenticationForm()); $form->setData(array( diff --git a/lib/Alchemy/Phrasea/Feed/Aggregate.php b/lib/Alchemy/Phrasea/Feed/Aggregate.php index a2b863a581..5b404d6c85 100644 --- a/lib/Alchemy/Phrasea/Feed/Aggregate.php +++ b/lib/Alchemy/Phrasea/Feed/Aggregate.php @@ -77,7 +77,7 @@ class Aggregate implements FeedInterface public static function createFromUser(EntityManager $em, \User_Adapter $user) { $feeds = $em->getRepository('Entities\Feed')->getAllForUser($user); - $token = $em->getRepository('Entities\AggregateToken')->findOneBy(array('usr_id' => $user->get_id())); + $token = $em->getRepository('Entities\AggregateToken')->findOneBy(array('usrId' => $user->get_id())); return new static($em, $feeds, $token); } @@ -235,6 +235,6 @@ class Aggregate implements FeedInterface */ public static function getPublic(Application $app) { - return new static($app['EM'], $app['EM']->getRepository('Entities\Feed')->findBy(array('public' => true), array('updated_on' => 'DESC'))); + return new static($app['EM'], $app['EM']->getRepository('Entities\Feed')->findBy(array('public' => true), array('updatedOn' => 'DESC'))); } } diff --git a/lib/Alchemy/Phrasea/Feed/Link/AggregateLinkGenerator.php b/lib/Alchemy/Phrasea/Feed/Link/AggregateLinkGenerator.php index 30cc30b3a9..e25fe4102b 100644 --- a/lib/Alchemy/Phrasea/Feed/Link/AggregateLinkGenerator.php +++ b/lib/Alchemy/Phrasea/Feed/Link/AggregateLinkGenerator.php @@ -123,7 +123,7 @@ class AggregateLinkGenerator implements LinkGeneratorInterface { $token = $this->em ->getRepository('Entities\AggregateToken') - ->findOneBy(array('usr_id' => $user->get_id())); + ->findOneBy(array('usrId' => $user->get_id())); if (null === $token || true === $renew) { if (null === $token) { diff --git a/lib/Alchemy/Phrasea/Feed/Link/FeedLinkGenerator.php b/lib/Alchemy/Phrasea/Feed/Link/FeedLinkGenerator.php index 5040a0bd9c..a25f350cc1 100644 --- a/lib/Alchemy/Phrasea/Feed/Link/FeedLinkGenerator.php +++ b/lib/Alchemy/Phrasea/Feed/Link/FeedLinkGenerator.php @@ -139,7 +139,7 @@ class FeedLinkGenerator implements LinkGeneratorInterface { $token = $this->em ->getRepository('Entities\FeedToken') - ->findOneBy(array('usr_id' => $user->get_id(), 'feed' => $feed->getId())); + ->findOneBy(array('usrId' => $user->get_id(), 'feed' => $feed->getId())); if (null === $token || true === $renew) { if (null === $token) { diff --git a/lib/Doctrine/Entities/AggregateToken.php b/lib/Doctrine/Entities/AggregateToken.php index 3956e51c18..8df663d323 100644 --- a/lib/Doctrine/Entities/AggregateToken.php +++ b/lib/Doctrine/Entities/AggregateToken.php @@ -28,9 +28,9 @@ class AggregateToken private $id; /** - * @ORM\Column(type="integer") + * @ORM\Column(type="integer", name="usr_id") */ - private $usr_id; + private $usrId; /** * @ORM\Column(type="string", length=12, nullable=true) @@ -55,7 +55,7 @@ class AggregateToken */ public function setUsrId($usrId) { - $this->usr_id = $usrId; + $this->usrId = $usrId; return $this; } @@ -67,7 +67,7 @@ class AggregateToken */ public function getUsrId() { - return $this->usr_id; + return $this->usrId; } /** diff --git a/lib/Doctrine/Entities/Feed.php b/lib/Doctrine/Entities/Feed.php index b8bc4078f8..313aac032a 100644 --- a/lib/Doctrine/Entities/Feed.php +++ b/lib/Doctrine/Entities/Feed.php @@ -35,14 +35,14 @@ class Feed implements FeedInterface private $public = false; /** - * @ORM\Column(type="boolean") + * @ORM\Column(type="boolean", name="icon_url") */ - private $icon_url = false; + private $iconUrl = false; /** - * @ORM\Column(type="integer", nullable=true) + * @ORM\Column(type="integer", nullable=true, name="base_id") */ - private $base_id; + private $baseId; /** * @ORM\Column(type="string", length=128) @@ -56,15 +56,15 @@ class Feed implements FeedInterface /** * @Gedmo\Timestampable(on="create") - * @ORM\Column(type="datetime") + * @ORM\Column(type="datetime", name="created_on") */ - private $created_on; + private $createdOn; /** * @Gedmo\Timestampable(on="update") - * @ORM\Column(type="datetime") + * @ORM\Column(type="datetime", name="updated_on") */ - private $updated_on; + private $updatedOn; /** * @ORM\OneToMany(targetEntity="FeedPublisher", mappedBy="feed", cascade={"ALL"}) @@ -132,7 +132,7 @@ class Feed implements FeedInterface */ public function setIconUrl($iconUrl) { - $this->icon_url = $iconUrl; + $this->iconUrl = $iconUrl; return $this; } @@ -144,7 +144,7 @@ class Feed implements FeedInterface */ public function getIconUrl() { - return $this->icon_url; + return $this->iconUrl; } /** @@ -155,7 +155,7 @@ class Feed implements FeedInterface */ public function setBaseId($baseId) { - $this->base_id = $baseId; + $this->baseId = $baseId; return $this; } @@ -167,7 +167,7 @@ class Feed implements FeedInterface */ public function getBaseId() { - return $this->base_id; + return $this->baseId; } /** @@ -318,11 +318,11 @@ class Feed implements FeedInterface public function setCollection(\collection $collection = null) { if ($collection === null) { - $this->base_id = null; + $this->baseId = null; return; } - $this->base_id = $collection->get_base_id(); + $this->baseId = $collection->get_base_id(); } /** @@ -333,7 +333,7 @@ class Feed implements FeedInterface */ public function setCreatedOn($createdOn) { - $this->created_on = $createdOn; + $this->createdOn = $createdOn; return $this; } @@ -345,7 +345,7 @@ class Feed implements FeedInterface */ public function getCreatedOn() { - return $this->created_on; + return $this->createdOn; } /** @@ -356,7 +356,7 @@ class Feed implements FeedInterface */ public function setUpdatedOn($updatedOn) { - $this->updated_on = $updatedOn; + $this->updatedOn = $updatedOn; return $this; } @@ -368,7 +368,7 @@ class Feed implements FeedInterface */ public function getUpdatedOn() { - return $this->updated_on; + return $this->updatedOn; } /** diff --git a/lib/Doctrine/Entities/FeedEntry.php b/lib/Doctrine/Entities/FeedEntry.php index 6c21006d0e..b35c9d777c 100644 --- a/lib/Doctrine/Entities/FeedEntry.php +++ b/lib/Doctrine/Entities/FeedEntry.php @@ -38,26 +38,26 @@ class FeedEntry private $subtitle; /** - * @ORM\Column(type="string", length=128) + * @ORM\Column(type="string", length=128, name="author_name") */ - private $author_name; + private $authorName; /** - * @ORM\Column(type="string", length=128) + * @ORM\Column(type="string", length=128, name="author_email") */ - private $author_email; + private $authorEmail; /** * @Gedmo\Timestampable(on="create") - * @ORM\Column(type="datetime") + * @ORM\Column(type="datetime", name="created_on") */ - private $created_on; + private $createdOn; /** * @Gedmo\Timestampable(on="update") - * @ORM\Column(type="datetime") + * @ORM\Column(type="datetime", name="updated_on") */ - private $updated_on; + private $updatedOn; /** * @ORM\OneToMany(targetEntity="FeedItem", mappedBy="entry", cascade={"ALL"}) @@ -149,7 +149,7 @@ class FeedEntry */ public function setAuthorName($authorName) { - $this->author_name = $authorName; + $this->authorName = $authorName; return $this; } @@ -161,7 +161,7 @@ class FeedEntry */ public function getAuthorName() { - return $this->author_name; + return $this->authorName; } /** @@ -172,7 +172,7 @@ class FeedEntry */ public function setAuthorEmail($authorEmail) { - $this->author_email = $authorEmail; + $this->authorEmail = $authorEmail; return $this; } @@ -184,7 +184,7 @@ class FeedEntry */ public function getAuthorEmail() { - return $this->author_email; + return $this->authorEmail; } /** @@ -195,7 +195,7 @@ class FeedEntry */ public function setCreatedOn($createdOn) { - $this->created_on = $createdOn; + $this->createdOn = $createdOn; return $this; } @@ -207,7 +207,7 @@ class FeedEntry */ public function getCreatedOn() { - return $this->created_on; + return $this->createdOn; } /** @@ -218,7 +218,7 @@ class FeedEntry */ public function setUpdatedOn($updatedOn) { - $this->updated_on = $updatedOn; + $this->updatedOn = $updatedOn; return $this; } @@ -230,7 +230,7 @@ class FeedEntry */ public function getUpdatedOn() { - return $this->updated_on; + return $this->updatedOn; } /** diff --git a/lib/Doctrine/Entities/FeedItem.php b/lib/Doctrine/Entities/FeedItem.php index e806aa723a..8c8bc27a3b 100644 --- a/lib/Doctrine/Entities/FeedItem.php +++ b/lib/Doctrine/Entities/FeedItem.php @@ -31,14 +31,14 @@ class FeedItem private $id; /** - * @ORM\Column(type="integer") + * @ORM\Column(type="integer", name="record_id") */ - private $record_id; + private $recordId; /** - * @ORM\Column(type="integer") + * @ORM\Column(type="integer", name="sbas_id") */ - private $sbas_id; + private $sbasId; /** * @ORM\Column(type="integer") @@ -47,15 +47,15 @@ class FeedItem /** * @Gedmo\Timestampable(on="create") - * @ORM\Column(type="datetime") + * @ORM\Column(type="datetime", name="created_on") */ - private $created_on; + private $createdOn; /** * @Gedmo\Timestampable(on="update") - * @ORM\Column(type="datetime") + * @ORM\Column(type="datetime", name="updated_on") */ - private $updated_on; + private $updatedOn; /** * @ORM\ManyToOne(targetEntity="FeedEntry", inversedBy="items", cascade={"persist"}) @@ -81,7 +81,7 @@ class FeedItem */ public function setRecordId($recordId) { - $this->record_id = $recordId; + $this->recordId = $recordId; return $this; } @@ -93,7 +93,7 @@ class FeedItem */ public function getRecordId() { - return $this->record_id; + return $this->recordId; } /** @@ -104,7 +104,7 @@ class FeedItem */ public function setSbasId($sbasId) { - $this->sbas_id = $sbasId; + $this->sbasId = $sbasId; return $this; } @@ -116,7 +116,7 @@ class FeedItem */ public function getSbasId() { - return $this->sbas_id; + return $this->sbasId; } /** @@ -173,7 +173,7 @@ class FeedItem */ public function setCreatedOn($createdOn) { - $this->created_on = $createdOn; + $this->createdOn = $createdOn; return $this; } @@ -185,7 +185,7 @@ class FeedItem */ public function getCreatedOn() { - return $this->created_on; + return $this->createdOn; } /** @@ -196,7 +196,7 @@ class FeedItem */ public function setUpdatedOn($updatedOn) { - $this->updated_on = $updatedOn; + $this->updatedOn = $updatedOn; return $this; } @@ -208,7 +208,7 @@ class FeedItem */ public function getUpdatedOn() { - return $this->updated_on; + return $this->updatedOn; } /** diff --git a/lib/Doctrine/Entities/FeedPublisher.php b/lib/Doctrine/Entities/FeedPublisher.php index 1e261da02b..7ae8294dea 100644 --- a/lib/Doctrine/Entities/FeedPublisher.php +++ b/lib/Doctrine/Entities/FeedPublisher.php @@ -29,9 +29,9 @@ class FeedPublisher private $id; /** - * @ORM\Column(type="integer") + * @ORM\Column(type="integer", name="usr_id") */ - private $usr_id; + private $usrId; /** * @ORM\Column(type="boolean") @@ -40,9 +40,9 @@ class FeedPublisher /** * @Gedmo\Timestampable(on="create") - * @ORM\Column(type="datetime") + * @ORM\Column(type="datetime", name="created_on") */ - private $created_on; + private $createdOn; /** * @ORM\ManyToOne(targetEntity="Feed", inversedBy="publishers", cascade={"persist"}) @@ -68,7 +68,7 @@ class FeedPublisher */ public function setUsrId($usrId) { - $this->usr_id = $usrId; + $this->usrId = $usrId; return $this; } @@ -80,7 +80,7 @@ class FeedPublisher */ public function getUsrId() { - return $this->usr_id; + return $this->usrId; } /** @@ -149,7 +149,7 @@ class FeedPublisher */ public function setCreatedOn($createdOn) { - $this->created_on = $createdOn; + $this->createdOn = $createdOn; return $this; } @@ -161,6 +161,6 @@ class FeedPublisher */ public function getCreatedOn() { - return $this->created_on; + return $this->createdOn; } } diff --git a/lib/Doctrine/Entities/FeedToken.php b/lib/Doctrine/Entities/FeedToken.php index b8a12206cb..6c3dad8352 100644 --- a/lib/Doctrine/Entities/FeedToken.php +++ b/lib/Doctrine/Entities/FeedToken.php @@ -28,9 +28,9 @@ class FeedToken private $id; /** - * @ORM\Column(type="integer") + * @ORM\Column(type="integer", name="usr_id") */ - private $usr_id; + private $usrId; /** * @ORM\Column(type="string", length=12, nullable=true) @@ -61,7 +61,7 @@ class FeedToken */ public function setUsrId($usrId) { - $this->usr_id = $usrId; + $this->usrId = $usrId; return $this; } @@ -73,7 +73,7 @@ class FeedToken */ public function getUsrId() { - return $this->usr_id; + return $this->usrId; } /** diff --git a/tests/Alchemy/Tests/Phrasea/Controller/Root/RSSFeedTest.php b/tests/Alchemy/Tests/Phrasea/Controller/Root/RSSFeedTest.php index 4a217c9e15..2c8a736492 100644 --- a/tests/Alchemy/Tests/Phrasea/Controller/Root/RSSFeedTest.php +++ b/tests/Alchemy/Tests/Phrasea/Controller/Root/RSSFeedTest.php @@ -173,7 +173,7 @@ class RssFeedTest extends \PhraseanetWebTestCaseAbstract $this->insertOneFeed(self::$DI['user'], "test1", true); $this->insertOneFeed(self::$DI['user'], "test2", true); - $all_feeds = self::$DI['app']['EM']->getRepository('Entities\Feed')->findBy(array('public' => true), array('updated_on' => 'DESC')); + $all_feeds = self::$DI['app']['EM']->getRepository('Entities\Feed')->findBy(array('public' => true), array('updatedOn' => 'DESC')); foreach ($all_feeds as $feed) { $this->assertTrue($feed->isPublic()); @@ -190,7 +190,7 @@ class RssFeedTest extends \PhraseanetWebTestCaseAbstract $this->insertOneFeed(self::$DI['user'], "test1", true); $this->insertOneFeed(self::$DI['user'], "test2", true); - $all_feeds = self::$DI['app']['EM']->getRepository('Entities\Feed')->findBy(array('public' => true), array('updated_on' => 'DESC')); + $all_feeds = self::$DI['app']['EM']->getRepository('Entities\Feed')->findBy(array('public' => true), array('updatedOn' => 'DESC')); foreach ($all_feeds as $feed) { $this->assertTrue($feed->isPublic()); diff --git a/tests/Alchemy/Tests/Phrasea/Feed/AggregateLinkGeneratorTest.php b/tests/Alchemy/Tests/Phrasea/Feed/AggregateLinkGeneratorTest.php index ead1fd04e0..61687d8aa9 100644 --- a/tests/Alchemy/Tests/Phrasea/Feed/AggregateLinkGeneratorTest.php +++ b/tests/Alchemy/Tests/Phrasea/Feed/AggregateLinkGeneratorTest.php @@ -100,7 +100,7 @@ class AggregateLinkGeneratorTest extends \PhraseanetPHPUnitAbstract } $token = self::$DI['app']['EM'] ->getRepository('Entities\AggregateToken') - ->findOneBy(array('usr_id' => $user->get_id())); + ->findOneBy(array('usrId' => $user->get_id())); self::$DI['app']['EM']->remove($token); self::$DI['app']['EM']->flush(); } diff --git a/tests/Alchemy/Tests/Phrasea/Feed/FeedLinkGeneratorTest.php b/tests/Alchemy/Tests/Phrasea/Feed/FeedLinkGeneratorTest.php index 0463a30785..8a5994d022 100644 --- a/tests/Alchemy/Tests/Phrasea/Feed/FeedLinkGeneratorTest.php +++ b/tests/Alchemy/Tests/Phrasea/Feed/FeedLinkGeneratorTest.php @@ -95,7 +95,7 @@ class FeedLinkGeneratorTest extends \PhraseanetPHPUnitAbstract } $token = self::$DI['app']['EM'] ->getRepository('Entities\FeedToken') - ->findOneBy(array('usr_id' => $user->get_id(), 'feed' => $feed->getId())); + ->findOneBy(array('usrId' => $user->get_id(), 'feed' => $feed->getId())); self::$DI['app']['EM']->remove($token); self::$DI['app']['EM']->flush(); } From 4fe6de5ffc964ab69ee9fee7303ac9fa0b57c721 Mon Sep 17 00:00:00 2001 From: Andrey Date: Wed, 14 Aug 2013 15:21:04 +0200 Subject: [PATCH 46/67] Replaced underscores in repositories --- lib/Doctrine/Repositories/SessionRepository.php | 6 +++--- lib/Doctrine/Repositories/UserSettingRepository.php | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/lib/Doctrine/Repositories/SessionRepository.php b/lib/Doctrine/Repositories/SessionRepository.php index 7175398674..c0e198ae4e 100644 --- a/lib/Doctrine/Repositories/SessionRepository.php +++ b/lib/Doctrine/Repositories/SessionRepository.php @@ -34,15 +34,15 @@ class SessionRepository extends EntityRepository $base_ids = array_keys($user->ACL()->get_granted_base()); $dql = 'SELECT f FROM Entities\Feed f - WHERE f.base_id IS NULL '; + WHERE f.baseId IS NULL '; if (count($base_ids) > 0) { - $dql .= ' OR f.base_id + $dql .= ' OR f.baseId IN (' . implode(', ', $base_ids) . ') '; } $dql .= ' OR f.public = true - ORDER BY f.updated_on DESC'; + ORDER BY f.updatedOn DESC'; $query = $this->_em->createQuery($dql); diff --git a/lib/Doctrine/Repositories/UserSettingRepository.php b/lib/Doctrine/Repositories/UserSettingRepository.php index 6b1ed462fd..1591e76e8f 100644 --- a/lib/Doctrine/Repositories/UserSettingRepository.php +++ b/lib/Doctrine/Repositories/UserSettingRepository.php @@ -38,7 +38,7 @@ class UserSettingRepository extends EntityRepository $qb->Where($qb->expr()->in('f.feed', $feeds)); } - $qb->orderBy('f.updated_on', 'DESC'); + $qb->orderBy('f.updatedOn', 'DESC'); if ($offsetStart) { $qb->setFirstResult(max(0, (int) $offsetStart)); From b555c6212eb2f49f9ecc6185c41485a1a6a32f1d Mon Sep 17 00:00:00 2001 From: Andrey Date: Wed, 14 Aug 2013 15:56:07 +0200 Subject: [PATCH 47/67] Replaced underscores in aggregate --- lib/Alchemy/Phrasea/Feed/Aggregate.php | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/lib/Alchemy/Phrasea/Feed/Aggregate.php b/lib/Alchemy/Phrasea/Feed/Aggregate.php index 5b404d6c85..24d449ef11 100644 --- a/lib/Alchemy/Phrasea/Feed/Aggregate.php +++ b/lib/Alchemy/Phrasea/Feed/Aggregate.php @@ -25,10 +25,10 @@ class Aggregate implements FeedInterface private $subtitle; /** @var DateTime */ - private $created_on; + private $createdOn; /** @var DateTime */ - private $updated_on; + private $updatedOn; /** @var array */ private $feeds; @@ -150,7 +150,7 @@ class Aggregate implements FeedInterface */ public function getCreatedOn() { - return $this->created_on; + return $this->createdOn; } /** @@ -158,7 +158,7 @@ class Aggregate implements FeedInterface */ public function getUpdatedOn() { - return $this->updated_on; + return $this->updatedOn; } /** From 3cf477f5b87dc3ea83a5efcd10f2e2d5cc07059f Mon Sep 17 00:00:00 2001 From: Andrey Date: Wed, 14 Aug 2013 16:40:47 +0200 Subject: [PATCH 48/67] Removed a few remaining underscores --- lib/Alchemy/Phrasea/Feed/Aggregate.php | 4 ++-- lib/Doctrine/Entities/Feed.php | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/lib/Alchemy/Phrasea/Feed/Aggregate.php b/lib/Alchemy/Phrasea/Feed/Aggregate.php index 24d449ef11..e4ed58b86d 100644 --- a/lib/Alchemy/Phrasea/Feed/Aggregate.php +++ b/lib/Alchemy/Phrasea/Feed/Aggregate.php @@ -50,8 +50,8 @@ class Aggregate implements FeedInterface { $this->title = 'AGGREGATE'; $this->subtitle = 'AGGREGATE SUBTITLE'; - $this->created_on = new \DateTime(); - $this->updated_on = new \DateTime(); + $this->createdOn = new \DateTime(); + $this->updatedOn = new \DateTime(); $this->em = $em; $tmp_feeds = array(); diff --git a/lib/Doctrine/Entities/Feed.php b/lib/Doctrine/Entities/Feed.php index 313aac032a..708922f40a 100644 --- a/lib/Doctrine/Entities/Feed.php +++ b/lib/Doctrine/Entities/Feed.php @@ -73,7 +73,7 @@ class Feed implements FeedInterface /** * @ORM\OneToMany(targetEntity="FeedEntry", mappedBy="feed", cascade={"ALL"}) - * @ORM\OrderBy({"created_on" = "ASC"}) + * @ORM\OrderBy({"createdOn" = "ASC"}) */ private $entries; From 887af14a82ddea6bbd167fa735ed157581b3ab7d Mon Sep 17 00:00:00 2001 From: Andrey Date: Wed, 14 Aug 2013 17:35:36 +0200 Subject: [PATCH 49/67] More camelcase --- lib/Alchemy/Phrasea/Controller/Prod/Feed.php | 6 +++--- lib/Alchemy/Phrasea/Feed/AggregateToken.php | 6 +++--- plugins/account.less | 0 plugins/login.less | 0 4 files changed, 6 insertions(+), 6 deletions(-) delete mode 100644 plugins/account.less delete mode 100644 plugins/login.less diff --git a/lib/Alchemy/Phrasea/Controller/Prod/Feed.php b/lib/Alchemy/Phrasea/Controller/Prod/Feed.php index cc7492e470..7700f50563 100644 --- a/lib/Alchemy/Phrasea/Controller/Prod/Feed.php +++ b/lib/Alchemy/Phrasea/Controller/Prod/Feed.php @@ -142,9 +142,9 @@ class Feed implements ControllerProviderInterface ->setTitle($title) ->setSubtitle($request->request->get('subtitle', '')); - $current_feed_id = $entry->getFeed()->getId(); - $new_feed_id = $request->request->get('feed_id', $current_feed_id); - if ($current_feed_id !== (int) $new_feed_id) { + $currentFeedId = $entry->getFeed()->getId(); + $new_feed_id = $request->request->get('feed_id', $currentFeedId); + if ($currentFeedId !== (int) $new_feed_id) { $new_feed = $app['EM']->getRepository('Entities\Feed')->find($new_feed_id); diff --git a/lib/Alchemy/Phrasea/Feed/AggregateToken.php b/lib/Alchemy/Phrasea/Feed/AggregateToken.php index 96edf496c0..ac4b1a0be7 100644 --- a/lib/Alchemy/Phrasea/Feed/AggregateToken.php +++ b/lib/Alchemy/Phrasea/Feed/AggregateToken.php @@ -22,7 +22,7 @@ class AggregateToken private $id; /** @var string */ - private $usr_id; + private $usrId; /** @var Aggregate */ private $aggregatedFeed; @@ -45,7 +45,7 @@ class AggregateToken */ public function setUsrId($usrId) { - $this->usr_id = $usrId; + $this->usrId = $usrId; return $this; } @@ -57,7 +57,7 @@ class AggregateToken */ public function getUsrId() { - return $this->usr_id; + return $this->usrId; } /** diff --git a/plugins/account.less b/plugins/account.less deleted file mode 100644 index e69de29bb2..0000000000 diff --git a/plugins/login.less b/plugins/login.less deleted file mode 100644 index e69de29bb2..0000000000 From 731170343b84de9bd8f04553d42dff4a59db8453 Mon Sep 17 00:00:00 2001 From: Andrey Date: Wed, 14 Aug 2013 17:55:27 +0200 Subject: [PATCH 50/67] changed file path in publications --- lib/Alchemy/Phrasea/Controller/Admin/Publications.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/Alchemy/Phrasea/Controller/Admin/Publications.php b/lib/Alchemy/Phrasea/Controller/Admin/Publications.php index 6d22473c64..b52ca071af 100644 --- a/lib/Alchemy/Phrasea/Controller/Admin/Publications.php +++ b/lib/Alchemy/Phrasea/Controller/Admin/Publications.php @@ -178,7 +178,7 @@ class Publications implements ControllerProviderInterface $app['EM']->flush(); $app['filesystem']->copy($tmpname, $app['root.path'] . '/config/feed_' . $feed->getId() . '.jpg'); - $app['filesystem']->copy($tmpname, 'custom/feed_' . $feed->getId() . '.jpg'); + $app['filesystem']->copy($tmpname, sprintf('%s/www/custom/feed_%d.jpg', $app['root.path'], $feed->getId())); $app['filesystem']->remove($tmpname); From 1b8c2433b0734cb3080b3feda5985111b11b1f27 Mon Sep 17 00:00:00 2001 From: Andrey Date: Wed, 14 Aug 2013 18:07:05 +0200 Subject: [PATCH 51/67] replaced a dql request with querybuilder one --- lib/Doctrine/Repositories/SessionRepository.php | 17 +++++++---------- 1 file changed, 7 insertions(+), 10 deletions(-) diff --git a/lib/Doctrine/Repositories/SessionRepository.php b/lib/Doctrine/Repositories/SessionRepository.php index c0e198ae4e..c4de8d73c8 100644 --- a/lib/Doctrine/Repositories/SessionRepository.php +++ b/lib/Doctrine/Repositories/SessionRepository.php @@ -33,20 +33,17 @@ class SessionRepository extends EntityRepository { $base_ids = array_keys($user->ACL()->get_granted_base()); - $dql = 'SELECT f FROM Entities\Feed f - WHERE f.baseId IS NULL '; + $qb = $this->createQueryBuilder('f'); + $qb->where($qb->expr()->isNull('f.baseId')) + ->orWhere('f.public = true'); - if (count($base_ids) > 0) { - $dql .= ' OR f.baseId - IN (' . implode(', ', $base_ids) . ') '; + if (!empty($base_ids)) { + $qb->orWhere($qb->expr()->in('f.baseId', $base_ids)); } - $dql .= ' OR f.public = true - ORDER BY f.updatedOn DESC'; + $qb->orderBy('f.updatedOn', 'DESC'); - $query = $this->_em->createQuery($dql); - - return $query->getResult(); + return $qb->getQuery()->getResult(); } /** From a5cdb65ed6f8761c9ea967b35363816471cd879f Mon Sep 17 00:00:00 2001 From: Andrey Date: Wed, 14 Aug 2013 18:23:19 +0200 Subject: [PATCH 52/67] Removed loadwithuser method --- lib/Alchemy/Phrasea/Controller/Prod/Feed.php | 11 ++++++--- lib/Doctrine/Entities/Feed.php | 20 ++++++++++++++++ .../Repositories/SessionRepository.php | 23 ------------------- lib/classes/API/V1/adapter.php | 6 +++-- 4 files changed, 32 insertions(+), 28 deletions(-) diff --git a/lib/Alchemy/Phrasea/Controller/Prod/Feed.php b/lib/Alchemy/Phrasea/Controller/Prod/Feed.php index 7700f50563..730f42a697 100644 --- a/lib/Alchemy/Phrasea/Controller/Prod/Feed.php +++ b/lib/Alchemy/Phrasea/Controller/Prod/Feed.php @@ -228,7 +228,10 @@ class Feed implements ControllerProviderInterface $page = (int) $request->query->get('page'); $page = $page > 0 ? $page : 1; - $feed = $app['EM']->getRepository('Entities\Feed')->loadWithUser($app, $app['authentication']->getUser(), $id); + $feed = $app['EM']->getRepository('Entities\Feed')->find($id); + if (!$feed->isAccessible($app['authentication']->getUser(), $app)) { + $app->abort(404, 'Feed not found'); + } $feeds = $app['EM']->getRepository('Entities\Feed')->getAllForUser($app['authentication']->getUser()); $datas = $app['twig']->render('prod/feeds/feeds.html.twig', array('feed' => $feed, 'feeds' => $feeds, 'page' => $page)); @@ -262,8 +265,10 @@ class Feed implements ControllerProviderInterface $controllers->get('/subscribe/{id}/', function(Application $app, Request $request, $id) { $renew = ($request->query->get('renew') === 'true'); - $feed = $app['EM']->getRepository('Entities\Feed')->loadWithUser($app, $app['authentication']->getUser(), $id); - + $feed = $app['EM']->getRepository('Entities\Feed')->find($id); + if (!$feed->isAccessible($app['authentication']->getUser(), $app)) { + $app->abort(404, 'Feed not found'); + } $link = $app['feed.user-link-generator']->generate($feed, $app['authentication']->getUser(), FeedLinkGenerator::FORMAT_RSS, null, $renew); $output = array( diff --git a/lib/Doctrine/Entities/Feed.php b/lib/Doctrine/Entities/Feed.php index 708922f40a..2da4754ddb 100644 --- a/lib/Doctrine/Entities/Feed.php +++ b/lib/Doctrine/Entities/Feed.php @@ -543,4 +543,24 @@ class Feed implements FeedInterface return false; } + + /** + * + * Returns a boolean indicating whether a given user has access to the feed + * + * @param \User_Adapter $user + * @param \Alchemy\Phrasea\Application $app + * + * @return boolean + */ + public function isAccessible(\User_Adapter $user, Application $app) + { + $coll = $this->getCollection($app); + if ($this->isPublic() + || $coll === null + || in_array($coll->get_base_id(), array_keys($user->ACL()->get_granted_base()))) { + return true; + } + return false; + } } diff --git a/lib/Doctrine/Repositories/SessionRepository.php b/lib/Doctrine/Repositories/SessionRepository.php index c4de8d73c8..d29dee3a98 100644 --- a/lib/Doctrine/Repositories/SessionRepository.php +++ b/lib/Doctrine/Repositories/SessionRepository.php @@ -46,29 +46,6 @@ class SessionRepository extends EntityRepository return $qb->getQuery()->getResult(); } - /** - * Returns the given feed if the user can access to it. - * - * @param Application $app - * @param \User_Adapter $user - * @param type $id - * @return Feed - */ - public function loadWithUser(Application $app, \User_Adapter $user, $id) - { - $feed = $this->find($id); - if ($feed) { - $coll = $feed->getCollection($app); - if ($feed->isPublic() - || $coll === null - || in_array($coll->get_base_id(), array_keys($user->ACL()->get_granted_base()))) { - return $feed; - } - } - - return null; - } - /** * Returns all the feeds from a given array containing their id. * diff --git a/lib/classes/API/V1/adapter.php b/lib/classes/API/V1/adapter.php index b8359fd1b4..751d0a14ea 100644 --- a/lib/classes/API/V1/adapter.php +++ b/lib/classes/API/V1/adapter.php @@ -1517,8 +1517,10 @@ class API_V1_adapter extends API_V1_Abstract { $result = new API_V1_result($this->app, $request, $this); - $feed = $this->app['EM']->getRepository('Entities\Feed')->loadWithUser($this->app, $user, $publication_id); - + $feed = $app['EM']->getRepository('Entities\Feed')->find($publication_id); + if (!$feed->isAccessible($app['authentication']->getUser(), $this->app)) { + return $result->set_datas(array()) + } $offset_start = (int) ($request->get('offset_start') ? : 0); $per_page = (int) ($request->get('per_page') ? : 5); From 1baf81040fe60e7853654a6947a5df4bb15ea68c Mon Sep 17 00:00:00 2001 From: Andrey Date: Wed, 14 Aug 2013 18:25:32 +0200 Subject: [PATCH 53/67] Fixed a typo --- lib/classes/API/V1/adapter.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/classes/API/V1/adapter.php b/lib/classes/API/V1/adapter.php index 751d0a14ea..42a3bbcb85 100644 --- a/lib/classes/API/V1/adapter.php +++ b/lib/classes/API/V1/adapter.php @@ -1519,7 +1519,7 @@ class API_V1_adapter extends API_V1_Abstract $feed = $app['EM']->getRepository('Entities\Feed')->find($publication_id); if (!$feed->isAccessible($app['authentication']->getUser(), $this->app)) { - return $result->set_datas(array()) + return $result->set_datas(array()); } $offset_start = (int) ($request->get('offset_start') ? : 0); $per_page = (int) ($request->get('per_page') ? : 5); From 58550a241036db178c10ad96adab41e0a676c85e Mon Sep 17 00:00:00 2001 From: Andrey Date: Wed, 14 Aug 2013 18:26:53 +0200 Subject: [PATCH 54/67] Replaced error messages --- lib/Alchemy/Phrasea/Controller/Admin/Publications.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/lib/Alchemy/Phrasea/Controller/Admin/Publications.php b/lib/Alchemy/Phrasea/Controller/Admin/Publications.php index b52ca071af..2a73a047b6 100644 --- a/lib/Alchemy/Phrasea/Controller/Admin/Publications.php +++ b/lib/Alchemy/Phrasea/Controller/Admin/Publications.php @@ -210,7 +210,7 @@ class Publications implements ControllerProviderInterface $app['EM']->flush(); } catch (\Exception $e) { - $error = $e->getMessage(); + $error = "An error occured"; } return $app->redirectPath('admin_feeds_feed', array('id' => $id, 'error' => $error)); @@ -237,7 +237,7 @@ class Publications implements ControllerProviderInterface $app['EM']->flush(); } } catch (\Exception $e) { - $error = $e->getMessage(); + $error = "An error occured"; } return $app->redirectPath('admin_feeds_feed', array('id' => $id, 'error' => $error)); From 2773075c52eaa7e93168951c177c38e68972a94f Mon Sep 17 00:00:00 2001 From: Andrey Date: Wed, 14 Aug 2013 18:49:47 +0200 Subject: [PATCH 55/67] Fixed another typo in adapter --- lib/classes/API/V1/adapter.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/lib/classes/API/V1/adapter.php b/lib/classes/API/V1/adapter.php index 42a3bbcb85..8129515a09 100644 --- a/lib/classes/API/V1/adapter.php +++ b/lib/classes/API/V1/adapter.php @@ -1517,8 +1517,8 @@ class API_V1_adapter extends API_V1_Abstract { $result = new API_V1_result($this->app, $request, $this); - $feed = $app['EM']->getRepository('Entities\Feed')->find($publication_id); - if (!$feed->isAccessible($app['authentication']->getUser(), $this->app)) { + $feed = $this->app['EM']->getRepository('Entities\Feed')->find($publication_id); + if (!$feed->isAccessible($user, $this->app)) { return $result->set_datas(array()); } $offset_start = (int) ($request->get('offset_start') ? : 0); From d8cac877e6426c5f4e7900b8c6d79f47db2c403c Mon Sep 17 00:00:00 2001 From: Andrey Date: Tue, 27 Aug 2013 14:32:47 +0200 Subject: [PATCH 56/67] Restored repositories --- .../Repositories/FeedEntryRepository.php | 15 +++ .../Repositories/FeedItemRepository.php | 15 +++ .../Repositories/FeedPublisherRepository.php | 17 ++++ lib/Doctrine/Repositories/FeedRepository.php | 98 +++++++++++++++++++ 4 files changed, 145 insertions(+) create mode 100644 lib/Doctrine/Repositories/FeedEntryRepository.php create mode 100644 lib/Doctrine/Repositories/FeedItemRepository.php create mode 100644 lib/Doctrine/Repositories/FeedPublisherRepository.php create mode 100644 lib/Doctrine/Repositories/FeedRepository.php diff --git a/lib/Doctrine/Repositories/FeedEntryRepository.php b/lib/Doctrine/Repositories/FeedEntryRepository.php new file mode 100644 index 0000000000..2607262bbf --- /dev/null +++ b/lib/Doctrine/Repositories/FeedEntryRepository.php @@ -0,0 +1,15 @@ +ACL()->get_granted_base()); + + $dql = 'SELECT f FROM Entities\Feed f + WHERE f.base_id IS NULL '; + + if (count($base_ids) > 0) { + $dql .= ' OR f.base_id + IN (' . implode(', ', $base_ids) . ') '; + } + + $dql .= ' OR f.public = true + ORDER BY f.updated_on DESC'; + + $query = $this->_em->createQuery($dql); + + return $query->getResult(); + } + + /** + * Returns all the public feeds. + * + * @return Collection + */ + public function findAllPublic() + { + $dql = 'SELECT f FROM Entities\Feed f + WHERE f.public = true + ORDER BY f.updated_on DESC'; + + $query = $this->_em->createQuery($dql); + + return $query->getResult(); + } + + /** + * Returns the given feed if the user can access to it. + * + * @param Application $app + * @param \User_Adapter $user + * @param type $id + * @return Feed + */ + public function loadWithUser(Application $app, \User_Adapter $user, $id) + { + $feed = $this->find($id); + if ($feed) { + $coll = $feed->getCollection($app); + if ($feed->isPublic() + || $coll === null + || in_array($coll->get_base_id(), array_keys($user->ACL()->get_granted_base()))) { + return $feed; + } + } + + return null; + } + + /** + * Returns all the feeds from a given array containing their id. + * + * @param array $feed_id + * @return Collection + */ + public function findByIdArray(array $feed_id) + { + $dql = 'SELECT f FROM Entities\Feed f + ORDER BY f.created_on DESC + WHERE f.id IN (' . implode(",", $feed_id) . ')'; + + $query = $this->_em->createQuery($dql); + + return $query->getResult(); + } +} From 5b0925996dd44ef29c922c80a690454d91a493e0 Mon Sep 17 00:00:00 2001 From: Andrey Date: Tue, 27 Aug 2013 15:52:22 +0200 Subject: [PATCH 57/67] Restored methods in repositories --- .../Repositories/FeedEntryRepository.php | 26 +++++++++++++++++++ lib/Doctrine/Repositories/FeedRepository.php | 24 +++-------------- 2 files changed, 30 insertions(+), 20 deletions(-) diff --git a/lib/Doctrine/Repositories/FeedEntryRepository.php b/lib/Doctrine/Repositories/FeedEntryRepository.php index 2607262bbf..3000630ce5 100644 --- a/lib/Doctrine/Repositories/FeedEntryRepository.php +++ b/lib/Doctrine/Repositories/FeedEntryRepository.php @@ -12,4 +12,30 @@ use Doctrine\ORM\EntityRepository; */ class FeedEntryRepository extends EntityRepository { + /** + * Returns a collection of FeedEntry from given feeds, limited to $how_many results, starting with $offset_start + * + * @param array $feeds + * @param integer $offset_start + * @param integer $how_many + * + * @return \Doctrine\Common\Collections\Collection + */ + public function findByFeeds($feeds, $offset_start = null, $how_many = null) + { + $dql = 'SELECT f FROM Entities\FeedEntry f + WHERE f.feed IN (:feeds) order by f.updatedOn DESC'; + + $query = $this->_em->createQuery($dql); + $query->setParameter('feeds', $feeds); + + if (null !== $offset_start && 0 !== $offset_start) { + $query->setFirstResult($offset_start); + } + if (null !== $how_many) { + $query->setMaxResults($how_many); + } + + return $query->getResult(); + } } diff --git a/lib/Doctrine/Repositories/FeedRepository.php b/lib/Doctrine/Repositories/FeedRepository.php index c7c81a3af1..31c9256bf8 100644 --- a/lib/Doctrine/Repositories/FeedRepository.php +++ b/lib/Doctrine/Repositories/FeedRepository.php @@ -25,31 +25,15 @@ class FeedRepository extends EntityRepository $base_ids = array_keys($user->ACL()->get_granted_base()); $dql = 'SELECT f FROM Entities\Feed f - WHERE f.base_id IS NULL '; + WHERE f.baseId IS NULL '; if (count($base_ids) > 0) { - $dql .= ' OR f.base_id + $dql .= ' OR f.baseId IN (' . implode(', ', $base_ids) . ') '; } $dql .= ' OR f.public = true - ORDER BY f.updated_on DESC'; - - $query = $this->_em->createQuery($dql); - - return $query->getResult(); - } - - /** - * Returns all the public feeds. - * - * @return Collection - */ - public function findAllPublic() - { - $dql = 'SELECT f FROM Entities\Feed f - WHERE f.public = true - ORDER BY f.updated_on DESC'; + ORDER BY f.updatedOn DESC'; $query = $this->_em->createQuery($dql); @@ -88,7 +72,7 @@ class FeedRepository extends EntityRepository public function findByIdArray(array $feed_id) { $dql = 'SELECT f FROM Entities\Feed f - ORDER BY f.created_on DESC + ORDER BY f.createdOn DESC WHERE f.id IN (' . implode(",", $feed_id) . ')'; $query = $this->_em->createQuery($dql); From 0fb4e8e0ee2c860d4d6810c16af3e748f34356db Mon Sep 17 00:00:00 2001 From: Andrey Date: Tue, 27 Aug 2013 16:45:22 +0200 Subject: [PATCH 58/67] Restored usage of querybuilder in feedrepository --- lib/Doctrine/Repositories/FeedRepository.php | 56 ++++++-------------- 1 file changed, 17 insertions(+), 39 deletions(-) diff --git a/lib/Doctrine/Repositories/FeedRepository.php b/lib/Doctrine/Repositories/FeedRepository.php index 31c9256bf8..3a085dcfc3 100644 --- a/lib/Doctrine/Repositories/FeedRepository.php +++ b/lib/Doctrine/Repositories/FeedRepository.php @@ -24,59 +24,37 @@ class FeedRepository extends EntityRepository { $base_ids = array_keys($user->ACL()->get_granted_base()); - $dql = 'SELECT f FROM Entities\Feed f - WHERE f.baseId IS NULL '; + $qb = $this + ->createQueryBuilder('f'); + + $qb->where($qb->expr()->isNull('f.baseId')) + ->orWhere('f.public = true'); if (count($base_ids) > 0) { - $dql .= ' OR f.baseId - IN (' . implode(', ', $base_ids) . ') '; + $qb->orWhere($qb->expr()->in('f.baseId', $base_ids)); } - $dql .= ' OR f.public = true - ORDER BY f.updatedOn DESC'; + $qb->orderBy('f.updatedOn', 'DESC'); - $query = $this->_em->createQuery($dql); - - return $query->getResult(); - } - - /** - * Returns the given feed if the user can access to it. - * - * @param Application $app - * @param \User_Adapter $user - * @param type $id - * @return Feed - */ - public function loadWithUser(Application $app, \User_Adapter $user, $id) - { - $feed = $this->find($id); - if ($feed) { - $coll = $feed->getCollection($app); - if ($feed->isPublic() - || $coll === null - || in_array($coll->get_base_id(), array_keys($user->ACL()->get_granted_base()))) { - return $feed; - } - } - - return null; + return $qb->getQuery()->getResult(); } /** * Returns all the feeds from a given array containing their id. * - * @param array $feed_id + * @param array $feedIds * @return Collection */ - public function findByIdArray(array $feed_id) + public function findByIds(array $feedIds) { - $dql = 'SELECT f FROM Entities\Feed f - ORDER BY f.createdOn DESC - WHERE f.id IN (' . implode(",", $feed_id) . ')'; + $qb = $this->createQueryBuilder('f'); - $query = $this->_em->createQuery($dql); + if (!empty($feedIds)) { + $qb->Where($qb->expr()->in('f.id', $feedIds)); + } - return $query->getResult(); + $qb->orderBy('f.updatedOn', 'DESC'); + + return $qb->getQuery()->getResult(); } } From 998e0c68ea6a4357c4e5c4f9caf7d3bf40cab7fe Mon Sep 17 00:00:00 2001 From: Andrey Date: Mon, 2 Sep 2013 09:45:50 +0200 Subject: [PATCH 59/67] Fixed errors, restored sessionrepository as it should be --- .../Phrasea/Controller/Admin/Publications.php | 2 +- .../Phrasea/Feed/Formatter/AtomFormatter.php | 4 +- .../Repositories/SessionRepository.php | 42 ------------------- 3 files changed, 3 insertions(+), 45 deletions(-) diff --git a/lib/Alchemy/Phrasea/Controller/Admin/Publications.php b/lib/Alchemy/Phrasea/Controller/Admin/Publications.php index 2a73a047b6..f67008ce19 100644 --- a/lib/Alchemy/Phrasea/Controller/Admin/Publications.php +++ b/lib/Alchemy/Phrasea/Controller/Admin/Publications.php @@ -230,7 +230,7 @@ class Publications implements ControllerProviderInterface } $user = $publisher->getUser($app); - if ($feed->isPublisher($user) && false === $feed->isOwner($user)) { + if ($feed->isPublisher($user) && !$feed->isOwner($user)) { $feed->removePublisher($publisher); $app['EM']->remove($publisher); diff --git a/lib/Alchemy/Phrasea/Feed/Formatter/AtomFormatter.php b/lib/Alchemy/Phrasea/Feed/Formatter/AtomFormatter.php index 5a3ffd45c3..bce5da422a 100644 --- a/lib/Alchemy/Phrasea/Feed/Formatter/AtomFormatter.php +++ b/lib/Alchemy/Phrasea/Feed/Formatter/AtomFormatter.php @@ -111,8 +111,8 @@ class AtomFormatter extends FeedFormatterAbstract implements FeedFormatterInterf if (null !== $feed->getSubtitle()) { $this->addTag($document, $root, 'subtitle', $feed->getSubtitle()); } - if (isset($this->icon)) { - $this->addTag($document, $root, 'icon', $this->icon); + if (null !== $feed->getIconUrl()) { + $this->addTag($document, $root, 'icon', $feed->getIconUrl()); } if (isset($this->author)) { $author = $this->addTag($document, $root, 'author'); diff --git a/lib/Doctrine/Repositories/SessionRepository.php b/lib/Doctrine/Repositories/SessionRepository.php index d29dee3a98..097e838b39 100644 --- a/lib/Doctrine/Repositories/SessionRepository.php +++ b/lib/Doctrine/Repositories/SessionRepository.php @@ -13,7 +13,6 @@ namespace Repositories; use Alchemy\Phrasea\Application; use Doctrine\ORM\EntityRepository; -use Entities\Feed; /** * SessionRepository @@ -23,45 +22,4 @@ use Entities\Feed; */ class SessionRepository extends EntityRepository { - /** - * Returns all the feeds a user can access. - * - * @param User_Adapter $user - * @return \Doctrine\Common\Collections\Collection - */ - public function getAllForUser(\User_Adapter $user) - { - $base_ids = array_keys($user->ACL()->get_granted_base()); - - $qb = $this->createQueryBuilder('f'); - $qb->where($qb->expr()->isNull('f.baseId')) - ->orWhere('f.public = true'); - - if (!empty($base_ids)) { - $qb->orWhere($qb->expr()->in('f.baseId', $base_ids)); - } - - $qb->orderBy('f.updatedOn', 'DESC'); - - return $qb->getQuery()->getResult(); - } - - /** - * Returns all the feeds from a given array containing their id. - * - * @param array $feed_id - * @return Collection - */ -public function findByIds(array $feedIds) -{ - $qb = $this->createQueryBuilder('f'); - - if (!empty($feedIds)) { - $qb->Where($qb->expr()->in('f.id', $feedIds)); - } - - $qb->orderBy('f.updated_on', 'DESC'); - - return $qb->getQuery()->getResult(); -} } From a148cef06361f89f4e592ae5a34365b07d7e747d Mon Sep 17 00:00:00 2001 From: Andrey Date: Mon, 2 Sep 2013 13:07:04 +0200 Subject: [PATCH 60/67] Added more flushes to a patch --- lib/classes/patch/320f.php | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/lib/classes/patch/320f.php b/lib/classes/patch/320f.php index cb4d2f07b8..b520ececf0 100644 --- a/lib/classes/patch/320f.php +++ b/lib/classes/patch/320f.php @@ -81,6 +81,7 @@ class patch_320f implements patchInterface $stmt->closeCursor(); $date_ref = new DateTime(); + $n = 0; foreach ($rs as $row) { $user = User_Adapter::getInstance($row['usr_id'], $app); @@ -141,9 +142,15 @@ class patch_320f implements patchInterface $stmt->execute(array(':ssel_id' => $row['ssel_id'])); $stmt->closeCursor(); $app['EM']->persist($feed); + $n++; + if ($n % 1000 == 0) { + $app['EM']->flush(); + $app['EM']->clear(); + } } $this->set_feed_dates($date_ref); $app['EM']->flush(); + $app['EM']->clear(); return true; } From 40b1e9e663e6d6c84c2c6a7fb85e0bd2254fa14b Mon Sep 17 00:00:00 2001 From: Andrey Date: Mon, 2 Sep 2013 14:58:10 +0200 Subject: [PATCH 61/67] Restored proxies --- .../Proxies/__CG__EntitiesAggregateToken.php | 100 ++++++ .../Proxies/__CG__EntitiesCategory.php | 202 ++++++++++++ lib/Doctrine/Proxies/__CG__EntitiesFeed.php | 292 ++++++++++++++++++ .../Proxies/__CG__EntitiesFeedEntry.php | 202 ++++++++++++ .../Proxies/__CG__EntitiesFeedItem.php | 160 ++++++++++ .../Proxies/__CG__EntitiesFeedPublisher.php | 130 ++++++++ .../Proxies/__CG__EntitiesFeedToken.php | 112 +++++++ .../Proxies/__CG__EntitiesLazaretCheck.php | 106 +++++++ .../__CG__EntitiesValidationParticipant.php | 196 ++++++++++++ 9 files changed, 1500 insertions(+) create mode 100644 lib/Doctrine/Proxies/__CG__EntitiesAggregateToken.php create mode 100644 lib/Doctrine/Proxies/__CG__EntitiesCategory.php create mode 100644 lib/Doctrine/Proxies/__CG__EntitiesFeed.php create mode 100644 lib/Doctrine/Proxies/__CG__EntitiesFeedEntry.php create mode 100644 lib/Doctrine/Proxies/__CG__EntitiesFeedItem.php create mode 100644 lib/Doctrine/Proxies/__CG__EntitiesFeedPublisher.php create mode 100644 lib/Doctrine/Proxies/__CG__EntitiesFeedToken.php create mode 100644 lib/Doctrine/Proxies/__CG__EntitiesLazaretCheck.php create mode 100644 lib/Doctrine/Proxies/__CG__EntitiesValidationParticipant.php diff --git a/lib/Doctrine/Proxies/__CG__EntitiesAggregateToken.php b/lib/Doctrine/Proxies/__CG__EntitiesAggregateToken.php new file mode 100644 index 0000000000..4699a03f02 --- /dev/null +++ b/lib/Doctrine/Proxies/__CG__EntitiesAggregateToken.php @@ -0,0 +1,100 @@ +_entityPersister = $entityPersister; + $this->_identifier = $identifier; + } + /** @private */ + public function __load() + { + if (!$this->__isInitialized__ && $this->_entityPersister) { + $this->__isInitialized__ = true; + + if (method_exists($this, "__wakeup")) { + // call this after __isInitialized__to avoid infinite recursion + // but before loading to emulate what ClassMetadata::newInstance() + // provides. + $this->__wakeup(); + } + + if ($this->_entityPersister->load($this->_identifier, $this) === null) { + throw new \Doctrine\ORM\EntityNotFoundException(); + } + unset($this->_entityPersister, $this->_identifier); + } + } + + /** @private */ + public function __isInitialized() + { + return $this->__isInitialized__; + } + + + public function getId() + { + if ($this->__isInitialized__ === false) { + return (int) $this->_identifier["id"]; + } + $this->__load(); + return parent::getId(); + } + + public function setUsrId($usrId) + { + $this->__load(); + return parent::setUsrId($usrId); + } + + public function getUsrId() + { + $this->__load(); + return parent::getUsrId(); + } + + public function setValue($value) + { + $this->__load(); + return parent::setValue($value); + } + + public function getValue() + { + $this->__load(); + return parent::getValue(); + } + + + public function __sleep() + { + return array('__isInitialized__', 'id', 'usrId', 'value'); + } + + public function __clone() + { + if (!$this->__isInitialized__ && $this->_entityPersister) { + $this->__isInitialized__ = true; + $class = $this->_entityPersister->getClassMetadata(); + $original = $this->_entityPersister->load($this->_identifier); + if ($original === null) { + throw new \Doctrine\ORM\EntityNotFoundException(); + } + foreach ($class->reflFields as $field => $reflProperty) { + $reflProperty->setValue($this, $reflProperty->getValue($original)); + } + unset($this->_entityPersister, $this->_identifier); + } + + } +} \ No newline at end of file diff --git a/lib/Doctrine/Proxies/__CG__EntitiesCategory.php b/lib/Doctrine/Proxies/__CG__EntitiesCategory.php new file mode 100644 index 0000000000..317d86f9cc --- /dev/null +++ b/lib/Doctrine/Proxies/__CG__EntitiesCategory.php @@ -0,0 +1,202 @@ +_entityPersister = $entityPersister; + $this->_identifier = $identifier; + } + /** @private */ + public function __load() + { + if (!$this->__isInitialized__ && $this->_entityPersister) { + $this->__isInitialized__ = true; + + if (method_exists($this, "__wakeup")) { + // call this after __isInitialized__to avoid infinite recursion + // but before loading to emulate what ClassMetadata::newInstance() + // provides. + $this->__wakeup(); + } + + if ($this->_entityPersister->load($this->_identifier, $this) === null) { + throw new \Doctrine\ORM\EntityNotFoundException(); + } + unset($this->_entityPersister, $this->_identifier); + } + } + + /** @private */ + public function __isInitialized() + { + return $this->__isInitialized__; + } + + + public function getTranslations() + { + $this->__load(); + return parent::getTranslations(); + } + + public function getTranslation($locale) + { + $this->__load(); + return parent::getTranslation($locale); + } + + public function addTranslation(\Entities\CategoryTranslation $t) + { + $this->__load(); + return parent::addTranslation($t); + } + + public function getId() + { + if ($this->__isInitialized__ === false) { + return (int) $this->_identifier["id"]; + } + $this->__load(); + return parent::getId(); + } + + public function setTitle($title) + { + $this->__load(); + return parent::setTitle($title); + } + + public function getTitle() + { + $this->__load(); + return parent::getTitle(); + } + + public function setSubtitle($subtitle) + { + $this->__load(); + return parent::setSubtitle($subtitle); + } + + public function getSubtitle() + { + $this->__load(); + return parent::getSubtitle(); + } + + public function setParent($parent) + { + $this->__load(); + return parent::setParent($parent); + } + + public function getParent() + { + $this->__load(); + return parent::getParent(); + } + + public function getRoot() + { + $this->__load(); + return parent::getRoot(); + } + + public function getLevel() + { + $this->__load(); + return parent::getLevel(); + } + + public function getChildren() + { + $this->__load(); + return parent::getChildren(); + } + + public function getLeft() + { + $this->__load(); + return parent::getLeft(); + } + + public function getRight() + { + $this->__load(); + return parent::getRight(); + } + + public function getCreated() + { + $this->__load(); + return parent::getCreated(); + } + + public function getUpdated() + { + $this->__load(); + return parent::getUpdated(); + } + + public function getCreatedBy() + { + $this->__load(); + return parent::getCreatedBy(); + } + + public function getUpdatedBy() + { + $this->__load(); + return parent::getUpdatedBy(); + } + + public function __toString() + { + $this->__load(); + return parent::__toString(); + } + + public function addElement(\Entities\CategoryElement $elements) + { + $this->__load(); + return parent::addElement($elements); + } + + public function removeElement(\Entities\CategoryElement $elements) + { + $this->__load(); + return parent::removeElement($elements); + } + + + public function __sleep() + { + return array('__isInitialized__', 'id', 'title', 'subtitle', 'lft', 'rgt', 'root', 'level', 'parent', 'children', 'translations', 'elements'); + } + + public function __clone() + { + if (!$this->__isInitialized__ && $this->_entityPersister) { + $this->__isInitialized__ = true; + $class = $this->_entityPersister->getClassMetadata(); + $original = $this->_entityPersister->load($this->_identifier); + if ($original === null) { + throw new \Doctrine\ORM\EntityNotFoundException(); + } + foreach ($class->reflFields as $field => $reflProperty) { + $reflProperty->setValue($this, $reflProperty->getValue($original)); + } + unset($this->_entityPersister, $this->_identifier); + } + + } +} \ No newline at end of file diff --git a/lib/Doctrine/Proxies/__CG__EntitiesFeed.php b/lib/Doctrine/Proxies/__CG__EntitiesFeed.php new file mode 100644 index 0000000000..0710572d45 --- /dev/null +++ b/lib/Doctrine/Proxies/__CG__EntitiesFeed.php @@ -0,0 +1,292 @@ +_entityPersister = $entityPersister; + $this->_identifier = $identifier; + } + /** @private */ + public function __load() + { + if (!$this->__isInitialized__ && $this->_entityPersister) { + $this->__isInitialized__ = true; + + if (method_exists($this, "__wakeup")) { + // call this after __isInitialized__to avoid infinite recursion + // but before loading to emulate what ClassMetadata::newInstance() + // provides. + $this->__wakeup(); + } + + if ($this->_entityPersister->load($this->_identifier, $this) === null) { + throw new \Doctrine\ORM\EntityNotFoundException(); + } + unset($this->_entityPersister, $this->_identifier); + } + } + + /** @private */ + public function __isInitialized() + { + return $this->__isInitialized__; + } + + + public function getId() + { + if ($this->__isInitialized__ === false) { + return (int) $this->_identifier["id"]; + } + $this->__load(); + return parent::getId(); + } + + public function setIsPublic($public) + { + $this->__load(); + return parent::setIsPublic($public); + } + + public function isPublic() + { + $this->__load(); + return parent::isPublic(); + } + + public function setIconUrl($iconUrl) + { + $this->__load(); + return parent::setIconUrl($iconUrl); + } + + public function getIconUrl() + { + $this->__load(); + return parent::getIconUrl(); + } + + public function setBaseId($baseId) + { + $this->__load(); + return parent::setBaseId($baseId); + } + + public function getBaseId() + { + $this->__load(); + return parent::getBaseId(); + } + + public function setTitle($title) + { + $this->__load(); + return parent::setTitle($title); + } + + public function getTitle() + { + $this->__load(); + return parent::getTitle(); + } + + public function addPublisher(\Entities\FeedPublisher $publishers) + { + $this->__load(); + return parent::addPublisher($publishers); + } + + public function removePublisher(\Entities\FeedPublisher $publishers) + { + $this->__load(); + return parent::removePublisher($publishers); + } + + public function getPublishers() + { + $this->__load(); + return parent::getPublishers(); + } + + public function addEntry(\Entities\FeedEntry $entries) + { + $this->__load(); + return parent::addEntry($entries); + } + + public function removeEntry(\Entities\FeedEntry $entries) + { + $this->__load(); + return parent::removeEntry($entries); + } + + public function getEntries($offset_start = 0, $how_many = NULL) + { + $this->__load(); + return parent::getEntries($offset_start, $how_many); + } + + public function getOwner() + { + $this->__load(); + return parent::getOwner(); + } + + public function isOwner(\User_Adapter $user) + { + $this->__load(); + return parent::isOwner($user); + } + + public function getCollection(\Alchemy\Phrasea\Application $app) + { + $this->__load(); + return parent::getCollection($app); + } + + public function setCollection(\collection $collection = NULL) + { + $this->__load(); + return parent::setCollection($collection); + } + + public function setCreatedOn($createdOn) + { + $this->__load(); + return parent::setCreatedOn($createdOn); + } + + public function getCreatedOn() + { + $this->__load(); + return parent::getCreatedOn(); + } + + public function setUpdatedOn($updatedOn) + { + $this->__load(); + return parent::setUpdatedOn($updatedOn); + } + + public function getUpdatedOn() + { + $this->__load(); + return parent::getUpdatedOn(); + } + + public function isPublisher(\User_Adapter $user) + { + $this->__load(); + return parent::isPublisher($user); + } + + public function getPublisher(\User_Adapter $user) + { + $this->__load(); + return parent::getPublisher($user); + } + + public function setSubtitle($subtitle) + { + $this->__load(); + return parent::setSubtitle($subtitle); + } + + public function getSubtitle() + { + $this->__load(); + return parent::getSubtitle(); + } + + public function isAggregated() + { + $this->__load(); + return parent::isAggregated(); + } + + public function getCountTotalEntries() + { + $this->__load(); + return parent::getCountTotalEntries(); + } + + public function hasAccess(\User_Adapter $user, \Alchemy\Phrasea\Application $app) + { + $this->__load(); + return parent::hasAccess($user, $app); + } + + public function addToken(\Entities\FeedToken $tokens) + { + $this->__load(); + return parent::addToken($tokens); + } + + public function removeToken(\Entities\FeedToken $tokens) + { + $this->__load(); + return parent::removeToken($tokens); + } + + public function getTokens() + { + $this->__load(); + return parent::getTokens(); + } + + public function addEntrie(\Entities\FeedEntry $entries) + { + $this->__load(); + return parent::addEntrie($entries); + } + + public function removeEntrie(\Entities\FeedEntry $entries) + { + $this->__load(); + return parent::removeEntrie($entries); + } + + public function hasPage($pageNumber, $nbEntriesByPage) + { + $this->__load(); + return parent::hasPage($pageNumber, $nbEntriesByPage); + } + + public function isAccessible(\User_Adapter $user, \Alchemy\Phrasea\Application $app) + { + $this->__load(); + return parent::isAccessible($user, $app); + } + + + public function __sleep() + { + return array('__isInitialized__', 'id', 'public', 'iconUrl', 'baseId', 'title', 'subtitle', 'createdOn', 'updatedOn', 'publishers', 'entries', 'tokens'); + } + + public function __clone() + { + if (!$this->__isInitialized__ && $this->_entityPersister) { + $this->__isInitialized__ = true; + $class = $this->_entityPersister->getClassMetadata(); + $original = $this->_entityPersister->load($this->_identifier); + if ($original === null) { + throw new \Doctrine\ORM\EntityNotFoundException(); + } + foreach ($class->reflFields as $field => $reflProperty) { + $reflProperty->setValue($this, $reflProperty->getValue($original)); + } + unset($this->_entityPersister, $this->_identifier); + } + + } +} \ No newline at end of file diff --git a/lib/Doctrine/Proxies/__CG__EntitiesFeedEntry.php b/lib/Doctrine/Proxies/__CG__EntitiesFeedEntry.php new file mode 100644 index 0000000000..19fd2caae8 --- /dev/null +++ b/lib/Doctrine/Proxies/__CG__EntitiesFeedEntry.php @@ -0,0 +1,202 @@ +_entityPersister = $entityPersister; + $this->_identifier = $identifier; + } + /** @private */ + public function __load() + { + if (!$this->__isInitialized__ && $this->_entityPersister) { + $this->__isInitialized__ = true; + + if (method_exists($this, "__wakeup")) { + // call this after __isInitialized__to avoid infinite recursion + // but before loading to emulate what ClassMetadata::newInstance() + // provides. + $this->__wakeup(); + } + + if ($this->_entityPersister->load($this->_identifier, $this) === null) { + throw new \Doctrine\ORM\EntityNotFoundException(); + } + unset($this->_entityPersister, $this->_identifier); + } + } + + /** @private */ + public function __isInitialized() + { + return $this->__isInitialized__; + } + + + public function getId() + { + if ($this->__isInitialized__ === false) { + return (int) $this->_identifier["id"]; + } + $this->__load(); + return parent::getId(); + } + + public function setTitle($title) + { + $this->__load(); + return parent::setTitle($title); + } + + public function getTitle() + { + $this->__load(); + return parent::getTitle(); + } + + public function setSubtitle($subtitle) + { + $this->__load(); + return parent::setSubtitle($subtitle); + } + + public function getSubtitle() + { + $this->__load(); + return parent::getSubtitle(); + } + + public function setAuthorName($authorName) + { + $this->__load(); + return parent::setAuthorName($authorName); + } + + public function getAuthorName() + { + $this->__load(); + return parent::getAuthorName(); + } + + public function setAuthorEmail($authorEmail) + { + $this->__load(); + return parent::setAuthorEmail($authorEmail); + } + + public function getAuthorEmail() + { + $this->__load(); + return parent::getAuthorEmail(); + } + + public function setCreatedOn($createdOn) + { + $this->__load(); + return parent::setCreatedOn($createdOn); + } + + public function getCreatedOn() + { + $this->__load(); + return parent::getCreatedOn(); + } + + public function setUpdatedOn($updatedOn) + { + $this->__load(); + return parent::setUpdatedOn($updatedOn); + } + + public function getUpdatedOn() + { + $this->__load(); + return parent::getUpdatedOn(); + } + + public function addItem(\Entities\FeedItem $items) + { + $this->__load(); + return parent::addItem($items); + } + + public function removeItem(\Entities\FeedItem $items) + { + $this->__load(); + return parent::removeItem($items); + } + + public function getItems() + { + $this->__load(); + return parent::getItems(); + } + + public function setPublisher(\Entities\FeedPublisher $publisher = NULL) + { + $this->__load(); + return parent::setPublisher($publisher); + } + + public function getPublisher() + { + $this->__load(); + return parent::getPublisher(); + } + + public function setFeed(\Entities\Feed $feed = NULL) + { + $this->__load(); + return parent::setFeed($feed); + } + + public function getFeed() + { + $this->__load(); + return parent::getFeed(); + } + + public function isPublisher(\User_Adapter $user) + { + $this->__load(); + return parent::isPublisher($user); + } + + public function getItem($id) + { + $this->__load(); + return parent::getItem($id); + } + + + public function __sleep() + { + return array('__isInitialized__', 'id', 'title', 'subtitle', 'authorName', 'authorEmail', 'createdOn', 'updatedOn', 'items', 'publisher', 'feed'); + } + + public function __clone() + { + if (!$this->__isInitialized__ && $this->_entityPersister) { + $this->__isInitialized__ = true; + $class = $this->_entityPersister->getClassMetadata(); + $original = $this->_entityPersister->load($this->_identifier); + if ($original === null) { + throw new \Doctrine\ORM\EntityNotFoundException(); + } + foreach ($class->reflFields as $field => $reflProperty) { + $reflProperty->setValue($this, $reflProperty->getValue($original)); + } + unset($this->_entityPersister, $this->_identifier); + } + + } +} \ No newline at end of file diff --git a/lib/Doctrine/Proxies/__CG__EntitiesFeedItem.php b/lib/Doctrine/Proxies/__CG__EntitiesFeedItem.php new file mode 100644 index 0000000000..c47ea49d11 --- /dev/null +++ b/lib/Doctrine/Proxies/__CG__EntitiesFeedItem.php @@ -0,0 +1,160 @@ +_entityPersister = $entityPersister; + $this->_identifier = $identifier; + } + /** @private */ + public function __load() + { + if (!$this->__isInitialized__ && $this->_entityPersister) { + $this->__isInitialized__ = true; + + if (method_exists($this, "__wakeup")) { + // call this after __isInitialized__to avoid infinite recursion + // but before loading to emulate what ClassMetadata::newInstance() + // provides. + $this->__wakeup(); + } + + if ($this->_entityPersister->load($this->_identifier, $this) === null) { + throw new \Doctrine\ORM\EntityNotFoundException(); + } + unset($this->_entityPersister, $this->_identifier); + } + } + + /** @private */ + public function __isInitialized() + { + return $this->__isInitialized__; + } + + + public function getId() + { + if ($this->__isInitialized__ === false) { + return (int) $this->_identifier["id"]; + } + $this->__load(); + return parent::getId(); + } + + public function setRecordId($recordId) + { + $this->__load(); + return parent::setRecordId($recordId); + } + + public function getRecordId() + { + $this->__load(); + return parent::getRecordId(); + } + + public function setSbasId($sbasId) + { + $this->__load(); + return parent::setSbasId($sbasId); + } + + public function getSbasId() + { + $this->__load(); + return parent::getSbasId(); + } + + public function setEntry(\Entities\FeedEntry $entry = NULL) + { + $this->__load(); + return parent::setEntry($entry); + } + + public function getEntry() + { + $this->__load(); + return parent::getEntry(); + } + + public function setOrd($ord) + { + $this->__load(); + return parent::setOrd($ord); + } + + public function getOrd() + { + $this->__load(); + return parent::getOrd(); + } + + public function setCreatedOn($createdOn) + { + $this->__load(); + return parent::setCreatedOn($createdOn); + } + + public function getCreatedOn() + { + $this->__load(); + return parent::getCreatedOn(); + } + + public function setUpdatedOn($updatedOn) + { + $this->__load(); + return parent::setUpdatedOn($updatedOn); + } + + public function getUpdatedOn() + { + $this->__load(); + return parent::getUpdatedOn(); + } + + public function setLastInFeedItem() + { + $this->__load(); + return parent::setLastInFeedItem(); + } + + public function getRecord(\Alchemy\Phrasea\Application $app) + { + $this->__load(); + return parent::getRecord($app); + } + + + public function __sleep() + { + return array('__isInitialized__', 'id', 'recordId', 'sbasId', 'ord', 'createdOn', 'updatedOn', 'entry'); + } + + public function __clone() + { + if (!$this->__isInitialized__ && $this->_entityPersister) { + $this->__isInitialized__ = true; + $class = $this->_entityPersister->getClassMetadata(); + $original = $this->_entityPersister->load($this->_identifier); + if ($original === null) { + throw new \Doctrine\ORM\EntityNotFoundException(); + } + foreach ($class->reflFields as $field => $reflProperty) { + $reflProperty->setValue($this, $reflProperty->getValue($original)); + } + unset($this->_entityPersister, $this->_identifier); + } + + } +} \ No newline at end of file diff --git a/lib/Doctrine/Proxies/__CG__EntitiesFeedPublisher.php b/lib/Doctrine/Proxies/__CG__EntitiesFeedPublisher.php new file mode 100644 index 0000000000..b222551898 --- /dev/null +++ b/lib/Doctrine/Proxies/__CG__EntitiesFeedPublisher.php @@ -0,0 +1,130 @@ +_entityPersister = $entityPersister; + $this->_identifier = $identifier; + } + /** @private */ + public function __load() + { + if (!$this->__isInitialized__ && $this->_entityPersister) { + $this->__isInitialized__ = true; + + if (method_exists($this, "__wakeup")) { + // call this after __isInitialized__to avoid infinite recursion + // but before loading to emulate what ClassMetadata::newInstance() + // provides. + $this->__wakeup(); + } + + if ($this->_entityPersister->load($this->_identifier, $this) === null) { + throw new \Doctrine\ORM\EntityNotFoundException(); + } + unset($this->_entityPersister, $this->_identifier); + } + } + + /** @private */ + public function __isInitialized() + { + return $this->__isInitialized__; + } + + + public function getId() + { + if ($this->__isInitialized__ === false) { + return (int) $this->_identifier["id"]; + } + $this->__load(); + return parent::getId(); + } + + public function setUsrId($usrId) + { + $this->__load(); + return parent::setUsrId($usrId); + } + + public function getUsrId() + { + $this->__load(); + return parent::getUsrId(); + } + + public function setIsOwner($owner) + { + $this->__load(); + return parent::setIsOwner($owner); + } + + public function isOwner() + { + $this->__load(); + return parent::isOwner(); + } + + public function setFeed(\Entities\Feed $feed = NULL) + { + $this->__load(); + return parent::setFeed($feed); + } + + public function getFeed() + { + $this->__load(); + return parent::getFeed(); + } + + public function getUser(\Alchemy\Phrasea\Application $app) + { + $this->__load(); + return parent::getUser($app); + } + + public function setCreatedOn($createdOn) + { + $this->__load(); + return parent::setCreatedOn($createdOn); + } + + public function getCreatedOn() + { + $this->__load(); + return parent::getCreatedOn(); + } + + + public function __sleep() + { + return array('__isInitialized__', 'id', 'usrId', 'owner', 'createdOn', 'feed'); + } + + public function __clone() + { + if (!$this->__isInitialized__ && $this->_entityPersister) { + $this->__isInitialized__ = true; + $class = $this->_entityPersister->getClassMetadata(); + $original = $this->_entityPersister->load($this->_identifier); + if ($original === null) { + throw new \Doctrine\ORM\EntityNotFoundException(); + } + foreach ($class->reflFields as $field => $reflProperty) { + $reflProperty->setValue($this, $reflProperty->getValue($original)); + } + unset($this->_entityPersister, $this->_identifier); + } + + } +} \ No newline at end of file diff --git a/lib/Doctrine/Proxies/__CG__EntitiesFeedToken.php b/lib/Doctrine/Proxies/__CG__EntitiesFeedToken.php new file mode 100644 index 0000000000..57efe8b9fe --- /dev/null +++ b/lib/Doctrine/Proxies/__CG__EntitiesFeedToken.php @@ -0,0 +1,112 @@ +_entityPersister = $entityPersister; + $this->_identifier = $identifier; + } + /** @private */ + public function __load() + { + if (!$this->__isInitialized__ && $this->_entityPersister) { + $this->__isInitialized__ = true; + + if (method_exists($this, "__wakeup")) { + // call this after __isInitialized__to avoid infinite recursion + // but before loading to emulate what ClassMetadata::newInstance() + // provides. + $this->__wakeup(); + } + + if ($this->_entityPersister->load($this->_identifier, $this) === null) { + throw new \Doctrine\ORM\EntityNotFoundException(); + } + unset($this->_entityPersister, $this->_identifier); + } + } + + /** @private */ + public function __isInitialized() + { + return $this->__isInitialized__; + } + + + public function getId() + { + if ($this->__isInitialized__ === false) { + return (int) $this->_identifier["id"]; + } + $this->__load(); + return parent::getId(); + } + + public function setUsrId($usrId) + { + $this->__load(); + return parent::setUsrId($usrId); + } + + public function getUsrId() + { + $this->__load(); + return parent::getUsrId(); + } + + public function setFeed(\Entities\Feed $feed = NULL) + { + $this->__load(); + return parent::setFeed($feed); + } + + public function getFeed() + { + $this->__load(); + return parent::getFeed(); + } + + public function setValue($value) + { + $this->__load(); + return parent::setValue($value); + } + + public function getValue() + { + $this->__load(); + return parent::getValue(); + } + + + public function __sleep() + { + return array('__isInitialized__', 'id', 'usrId', 'value', 'feed'); + } + + public function __clone() + { + if (!$this->__isInitialized__ && $this->_entityPersister) { + $this->__isInitialized__ = true; + $class = $this->_entityPersister->getClassMetadata(); + $original = $this->_entityPersister->load($this->_identifier); + if ($original === null) { + throw new \Doctrine\ORM\EntityNotFoundException(); + } + foreach ($class->reflFields as $field => $reflProperty) { + $reflProperty->setValue($this, $reflProperty->getValue($original)); + } + unset($this->_entityPersister, $this->_identifier); + } + + } +} \ No newline at end of file diff --git a/lib/Doctrine/Proxies/__CG__EntitiesLazaretCheck.php b/lib/Doctrine/Proxies/__CG__EntitiesLazaretCheck.php new file mode 100644 index 0000000000..0f5f7fb556 --- /dev/null +++ b/lib/Doctrine/Proxies/__CG__EntitiesLazaretCheck.php @@ -0,0 +1,106 @@ +_entityPersister = $entityPersister; + $this->_identifier = $identifier; + } + /** @private */ + public function __load() + { + if (!$this->__isInitialized__ && $this->_entityPersister) { + $this->__isInitialized__ = true; + + if (method_exists($this, "__wakeup")) { + // call this after __isInitialized__to avoid infinite recursion + // but before loading to emulate what ClassMetadata::newInstance() + // provides. + $this->__wakeup(); + } + + if ($this->_entityPersister->load($this->_identifier, $this) === null) { + throw new \Doctrine\ORM\EntityNotFoundException(); + } + unset($this->_entityPersister, $this->_identifier); + } + } + + /** @private */ + public function __isInitialized() + { + return $this->__isInitialized__; + } + + + public function getId() + { + if ($this->__isInitialized__ === false) { + return (int) $this->_identifier["id"]; + } + $this->__load(); + return parent::getId(); + } + + public function setCheckClassname($checkClassname) + { + $this->__load(); + return parent::setCheckClassname($checkClassname); + } + + public function getCheckClassname() + { + $this->__load(); + return parent::getCheckClassname(); + } + + public function setLazaretFile(\Entities\LazaretFile $lazaretFile = NULL) + { + $this->__load(); + return parent::setLazaretFile($lazaretFile); + } + + public function getLazaretFile() + { + $this->__load(); + return parent::getLazaretFile(); + } + + public function getMessage() + { + $this->__load(); + return parent::getMessage(); + } + + + public function __sleep() + { + return array('__isInitialized__', 'id', 'checkClassname', 'lazaretFile'); + } + + public function __clone() + { + if (!$this->__isInitialized__ && $this->_entityPersister) { + $this->__isInitialized__ = true; + $class = $this->_entityPersister->getClassMetadata(); + $original = $this->_entityPersister->load($this->_identifier); + if ($original === null) { + throw new \Doctrine\ORM\EntityNotFoundException(); + } + foreach ($class->reflFields as $field => $reflProperty) { + $reflProperty->setValue($this, $reflProperty->getValue($original)); + } + unset($this->_entityPersister, $this->_identifier); + } + + } +} \ No newline at end of file diff --git a/lib/Doctrine/Proxies/__CG__EntitiesValidationParticipant.php b/lib/Doctrine/Proxies/__CG__EntitiesValidationParticipant.php new file mode 100644 index 0000000000..cef3296458 --- /dev/null +++ b/lib/Doctrine/Proxies/__CG__EntitiesValidationParticipant.php @@ -0,0 +1,196 @@ +_entityPersister = $entityPersister; + $this->_identifier = $identifier; + } + /** @private */ + public function __load() + { + if (!$this->__isInitialized__ && $this->_entityPersister) { + $this->__isInitialized__ = true; + + if (method_exists($this, "__wakeup")) { + // call this after __isInitialized__to avoid infinite recursion + // but before loading to emulate what ClassMetadata::newInstance() + // provides. + $this->__wakeup(); + } + + if ($this->_entityPersister->load($this->_identifier, $this) === null) { + throw new \Doctrine\ORM\EntityNotFoundException(); + } + unset($this->_entityPersister, $this->_identifier); + } + } + + /** @private */ + public function __isInitialized() + { + return $this->__isInitialized__; + } + + + public function getId() + { + if ($this->__isInitialized__ === false) { + return (int) $this->_identifier["id"]; + } + $this->__load(); + return parent::getId(); + } + + public function setUsrId($usrId) + { + $this->__load(); + return parent::setUsrId($usrId); + } + + public function getUsrId() + { + $this->__load(); + return parent::getUsrId(); + } + + public function setUser(\User_Adapter $user) + { + $this->__load(); + return parent::setUser($user); + } + + public function getUser(\Alchemy\Phrasea\Application $app) + { + $this->__load(); + return parent::getUser($app); + } + + public function setIsAware($isAware) + { + $this->__load(); + return parent::setIsAware($isAware); + } + + public function getIsAware() + { + $this->__load(); + return parent::getIsAware(); + } + + public function setIsConfirmed($isConfirmed) + { + $this->__load(); + return parent::setIsConfirmed($isConfirmed); + } + + public function getIsConfirmed() + { + $this->__load(); + return parent::getIsConfirmed(); + } + + public function setCanAgree($canAgree) + { + $this->__load(); + return parent::setCanAgree($canAgree); + } + + public function getCanAgree() + { + $this->__load(); + return parent::getCanAgree(); + } + + public function setCanSeeOthers($canSeeOthers) + { + $this->__load(); + return parent::setCanSeeOthers($canSeeOthers); + } + + public function getCanSeeOthers() + { + $this->__load(); + return parent::getCanSeeOthers(); + } + + public function setReminded($reminded) + { + $this->__load(); + return parent::setReminded($reminded); + } + + public function getReminded() + { + $this->__load(); + return parent::getReminded(); + } + + public function addData(\Entities\ValidationData $datas) + { + $this->__load(); + return parent::addData($datas); + } + + public function removeData(\Entities\ValidationData $datas) + { + $this->__load(); + return parent::removeData($datas); + } + + public function getDatas() + { + $this->__load(); + return parent::getDatas(); + } + + public function setSession(\Entities\ValidationSession $session = NULL) + { + $this->__load(); + return parent::setSession($session); + } + + public function getSession() + { + $this->__load(); + return parent::getSession(); + } + + public function isReleasable() + { + $this->__load(); + return parent::isReleasable(); + } + + + public function __sleep() + { + return array('__isInitialized__', 'id', 'usr_id', 'is_aware', 'is_confirmed', 'can_agree', 'can_see_others', 'reminded', 'datas', 'session'); + } + + public function __clone() + { + if (!$this->__isInitialized__ && $this->_entityPersister) { + $this->__isInitialized__ = true; + $class = $this->_entityPersister->getClassMetadata(); + $original = $this->_entityPersister->load($this->_identifier); + if ($original === null) { + throw new \Doctrine\ORM\EntityNotFoundException(); + } + foreach ($class->reflFields as $field => $reflProperty) { + $reflProperty->setValue($this, $reflProperty->getValue($original)); + } + unset($this->_entityPersister, $this->_identifier); + } + + } +} \ No newline at end of file From c0bd291f7ac931c0301337fd3b4d51757f22bcf1 Mon Sep 17 00:00:00 2001 From: Andrey Date: Tue, 3 Sep 2013 18:05:07 +0200 Subject: [PATCH 62/67] Add Doctrine schema pre-upgrades --- .../ConfigurationTesterServiceProvider.php | 5 +++ .../PreSchemaUpgradeCollection.php | 42 +++++++++++++++++ .../PreSchemaUpgradeInterface.php | 38 ++++++++++++++++ .../Version/PreSchemaUpgrade/Upgrade39.php | 45 +++++++++++++++++++ lib/classes/appbox.php | 2 + 5 files changed, 132 insertions(+) create mode 100644 lib/Alchemy/Phrasea/Setup/Version/PreSchemaUpgrade/PreSchemaUpgradeCollection.php create mode 100644 lib/Alchemy/Phrasea/Setup/Version/PreSchemaUpgrade/PreSchemaUpgradeInterface.php create mode 100644 lib/Alchemy/Phrasea/Setup/Version/PreSchemaUpgrade/Upgrade39.php diff --git a/lib/Alchemy/Phrasea/Core/Provider/ConfigurationTesterServiceProvider.php b/lib/Alchemy/Phrasea/Core/Provider/ConfigurationTesterServiceProvider.php index 52e35790ee..7499761d9b 100644 --- a/lib/Alchemy/Phrasea/Core/Provider/ConfigurationTesterServiceProvider.php +++ b/lib/Alchemy/Phrasea/Core/Provider/ConfigurationTesterServiceProvider.php @@ -13,6 +13,7 @@ namespace Alchemy\Phrasea\Core\Provider; use Alchemy\Phrasea\Setup\ConfigurationTester; use Alchemy\Phrasea\Application; +use Alchemy\Phrasea\Setup\Version\PreSchemaUpgrade\PreSchemaUpgradeCollection; use Silex\Application as SilexApplication; use Silex\ServiceProviderInterface; @@ -24,6 +25,10 @@ class ConfigurationTesterServiceProvider implements ServiceProviderInterface $app['phraseanet.configuration-tester'] = $app->share(function(Application $app) { return new ConfigurationTester($app); }); + + $app['phraseanet.pre-schema-upgrader'] = $app->share(function () { + return new PreSchemaUpgradeCollection(); + }); } public function boot(SilexApplication $app) diff --git a/lib/Alchemy/Phrasea/Setup/Version/PreSchemaUpgrade/PreSchemaUpgradeCollection.php b/lib/Alchemy/Phrasea/Setup/Version/PreSchemaUpgrade/PreSchemaUpgradeCollection.php new file mode 100644 index 0000000000..035896f35e --- /dev/null +++ b/lib/Alchemy/Phrasea/Setup/Version/PreSchemaUpgrade/PreSchemaUpgradeCollection.php @@ -0,0 +1,42 @@ +upgrades[] = new Upgrade39(); + } + + /** + * Applies all applyable upgrades + * + * @param Application $app + */ + public function apply(Application $app) + { + foreach ($this->upgrades as $upgrade) { + if ($upgrade->isApplyable($app)) { + $upgrade->apply($app['EM']); + } + } + } +} diff --git a/lib/Alchemy/Phrasea/Setup/Version/PreSchemaUpgrade/PreSchemaUpgradeInterface.php b/lib/Alchemy/Phrasea/Setup/Version/PreSchemaUpgrade/PreSchemaUpgradeInterface.php new file mode 100644 index 0000000000..e21f2423ff --- /dev/null +++ b/lib/Alchemy/Phrasea/Setup/Version/PreSchemaUpgrade/PreSchemaUpgradeInterface.php @@ -0,0 +1,38 @@ +getConnection()->executeQuery('RENAME TABLE `feeds` TO `feeds_backup`'); + } + + /** + * {@inheritdoc} + */ + public function isApplyable(Application $app) + { + $rs = $app['EM']->getConnection()->fetchAll('SHOW TABLE STATUS'); + $found = false; + + foreach ($rs as $row) { + if ('feeds' === $row['Name']) { + $found = true; + break; + } + } + + return $found; + } +} + diff --git a/lib/classes/appbox.php b/lib/classes/appbox.php index d5f9013e7b..b2a1c23334 100644 --- a/lib/classes/appbox.php +++ b/lib/classes/appbox.php @@ -305,6 +305,8 @@ class appbox extends base $upgrader->set_current_message(_('Creating new tables')); //create schema + $app['phraseanet.pre-schema-upgrader']->apply($app); + if ($app['EM']->getConnection()->getDatabasePlatform()->supportsAlterTable()) { $tool = new \Doctrine\ORM\Tools\SchemaTool($app['EM']); $metas = $app['EM']->getMetadataFactory()->getAllMetadata(); From 8f639381491f279474ecf26b2118f6cc80f13980 Mon Sep 17 00:00:00 2001 From: Andrey Date: Wed, 4 Sep 2013 11:33:49 +0200 Subject: [PATCH 63/67] Added migration patch --- lib/Alchemy/Phrasea/Core/Version.php | 2 +- lib/classes/patch/3907.php | 170 +++++++++++++++++++++++++++ 2 files changed, 171 insertions(+), 1 deletion(-) create mode 100644 lib/classes/patch/3907.php diff --git a/lib/Alchemy/Phrasea/Core/Version.php b/lib/Alchemy/Phrasea/Core/Version.php index 49aae22fdb..3df4e51d60 100644 --- a/lib/Alchemy/Phrasea/Core/Version.php +++ b/lib/Alchemy/Phrasea/Core/Version.php @@ -18,7 +18,7 @@ namespace Alchemy\Phrasea\Core; */ class Version { - protected static $number = '3.9.0.a6'; + protected static $number = '3.9.0.a7'; protected static $name = 'Diplodocus'; public static function getNumber() diff --git a/lib/classes/patch/3907.php b/lib/classes/patch/3907.php new file mode 100644 index 0000000000..96701bf655 --- /dev/null +++ b/lib/classes/patch/3907.php @@ -0,0 +1,170 @@ +release; + } + + /** + * {@inheritdoc} + */ + public function require_all_upgrades() + { + return false; + } + + /** + * {@inheritdoc} + */ + public function concern() + { + return $this->concern; + } + + /** + * {@inheritdoc} + */ + public function apply(base $appbox, Application $app) + { + $conn = $app['phraseanet.appbox']->get_connection(); + $sql = 'SELECT id, title, subtitle, public, created_on, updated_on, base_id FROM feeds_backup;'; + $stmt = $conn->prepare($sql); + $stmt->execute(); + $rs = $stmt->fetchAll(\PDO::FETCH_ASSOC); + $stmt->closeCursor(); + + $n = 0; + $em = $app['EM']; + + $fpSql = 'SELECT id, usr_id, owner, created_on FROM feed_publishers WHERE feed_id = :feed_id;'; + $fpStmt = $conn->prepare($fpSql); + $feSql = 'SELECT id, title, description, created_on, updated_on, author_name, author_email FROM feed_entries WHERE feed_id = :feed_id AND publisher = :publisher_id;'; + $feStmt = $conn->prepare($feSql); + $fiSql = 'SELECT sbas_id, record_id, ord FROM feed_entry_elements WHERE entry_id = :entry_id;'; + $fiStmt = $conn->prepare($fiSql); + $ftSql = 'SELECT token, usr_id, aggregated FROM feed_tokens WHERE feed_id = :feed_id;'; + $ftStmt = $conn->prepare($ftSql); + $faSql = 'SELECT token, usr_id FROM feed_tokens WHERE aggregated = 1;'; + $faStmt = $conn->prepare($faSql); + + foreach ($rs as $row) { + $feed = new Feed(); + $feed->setTitle($row['title']); + $feed->setSubtitle($row['subtitle']); + $feed->setIconUrl(false); + $feed->setIsPublic($row['public']); + $feed->setCreatedOn(new \DateTime($row['created_on'])); + $feed->setUpdatedOn(new \DateTime($row['updated_on'])); + $feed->setCollection($row['base_id'] ? collection::get_from_base_id($app, $row['base_id']) : null); + + $fpStmt->execute(array(':feed_id' => $row['id'])); + $fpRes = $fpStmt->fetchAll(\PDO::FETCH_ASSOC); + + foreach ($fpRes as $fpRow) { + $feedPublisher = new FeedPublisher(); + $feedPublisher->setFeed($feed); + $feed->addPublisher($feedPublisher); + $feedPublisher->setCreatedOn(new \DateTime($fpRow['created_on'])); + $feedPublisher->setIsOwner($fpRow['owner']); + $feedPublisher->setUsrId($fpRow['usr_id']); + + $feStmt->execute(array(':feed_id' => $row['id'], ':publisher_id' => $fpRow['id'])); + $feRes = $feStmt->fetchAll(\PDO::FETCH_ASSOC); + + foreach ($feRes as $feRow) { + $feedEntry = new FeedEntry(); + $feedEntry->setFeed($feed); + $feed->addEntry($feedEntry); + $feedEntry->setPublisher($feedPublisher); + $feedEntry->setTitle($feRow['title']); + $feedEntry->setSubtitle($feRow['description']); + $feedEntry->setAuthorName($feRow['author_name']); + $feedEntry->setAuthorEmail($feRow['author_email']); + $feedEntry->setCreatedOn(new \DateTime($feRow['created_on'])); + $feedEntry->setUpdatedOn(new \DateTime($feRow['updated_on'])); + + $fiStmt->execute(array(':entry_id' => $feRow['id'])); + $fiRes = $fiStmt->fetchAll(\PDO::FETCH_ASSOC); + + foreach ($fiRes as $fiRow) { + $feedItem = new FeedItem(); + $feedItem->setEntry($feedEntry); + $feedEntry->addItem($feedItem); + $feedItem->setOrd($fiRow['ord']); + $feedItem->setSbasId($fiRow['sbas_id']); + $feedItem->setRecordId($fiRow['record_id']); + + $em->persist($feedItem); + } + $em->persist($feedEntry); + } + $em->persist($feedPublisher); + } + + $ftStmt->execute(array(':feed_id' => $row['id'])); + $ftRes = $ftStmt->fetchAll(\PDO::FETCH_ASSOC); + + foreach ($ftRes as $ftRow) + { + $token = new FeedToken(); + $token->setFeed($feed); + $feed->addToken($token); + $token->setUsrId($ftRow['usr_id']); + $token->setValue($ftRow['token']); + + $em->persist($token); + } + $em->persist($feed); + + $n++; + + if ($n % 100 === 0) { + $em->flush(); + $em->clear(); + } + } + + $faStmt->execute(); + $faRes = $faStmt->fetchAll(\PDO::FETCH_ASSOC); + + foreach ($faRes as $faRow) + { + $token = new AggregateToken(); + $token->setUsrId($faRow['usr_id']); + $token->setValue($faRow['token']); + + $em->persist($token); + } + + $em->flush(); + $em->clear(); + } +} \ No newline at end of file From 5575a8ec737fb09cbe9fa71187c8ed4d85576044 Mon Sep 17 00:00:00 2001 From: Andrey Date: Wed, 4 Sep 2013 11:40:42 +0200 Subject: [PATCH 64/67] Updated sqlite --- tests/db-ref.sqlite | Bin 77824 -> 92160 bytes 1 file changed, 0 insertions(+), 0 deletions(-) diff --git a/tests/db-ref.sqlite b/tests/db-ref.sqlite index 81e9c1a149d2c262bfe26733aa0d29056dd1d597..33b597081bd4e76ffc0af086c7cf58b7c5988484 100644 GIT binary patch delta 2881 zcmb_edrVvB75A~PeF*_#UcNRM+XMsGHa7SLCJ@NQ*a?9U0_M?l8ghaQH#`i!cAGw; zVw0`aq^(O1azZ`Zq@SmXHxdvYs_IRll>lBsotMF^60xDaiGy*7bslo~>98|rCuT^&Tr5k}}91h5+lhJc?F>ZP~ z5u1)CW0Cl5Y(d!bstgW?xJbwn;d%x_mfcGHXhwfBB_s%fkq{9B91-D8BD&j%@VSX- zW{I#_iLjc9Fjf;`s34-UjEIs$L=+q#LPHg2;Tx)=EH$L03Vmd?;sN|p`7e@@_5X_) zf46MFAKcM`O+4cOi*kH7KV5{WJb6{1$`n&qK4(FlH8NjP6>5b}LB8LHLZwrM1h!&9 zjnCD%fW|j#IMCpSHFh|F*JrCyYwB=hEHuq93|uzLOowB!DM1#6yI7T`BrY|JsdIDu zdGT{Qlo#;l;|r6i#GL$wx-qSI$p$4q|Qm>m}QI`4xZqKS$B)ahv{1k zUgjB9YH5=`2w1$tAlS9Zy^XRBolm0#<4j(xDO3c;9Iw=)iNMl(wV3i2u5+q z231=K=uHF?8akRv&cqXw2s&fY<~TMV<>zq8tj9~dDG$gsdw^#Ab&x*DFHFTQ_VrFo z`oqCMyC>Z4YY7Hg!@-cm#wM^Lgtl_$Znfp~pk;@Ng_SW1GqJ=ZKV>V-0`=_ByYFi# z?Yu%UulNIes_a(2r&?9;q?5*)sTT@!@nK(lznk;-1Y5j2oEJ;+znP1lSMQ52F(ZY} zs1DMM*$gYATU7TYWAif6^5D=unx$!}@ah<;$;&dmxWJ6;tl;bCiZqPh46kqDZ40*t zd&69759e+5wfj60UfI8P(|_M!Z)n0IQM=bPk6kvmuyRxh`o&_JX*NT;Sq?H6kI$wS zCsPajQYuzL^cS~6l;T@Ab#*(`lJP>E*p61d zkEuQ8`INSoSlE1>$vG8x##}XOiku2?!b4?0*g(vdQdQ7FrCYT$Q(Fs}wyl(N$EpM% zH>%i|syr|C!R|!24=MA^`BKsawL7|?z1JP&0=~e`1atm%`;yyho6jz1zn$5Nrwj*8 z4Zz@%@gY8M{>inw1@BtT6qKWdwSYd$u_a2v`jFiPRmicr?A!J?4?rcFd~T@5Azu)5 zxazY&4gSLCB5uC$)q)8%emCeb;CJEAW{sHfb6~)`eivBq-~LaDqkFAxs3kk?B=IrO z)&PgILfgkivamnW1PypG!hsQQM4V8EUq-^jdGn|h>a&s2B%w8COq$TSnXPnT4-<{D{S!l*!fR&hBp3{jb(uq0A;s-PTAULk`jbO(gWeoTg z&%$A3E;N7xyDogPiyM5 z@XMFWvsI7LK{M6WkQvWKO~w;1kDndMJzDY9+dnlokxs0Jv_akzDS;f2f~4NGX~VL$ z6Z*Xo69NgF5CWK3dqvgWEQ?#i1ylM4dYXq4tgydb9pJHUmj_^1csF$c8_^?}q^X?S2D<}p)Z#m`d)d$RN5+&$@=*J!LRkCyOBTi{8+h+KU$@@m=6R`?ln-Ua;IWKqoCV* z2Zf;}pKwJn;g{2ST^SUat9cwB0{x)1LQX2(zPxg03x_s8hvqsC^|c)AHV##04kiN! z{aOyit2wMJ;!vdGpi*eEP(o3%N+Fw<$>woR{=4D?ui%*_7TrsBA9C9VwU~j2g=T!h zSIS}qhGZDRXY!z|OV-Y%nv}}J4Jz6`V8?PA8@MS?D9K>+Y~?Vx8z&6!Kn7qk^dwNPG;qaI0huuzEjV6|kX&Rqe@ zC_UpuHJ5IKiLTEWv5x+ladETi^A1=u!SlCD)>NqlLBL5-5_&?6Cd(-}>xGRD%m#P| z7iMcvBaQK&*#>i^S}>U~F;s9(CsQvDJvmrd9JKB7dzBWoP-VinF_wr#_m7FuR7lK+ z?{l2AX0F@tU&oZlZBwF)Qga6swOgv`w>bmcRFrd7ty2lL0uD-QVmO|TMnZeTqWD5G z6_Ij0G?;4^tg3tqgAywo8I2{Rn3tw8I?wr4CVrlpuKb3NDLsIaR9n}DR07#$7A z;-Rrb?D?^%#HpjrcN!{c7E$8KJ+Z`MN&_9g)2MN%h1OOa-Y5-){(C_4&$iG27wuZ8hMx{DoI)*?+_PeR#(&RggqMZ1Xu^g(lfAEnA8z)O7IrF~ z(^KVwiq+`gfQR+#;6@93S%<6t%c)zDO74sC`{hjg*u0+eH!`(=Z54IWU72v+KjKth zOic5c7uHSeT{m>uqXMS6Evt3IW8Ts}&>7g#Y3bSC(Yedg)3Gb$Z|daV59Rn%_3T?W zTxiW_ZNTDP^IJYNu%riFe93y?#b$QXgEllWo0sn%m3m8h(TFBC?S&ly_PG~d+&9IR z>_s0QH}InM-B^zvwyhgG@CZ}%a=#Ad?ZstzWIcPk2R5{GEi;?%fprPthNf99_-ipP zNJq;0gV2`j498=UaGJlU9pQ9X+{)U6*ve=4T96mjmHjw~OIqH~#4s Date: Wed, 4 Sep 2013 13:35:02 +0200 Subject: [PATCH 65/67] Added closes to patch, removed timestampable listener from 320f --- lib/classes/patch/320f.php | 3 +++ lib/classes/patch/3907.php | 6 ++++++ 2 files changed, 9 insertions(+) diff --git a/lib/classes/patch/320f.php b/lib/classes/patch/320f.php index b520ececf0..1a17b874a8 100644 --- a/lib/classes/patch/320f.php +++ b/lib/classes/patch/320f.php @@ -83,6 +83,7 @@ class patch_320f implements patchInterface $date_ref = new DateTime(); $n = 0; + $app['EM']->getEventManager()->removeEventSubscriber(new TimestampableListener()); foreach ($rs as $row) { $user = User_Adapter::getInstance($row['usr_id'], $app); @@ -152,6 +153,8 @@ class patch_320f implements patchInterface $app['EM']->flush(); $app['EM']->clear(); + $app['EM']->getEventManager()->removeEventSubscriber(new TimestampableListener()); + return true; } diff --git a/lib/classes/patch/3907.php b/lib/classes/patch/3907.php index 96701bf655..e1c972a01e 100644 --- a/lib/classes/patch/3907.php +++ b/lib/classes/patch/3907.php @@ -152,6 +152,11 @@ class patch_3907 implements patchInterface } } + $fiStmt->closeCursor(); + $feStmt->closeCursor(); + $fpStmt->closeCursor(); + $ftStmt->closeCursor(); + $faStmt->execute(); $faRes = $faStmt->fetchAll(\PDO::FETCH_ASSOC); @@ -163,6 +168,7 @@ class patch_3907 implements patchInterface $em->persist($token); } + $faStmt->closeCursor(); $em->flush(); $em->clear(); From c1c8327260083131d4f45fb5fc9d9a16925306fa Mon Sep 17 00:00:00 2001 From: Andrey Date: Wed, 4 Sep 2013 14:11:51 +0200 Subject: [PATCH 66/67] Replaced SQL connection for sqlite tests --- .../Version/PreSchemaUpgrade/Upgrade39.php | 2 +- lib/classes/patch/320f.php | 1 + lib/classes/patch/3907.php | 17 +++++++++++++++++ 3 files changed, 19 insertions(+), 1 deletion(-) diff --git a/lib/Alchemy/Phrasea/Setup/Version/PreSchemaUpgrade/Upgrade39.php b/lib/Alchemy/Phrasea/Setup/Version/PreSchemaUpgrade/Upgrade39.php index 937e70d5d2..7b852ae2ac 100644 --- a/lib/Alchemy/Phrasea/Setup/Version/PreSchemaUpgrade/Upgrade39.php +++ b/lib/Alchemy/Phrasea/Setup/Version/PreSchemaUpgrade/Upgrade39.php @@ -29,7 +29,7 @@ class Upgrade39 implements PreSchemaUpgradeInterface */ public function isApplyable(Application $app) { - $rs = $app['EM']->getConnection()->fetchAll('SHOW TABLE STATUS'); + $rs = $app['phraseanet.appbox']->get_connection()->query('SHOW TABLE STATUS'); $found = false; foreach ($rs as $row) { diff --git a/lib/classes/patch/320f.php b/lib/classes/patch/320f.php index 1a17b874a8..70cb23ae0c 100644 --- a/lib/classes/patch/320f.php +++ b/lib/classes/patch/320f.php @@ -14,6 +14,7 @@ use Entities\Feed; use Entities\FeedEntry; use Entities\FeedItem; use Entities\FeedPublisher; +use Gedmo\Timestampable\TimestampableListener; use Symfony\Component\HttpKernel\Exception\NotFoundHttpException; /** diff --git a/lib/classes/patch/3907.php b/lib/classes/patch/3907.php index e1c972a01e..9044f3129d 100644 --- a/lib/classes/patch/3907.php +++ b/lib/classes/patch/3907.php @@ -55,6 +55,23 @@ class patch_3907 implements patchInterface public function apply(base $appbox, Application $app) { $conn = $app['phraseanet.appbox']->get_connection(); + + $sql = 'SHOW TABLE STATUS;'; + $stmt = $conn->prepare($sql); + $stmt->execute(); + $rs = $stmt->fetchAll(\PDO::FETCH_ASSOC); + + $found = false; + foreach ($rs as $row) { + if ('feeds_backup' === $row['Name']) { + $found = true; + break; + } + } + if (!$found) { + return; + } + $sql = 'SELECT id, title, subtitle, public, created_on, updated_on, base_id FROM feeds_backup;'; $stmt = $conn->prepare($sql); $stmt->execute(); From d1d678668ae68187c02a7399a39964ebaa68aff7 Mon Sep 17 00:00:00 2001 From: Andrey Date: Thu, 5 Sep 2013 13:45:14 +0200 Subject: [PATCH 67/67] Added missing line --- lib/classes/patch/3907.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/classes/patch/3907.php b/lib/classes/patch/3907.php index 9044f3129d..60852bf708 100644 --- a/lib/classes/patch/3907.php +++ b/lib/classes/patch/3907.php @@ -190,4 +190,4 @@ class patch_3907 implements patchInterface $em->flush(); $em->clear(); } -} \ No newline at end of file +}