Rebased, fixed codestyle

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;
 
 /**
  *

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;

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');

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) {

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;
     }
 

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
      *
@@ -85,7 +82,6 @@ class AggregateToken
      */
     private $value;
 
-
     /**
      * Set value
      *

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;
     }
 }
-

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;
     }
 }
-

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;
     }
 }
-

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'),

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'),

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
 {
     /**
      *

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);

lib/Doctrine/Entities/AggregateToken.php

@@ -2,8 +2,6 @@
 
 namespace Entities;
 
-use Doctrine\ORM\Mapping as ORM;
-
 /**
  * AggregateToken
  */
@@ -24,7 +22,6 @@ class AggregateToken
      */
     private $value;
 
-
     /**
      * Get id
      *

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
@@ -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();

lib/Doctrine/Entities/FeedEntry.php

@@ -2,8 +2,6 @@
 
 namespace Entities;
 
-use Doctrine\ORM\Mapping as ORM;
-
 /**
  * FeedEntry
  */

lib/Doctrine/Entities/FeedItem.php

@@ -122,7 +122,6 @@ class FeedItem
      */
     private $ord;
 
-
     /**
      * Set ord
      *

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
      *
@@ -115,7 +113,6 @@ class FeedPublisher
         return $this->feed;
     }
 
-
     /**
      * Get user
      *

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
      *
@@ -82,7 +79,6 @@ class FeedToken
      */
     private $value;
 
-
     /**
      * Set value
      *

lib/Doctrine/Repositories/AggregateTokenRepository.php

@@ -3,7 +3,6 @@
 namespace Repositories;
 
 use Doctrine\ORM\EntityRepository;
-use Entities\Feed;
 
 /**
  * AggregateTokenRepository

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");
         }