summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--src/Tolkiendil/AssoBundle/DataFixtures/ORM/MemberFixtures.php2
-rw-r--r--src/Tolkiendil/AssoBundle/Entity/Subscription.php4
-rw-r--r--src/Tolkiendil/GameBundle/Entity/IrcQuestion.php1
-rw-r--r--src/Tolkiendil/GameBundle/IrcQuiz/Uploader.php2
-rw-r--r--src/Tolkiendil/MainBundle/Menu/MenuInterface.php5
-rw-r--r--src/Tolkiendil/MainBundle/Security/Provider/MybbProvider.php3
-rw-r--r--src/Tolkiendil/MainBundle/Twig/DokuwikiExtension.php4
-rw-r--r--src/Tolkiendil/PartnerBundle/Twig/PartnerExtension.php4
8 files changed, 18 insertions, 7 deletions
diff --git a/src/Tolkiendil/AssoBundle/DataFixtures/ORM/MemberFixtures.php b/src/Tolkiendil/AssoBundle/DataFixtures/ORM/MemberFixtures.php
index 9297284..4cd27b3 100644
--- a/src/Tolkiendil/AssoBundle/DataFixtures/ORM/MemberFixtures.php
+++ b/src/Tolkiendil/AssoBundle/DataFixtures/ORM/MemberFixtures.php
@@ -1,6 +1,6 @@
<?php
-namespace Tolkiendil\GameBundle\DataFixtures\ORM;
+namespace Tolkiendil\AssoBundle\DataFixtures\ORM;
use Doctrine\Common\DataFixtures\FixtureInterface;
use Doctrine\Common\Persistence\ObjectManager;
diff --git a/src/Tolkiendil/AssoBundle/Entity/Subscription.php b/src/Tolkiendil/AssoBundle/Entity/Subscription.php
index 5bc4599..0c5bf69 100644
--- a/src/Tolkiendil/AssoBundle/Entity/Subscription.php
+++ b/src/Tolkiendil/AssoBundle/Entity/Subscription.php
@@ -237,7 +237,7 @@ class Subscription
*
* @return array
*/
- static public function getPaymentMethods()
+ public static function getPaymentMethods()
{
return array(
"Liquide" => "Liquide",
@@ -253,7 +253,7 @@ class Subscription
*
* @return array
*/
- static public function getValidationPaymentMethods()
+ public static function getValidationPaymentMethods()
{
return array_keys(self::getPaymentMethods());
}
diff --git a/src/Tolkiendil/GameBundle/Entity/IrcQuestion.php b/src/Tolkiendil/GameBundle/Entity/IrcQuestion.php
index 956b993..a051256 100644
--- a/src/Tolkiendil/GameBundle/Entity/IrcQuestion.php
+++ b/src/Tolkiendil/GameBundle/Entity/IrcQuestion.php
@@ -287,6 +287,7 @@ class IrcQuestion
* Set level
*
* @param string $level
+ *
* @return IrcQuestion
*/
public function setLevel($level)
diff --git a/src/Tolkiendil/GameBundle/IrcQuiz/Uploader.php b/src/Tolkiendil/GameBundle/IrcQuiz/Uploader.php
index 27cdce5..eb0cd13 100644
--- a/src/Tolkiendil/GameBundle/IrcQuiz/Uploader.php
+++ b/src/Tolkiendil/GameBundle/IrcQuiz/Uploader.php
@@ -36,7 +36,7 @@ class Uploader
$request->setField('questions', $file);
$response = $this->browser->send($request);
- if (200 === $response->getStatusCode()){
+ if (200 === $response->getStatusCode()) {
return true;
}
diff --git a/src/Tolkiendil/MainBundle/Menu/MenuInterface.php b/src/Tolkiendil/MainBundle/Menu/MenuInterface.php
index 0306b73..68dd52e 100644
--- a/src/Tolkiendil/MainBundle/Menu/MenuInterface.php
+++ b/src/Tolkiendil/MainBundle/Menu/MenuInterface.php
@@ -7,8 +7,9 @@ use Knp\Menu\FactoryInterface;
interface MenuInterface
{
/**
- * @param \Knp\Menu\FactoryInterface; $factory
+ * @param FactoryInterface $factory
+ *
* @return \Knp\Menu\ItemInterface
*/
- function getMenu(FactoryInterface $factory);
+ public function getMenu(FactoryInterface $factory);
}
diff --git a/src/Tolkiendil/MainBundle/Security/Provider/MybbProvider.php b/src/Tolkiendil/MainBundle/Security/Provider/MybbProvider.php
index 38517ce..f9ee688 100644
--- a/src/Tolkiendil/MainBundle/Security/Provider/MybbProvider.php
+++ b/src/Tolkiendil/MainBundle/Security/Provider/MybbProvider.php
@@ -32,7 +32,7 @@ class MybbProvider implements UserProviderInterface
{
$data = $this->connection->fetchAssoc("SELECT username, email, password, salt, usergroup, additionalgroups FROM ".$this->tablePrefix."users WHERE username = ? LIMIT 1", array($username));
- if (false === $data){
+ if (false === $data) {
throw new UsernameNotFoundException(sprintf('No user with name "%s" was found.', $username));
}
@@ -76,6 +76,7 @@ class MybbProvider implements UserProviderInterface
* If a name cannot be derived from the group, null will be returned.
*
* @param string $dwGroup
+ *
* @return string|null
*/
private function getRoleFromDwGroup($dwGroup)
diff --git a/src/Tolkiendil/MainBundle/Twig/DokuwikiExtension.php b/src/Tolkiendil/MainBundle/Twig/DokuwikiExtension.php
index 6e039b5..53adbdd 100644
--- a/src/Tolkiendil/MainBundle/Twig/DokuwikiExtension.php
+++ b/src/Tolkiendil/MainBundle/Twig/DokuwikiExtension.php
@@ -46,6 +46,7 @@ class DokuwikiExtension extends \Twig_Extension
*
* @param string $wikiId
* @param string $text
+ *
* @return string
*/
public function getInternalLink($wikiId, $text = null)
@@ -69,6 +70,7 @@ class DokuwikiExtension extends \Twig_Extension
*
* @param string $url
* @param string $text
+ *
* @return string
*/
public function getExternalLink($url, $text = null)
@@ -85,6 +87,7 @@ class DokuwikiExtension extends \Twig_Extension
* Get a path from a dokuwiki id
*
* @param string $wikiId the dokuwiki id of the page
+ *
* @return string
*/
private function getPathFromWikiId($wikiId)
@@ -96,6 +99,7 @@ class DokuwikiExtension extends \Twig_Extension
* Normalize a string for a wiki link
*
* @param string $string
+ *
* @return string
*/
private function normalize($string)
diff --git a/src/Tolkiendil/PartnerBundle/Twig/PartnerExtension.php b/src/Tolkiendil/PartnerBundle/Twig/PartnerExtension.php
index 90b85e4..eaa9f0e 100644
--- a/src/Tolkiendil/PartnerBundle/Twig/PartnerExtension.php
+++ b/src/Tolkiendil/PartnerBundle/Twig/PartnerExtension.php
@@ -45,6 +45,7 @@ class PartnerExtension extends \Twig_Extension
* Return the link to the fnac page
*
* @param string $fnacId
+ *
* @return string
*/
public function getFnacLink($fnacId)
@@ -56,6 +57,7 @@ class PartnerExtension extends \Twig_Extension
* Return the link to the Priceminister page
*
* @param string $priceministerId
+ *
* @return string
*/
public function getPriceministerLink($priceministerId)
@@ -67,6 +69,7 @@ class PartnerExtension extends \Twig_Extension
* Return the link to the Amazon page
*
* @param string $isbn10
+ *
* @return string
*/
public function getAmazonLink($isbn10)
@@ -79,6 +82,7 @@ class PartnerExtension extends \Twig_Extension
*
* @param string $isbn13
* @param string $language
+ *
* @return string
*/
public function getAlapageLink($isbn13, $language)