hazza/Phraseanet
1
0
Fork 0
mirror of https://github.com/alchemy-fr/Phraseanet.git synced 2025-10-13 13:03:20 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fixed codestyle and replaced static with self in link generator classes

Browse Source
This commit is contained in:
Andrey
2013-08-13 17:39:22 +02:00
parent cedd924e31
commit 444d45b25c
5 changed files with 31 additions and 31 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
lib/Alchemy/Phrasea/Feed/Formatter/AtomFormatter.php
View File

@@ -64,26 +64,26 @@ class AtomFormatter extends FeedFormatterAbstract implements FeedFormatterInterf
$next = $prev = null; $next = $prev = null;
if ($feed->hasPage($page + 1, static::PAGE_SIZE)) { if ($feed->hasPage($page + 1, self::PAGE_SIZE)) {
if (null === $user) { if (null === $user) {
$next = $this->linkGenerator->generatePublic($feed, static::FORMAT, $page + 1); $next = $this->linkGenerator->generatePublic($feed, self::FORMAT, $page + 1);
} else { } 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) { if (null === $user) {
$prev = $this->linkGenerator->generatePublic($feed, static::FORMAT, $page - 1); $prev = $this->linkGenerator->generatePublic($feed, self::FORMAT, $page - 1);
} else { } else {
$prev = $this->linkGenerator->generate($feed, $user, static::FORMAT, $page - 1); $prev = $this->linkGenerator->generate($feed, $user, self::FORMAT, $page - 1);
} }
} }
if (null !== $user) { if (null !== $user) {
$feedlink = $this->linkGenerator->generate($feed, $user, static::FORMAT, $page); $feedlink = $this->linkGenerator->generate($feed, $user, self::FORMAT, $page);
} else { } else {
$feedlink = $this->linkGenerator->generatePublic($feed, static::FORMAT, $page); $feedlink = $this->linkGenerator->generatePublic($feed, self::FORMAT, $page);
} }
if ($feedlink instanceof FeedLink) { if ($feedlink instanceof FeedLink) {

16
lib/Alchemy/Phrasea/Feed/Formatter/CoolirisFormatter.php
View File

@@ -67,9 +67,9 @@ class CoolirisFormatter extends FeedFormatterAbstract implements FeedFormatterIn
$this->addTag($doc, $channel, 'description', $feed->getSubtitle()); $this->addTag($doc, $channel, 'description', $feed->getSubtitle());
if (null !== $user) { if (null !== $user) {
$link = $this->linkGenerator->generate($feed, $user, static::FORMAT, $page); $link = $this->linkGenerator->generate($feed, $user, self::FORMAT, $page);
} else { } else {
$link = $this->linkGenerator->generatePublic($feed, static::FORMAT, $page); $link = $this->linkGenerator->generatePublic($feed, self::FORMAT, $page);
} }
if ($link instanceof FeedLink) { if ($link instanceof FeedLink) {
@@ -135,19 +135,19 @@ class CoolirisFormatter extends FeedFormatterAbstract implements FeedFormatterIn
$next = $prev = null; $next = $prev = null;
if ($feed->hasPage($page + 1, static::PAGE_SIZE)) { if ($feed->hasPage($page + 1, self::PAGE_SIZE)) {
if (null === $user) { if (null === $user) {
$next = $this->linkGenerator->generatePublic($feed, static::FORMAT, $page + 1); $next = $this->linkGenerator->generatePublic($feed, self::FORMAT, $page + 1);
} else { } 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) { if (null === $user) {
$prev = $this->linkGenerator->generatePublic($feed, static::FORMAT, $page - 1); $prev = $this->linkGenerator->generatePublic($feed, self::FORMAT, $page - 1);
} else { } else {
$prev = $this->linkGenerator->generate($feed, $user, static::FORMAT, $page - 1); $prev = $this->linkGenerator->generate($feed, $user, self::FORMAT, $page - 1);
} }
} }

18
lib/Alchemy/Phrasea/Feed/Formatter/RssFormatter.php
View File

@@ -52,25 +52,25 @@ class RssFormatter extends FeedFormatterAbstract implements FeedFormatterInterfa
$next = $prev = null; $next = $prev = null;
if ($feed->hasPage($page + 1, static::PAGE_SIZE)) { if ($feed->hasPage($page + 1, self::PAGE_SIZE)) {
if (null === $user) { if (null === $user) {
$next = $this->linkGenerator->generatePublic($feed, static::FORMAT, $page + 1); $next = $this->linkGenerator->generatePublic($feed, self::FORMAT, $page + 1);
} else { } 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) { if (null === $user) {
$prev = $this->linkGenerator->generatePublic($feed, static::FORMAT, $page - 1); $prev = $this->linkGenerator->generatePublic($feed, self::FORMAT, $page - 1);
} else { } else {
$prev = $this->linkGenerator->generate($feed, $user, static::FORMAT, $page - 1); $prev = $this->linkGenerator->generate($feed, $user, self::FORMAT, $page - 1);
} }
} }
if (null !== $user) { if (null !== $user) {
$link = $this->linkGenerator->generate($feed, $user, static::FORMAT, $page); $link = $this->linkGenerator->generate($feed, $user, self::FORMAT, $page);
} else { } else {
$link = $this->linkGenerator->generatePublic($feed, static::FORMAT, $page); $link = $this->linkGenerator->generatePublic($feed, self::FORMAT, $page);
} }
$doc = new \DOMDocument('1.0', 'UTF-8'); $doc = new \DOMDocument('1.0', 'UTF-8');
@@ -79,7 +79,7 @@ class RssFormatter extends FeedFormatterAbstract implements FeedFormatterInterfa
$root = $this->addTag($doc, $doc, 'rss'); $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:media', 'http://search.yahoo.com/mrss/');
$root->setAttribute('xmlns:atom', 'http://www.w3.org/2005/Atom'); $root->setAttribute('xmlns:atom', 'http://www.w3.org/2005/Atom');
$root->setAttribute('xmlns:dc', 'http://purl.org/dc/elements/1.1/'); $root->setAttribute('xmlns:dc', 'http://purl.org/dc/elements/1.1/');

4
lib/Alchemy/Phrasea/Feed/Link/AggregateLinkGenerator.php
View File

@@ -45,7 +45,7 @@ class AggregateLinkGenerator implements LinkGeneratorInterface
$params = array( $params = array(
'token' => $this->getAggregateToken($user, $renew)->getValue(), 'token' => $this->getAggregateToken($user, $renew)->getValue(),
'format' => 'atom' 'format' => 'atom'
); );
if (null !== $page) { if (null !== $page) {
$params['page'] = $page; $params['page'] = $page;
} }
@@ -59,7 +59,7 @@ class AggregateLinkGenerator implements LinkGeneratorInterface
$params = array( $params = array(
'token' => $this->getAggregateToken($user, $renew)->getValue(), 'token' => $this->getAggregateToken($user, $renew)->getValue(),
'format' => 'rss' 'format' => 'rss'
); );
if (null !== $page) { if (null !== $page) {
$params['page'] = $page; $params['page'] = $page;
} }

8
lib/Alchemy/Phrasea/Feed/Link/FeedLinkGenerator.php
View File

@@ -54,7 +54,7 @@ class FeedLinkGenerator implements LinkGeneratorInterface
'token' => $this->getFeedToken($feed, $user, $renew)->getValue(), 'token' => $this->getFeedToken($feed, $user, $renew)->getValue(),
'id' => $feed->getId(), 'id' => $feed->getId(),
'format' => 'atom' 'format' => 'atom'
); );
if (null !== $page) { if (null !== $page) {
$params['page'] = $page; $params['page'] = $page;
} }
@@ -69,7 +69,7 @@ class FeedLinkGenerator implements LinkGeneratorInterface
'token' => $this->getFeedToken($feed, $user, $renew)->getValue(), 'token' => $this->getFeedToken($feed, $user, $renew)->getValue(),
'id' => $feed->getId(), 'id' => $feed->getId(),
'format' => 'rss' 'format' => 'rss'
); );
if (null !== $page) { if (null !== $page) {
$params['page'] = $page; $params['page'] = $page;
} }
@@ -106,7 +106,7 @@ class FeedLinkGenerator implements LinkGeneratorInterface
$params = array( $params = array(
'id' => $feed->getId(), 'id' => $feed->getId(),
'format' => 'atom' 'format' => 'atom'
); );
if (null !== $page) { if (null !== $page) {
$params['page'] = $page; $params['page'] = $page;
} }
@@ -120,7 +120,7 @@ class FeedLinkGenerator implements LinkGeneratorInterface
$params = array( $params = array(
'id' => $feed->getId(), 'id' => $feed->getId(),
'format' => 'rss' 'format' => 'rss'
); );
if (null !== $page) { if (null !== $page) {
$params['page'] = $page; $params['page'] = $page;
} }