Doc fixes

diff --git a/galette/lib/Galette/Controllers/AbstractController.php b/galette/lib/Galette/Controllers/AbstractController.php
index 959f5baa9c9acfc3e9f01ea0d24b7c0e5505268e..8ed4d0a3cd66739b7839e2f774394143a63592e2 100644 (file)
--- a/galette/lib/Galette/Controllers/AbstractController.php
+++ b/galette/lib/Galette/Controllers/AbstractController.php
@@ -59,47 +59,52 @@ abstract class AbstractController
     private $container;
     /**
      * @Inject
-     * @var Galette\Core\Db
+     * @var \Galette\Core\Db
      */
     protected $zdb;
     /**
      * @Inject
-     * @var Galette\Core\Login
+     * @var \Galette\Core\Login
      */
     protected $login;
     /**
      * @Inject
-     * @var Galette\Core\Preferences
+     * @var \Galette\Core\Preferences
      */
     protected $preferences;
     /**
      * @Inject
-     * @var Slim\Views\Smarty
+     * @var \Slim\Views\Smarty
      */
     protected $view;
     /**
      * @Inject
-     * @var Galette\Core\Logo
+     * @var \Galette\Core\Logo
      */
     protected $logo;
     /**
      * @Inject
-     * @var Galette\Core\Plugins
+     * @var \Galette\Core\PrintLogo
+     */
+    protected $print_logo;
+    /**
+     * @Inject
+     * @var \Galette\Core\Plugins
      */
     protected $plugins;
     /**
      * @Inject
-     * @var Slim\Router
+     * @var \Slim\Router
      */
     protected $router;
     /**
      * @Inject
-     * @var Galette\Core\History
+     * @var \Galette\Core\History
      */
     protected $history;
     /**
      * @Inject
-     * @var Galette\Core\I18n
+     * @var \Galette\Core\I18n
      */
     protected $i18n;
     /**
@@ -108,17 +113,17 @@ abstract class AbstractController
     protected $session;
     /**
      * @Inject
-     * @var Slim\Flash\Messages
+     * @var \Slim\Flash\Messages
      */
     protected $flash;
     /**
      * @Inject
-     * @var Galette\Entity\FieldsConfig
+     * @var \Galette\Entity\FieldsConfig
      */
     protected $fields_config;
     /**
      * @Inject
-     * @var Galette\Entity\ListsConfig
+     * @var \Galette\Entity\ListsConfig
      */
     protected $lists_config;
     /**
@@ -139,7 +144,7 @@ abstract class AbstractController
 
     /**
      * @Inject
-     * @var Galette\Handlers\NotFound
+     * @var \Galette\Handlers\NotFound
      */
     protected $notFoundHandler;
 

diff --git a/galette/lib/Galette/Core/GaletteMail.php b/galette/lib/Galette/Core/GaletteMail.php
index c2d59c9ed166c4955ab7b944811afd3dcdc385b8..2e9c34a97d81f775011e09ebbeb13e9cd49ee0a1 100644 (file)
--- a/galette/lib/Galette/Core/GaletteMail.php
+++ b/galette/lib/Galette/Core/GaletteMail.php
@@ -236,7 +236,7 @@ class GaletteMail
     /**
      * Apply final header to email and send it :-)
      *
-     * @return GaletteMail::MAIL_ERROR|GaletteMail::MAIL_SENT
+     * @return integer Either GaletteMail::MAIL_ERROR|GaletteMail::MAIL_SENT
      */
     public function send()
     {

diff --git a/galette/lib/Galette/Core/Preferences.php b/galette/lib/Galette/Core/Preferences.php
index a87f5fb2f12faf2c623a93a2ce3112ddb0e8610c..7cc5c22eb70f41a87350ec82f8ede72c5f577b5d 100644 (file)
--- a/galette/lib/Galette/Core/Preferences.php
+++ b/galette/lib/Galette/Core/Preferences.php
@@ -313,11 +313,11 @@ class Preferences
     /**
      * Set default preferences at install time
      *
-     * @param staing $lang      language selected at install screen
+     * @param string $lang      language selected at install screen
      * @param string $adm_login admin login entered at install time
      * @param string $adm_pass  admin password entered at install time
      *
-     * @return boolean|Exception
+     * @return boolean|\Exception
      */
     public function installInit($lang, $adm_login, $adm_pass)
     {

diff --git a/galette/lib/Galette/Entity/FieldsConfig.php b/galette/lib/Galette/Entity/FieldsConfig.php
index ccfafec7d195a62ffdda5c559e4310a9f0879730..53eb18c7673b2be4955fffde8ff20f612ef53d4a 100644 (file)
--- a/galette/lib/Galette/Entity/FieldsConfig.php
+++ b/galette/lib/Galette/Entity/FieldsConfig.php
@@ -183,12 +183,11 @@ class FieldsConfig
             $this->buildLists();
             return true;
         } catch (\Exception $e) {
-            throw $e;
             Analog::log(
                 'Fields configuration cannot be loaded!',
                 Analog::URGENT
             );
-            return false;
+            throw $e;
         }
     }
 
@@ -388,7 +387,7 @@ class FieldsConfig
      * Set default fields configuration at install time. All previous
      * existing values will be dropped first, including fields categories.
      *
-     * @return boolean|Exception
+     * @return boolean|\Exception
      */
     public function installInit()
     {