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