Fix CS

lib/Alchemy/Phrasea/Application/Api.php

@@ -789,6 +789,7 @@ return call_user_func(function() {
                         $code = \API_V1_result::ERROR_INTERNALSERVERERROR;
 
                     $result = $app['api']->get_error_message($app['request'], $code, $e->getMessage());
+
                     return $result->get_response();
                 });
 ////

lib/Alchemy/Phrasea/Application/ApiVersion.php

@@ -11,9 +11,7 @@
 
 namespace Alchemy\Phrasea\Application;
 
-use Symfony\Component\HttpFoundation\Response;
 use Symfony\Component\HttpFoundation\Request;
-use Symfony\Component\HttpKernel\Exception;
 
 /**
  *

lib/Alchemy/Phrasea/Application/Lightbox.php

@@ -13,8 +13,6 @@ namespace Alchemy\Phrasea\Application;
 
 use Symfony\Component\HttpFoundation\Request;
 use Symfony\Component\HttpFoundation\Response;
-use Symfony\Component\HttpKernel\Exception\HttpException;
-use Symfony\Component\HttpKernel\Exception\NotFoundHttpException;
 use Alchemy\Phrasea\Controller\Exception as ControllerException;
 
 /**

lib/Alchemy/Phrasea/Application/Overview.php

@@ -11,10 +11,7 @@
 
 namespace Alchemy\Phrasea\Application;
 
-use Symfony\Component\HttpFoundation\Request;
 use Symfony\Component\HttpFoundation\Response;
-use Symfony\Component\HttpKernel\Exception\HttpException;
-use Symfony\Component\HttpKernel\Exception\NotFoundHttpException;
 
 /**
  *

lib/Alchemy/Phrasea/Application/Root.php

@@ -11,10 +11,7 @@
 
 namespace Alchemy\Phrasea\Application;
 
-use Symfony\Component\HttpFoundation\Request;
 use Symfony\Component\HttpFoundation\Response;
-use Symfony\Component\HttpKernel\Exception\HttpException;
-use Symfony\Component\HttpKernel\Exception\NotFoundHttpException;
 use Alchemy\Phrasea\Controller\Root as Controller;
 
 /**

lib/Alchemy/Phrasea/Application/Setup.php

@@ -12,7 +12,6 @@
 namespace Alchemy\Phrasea\Application;
 
 use Symfony\Component\HttpFoundation\Response;
-use Symfony\Component\HttpFoundation\Request;
 use Alchemy\Phrasea\Controller\Setup as Controller;
 use Alchemy\Phrasea\Controller\Utils as ControllerUtils;
 

lib/Alchemy/Phrasea/Controller/Admin/Description.php

@@ -13,8 +13,6 @@ namespace Alchemy\Phrasea\Controller\Admin;
 
 use Symfony\Component\HttpFoundation\Request;
 use Symfony\Component\HttpFoundation\Response;
-use Symfony\Component\HttpKernel\Exception\HttpException;
-use Symfony\Component\HttpKernel\Exception\NotFoundHttpException;
 use Symfony\Component\HttpFoundation\RedirectResponse;
 use Silex\Application;
 use Silex\ControllerProviderInterface;

lib/Alchemy/Phrasea/Controller/Admin/Fields.php

@@ -13,8 +13,6 @@ namespace Alchemy\Phrasea\Controller\Admin;
 
 use Symfony\Component\HttpFoundation\Request;
 use Symfony\Component\HttpFoundation\Response;
-use Symfony\Component\HttpKernel\Exception\HttpException;
-use Symfony\Component\HttpKernel\Exception\NotFoundHttpException;
 use Silex\Application;
 use Silex\ControllerProviderInterface;
 use Silex\ControllerCollection;

lib/Alchemy/Phrasea/Controller/Admin/Publications.php

@@ -13,8 +13,6 @@ namespace Alchemy\Phrasea\Controller\Admin;
 
 use Symfony\Component\HttpFoundation\Request;
 use Symfony\Component\HttpFoundation\Response;
-use Symfony\Component\HttpKernel\Exception\HttpException;
-use Symfony\Component\HttpKernel\Exception\NotFoundHttpException;
 use Silex\Application;
 use Silex\ControllerProviderInterface;
 use Silex\ControllerCollection;

lib/Alchemy/Phrasea/Controller/Admin/Root.php

@@ -18,8 +18,6 @@ namespace Alchemy\Phrasea\Controller\Admin;
  */
 use Symfony\Component\HttpFoundation\Request;
 use Symfony\Component\HttpFoundation\Response;
-use Symfony\Component\HttpKernel\Exception\HttpException;
-use Symfony\Component\HttpKernel\Exception\NotFoundHttpException;
 use Silex\Application;
 use Silex\ControllerProviderInterface;
 use Silex\ControllerCollection;

lib/Alchemy/Phrasea/Controller/Admin/Subdefs.php

@@ -13,8 +13,6 @@ namespace Alchemy\Phrasea\Controller\Admin;
 
 use Symfony\Component\HttpFoundation\Request;
 use Symfony\Component\HttpFoundation\Response;
-use Symfony\Component\HttpKernel\Exception\HttpException;
-use Symfony\Component\HttpKernel\Exception\NotFoundHttpException;
 use Symfony\Component\HttpFoundation\RedirectResponse;
 use Silex\Application;
 use Silex\ControllerProviderInterface;

lib/Alchemy/Phrasea/Controller/Admin/Users.php

@@ -14,8 +14,6 @@ namespace Alchemy\Phrasea\Controller\Admin;
 use Symfony\Component\HttpFoundation\Request;
 use Symfony\Component\HttpFoundation\Response;
 use Symfony\Component\HttpFoundation\RedirectResponse;
-use Symfony\Component\HttpKernel\Exception\HttpException;
-use Symfony\Component\HttpKernel\Exception\NotFoundHttpException;
 use Silex\Application;
 use Silex\ControllerProviderInterface;
 use Silex\ControllerCollection;

lib/Alchemy/Phrasea/Controller/Prod/Bridge.php

@@ -16,8 +16,6 @@ use Silex\ControllerProviderInterface;
 use Silex\ControllerCollection;
 use Symfony\Component\HttpFoundation\Request;
 use Symfony\Component\HttpFoundation\Response;
-use Symfony\Component\HttpKernel\Exception\HttpException;
-use Symfony\Component\HttpKernel\Exception\NotFoundHttpException;
 use Alchemy\Phrasea\Helper\Record as RecordHelper;
 
 /**

lib/Alchemy/Phrasea/Controller/Prod/Feed.php

@@ -16,8 +16,6 @@ use Silex\ControllerProviderInterface;
 use Silex\ControllerCollection;
 use Symfony\Component\HttpFoundation\Request;
 use Symfony\Component\HttpFoundation\Response;
-use Symfony\Component\HttpKernel\Exception\HttpException;
-use Symfony\Component\HttpKernel\Exception\NotFoundHttpException;
 use Alchemy\Phrasea\Helper\Record as RecordHelper;
 
 /**

lib/Alchemy/Phrasea/Controller/Prod/Language.php

@@ -14,11 +14,7 @@ namespace Alchemy\Phrasea\Controller\Prod;
 use Silex\Application;
 use Silex\ControllerProviderInterface;
 use Silex\ControllerCollection;
-use Symfony\Component\HttpFoundation\Request;
 use Symfony\Component\HttpFoundation\Response;
-use Symfony\Component\HttpKernel\Exception\HttpException;
-use Symfony\Component\HttpKernel\Exception\NotFoundHttpException;
-use Alchemy\Phrasea\Helper\Record as RecordHelper;
 
 /**
  *

lib/Alchemy/Phrasea/Controller/Prod/Lazaret.php

@@ -11,7 +11,6 @@
 
 namespace Alchemy\Phrasea\Controller\Prod;
 
-use Alchemy\Phrasea\Helper;
 use Silex\Application;
 use Silex\ControllerProviderInterface;
 use Silex\ControllerCollection;

lib/Alchemy/Phrasea/Controller/Prod/MoveCollection.php

@@ -15,7 +15,6 @@ use Silex\Application;
 use Silex\ControllerProviderInterface;
 use Silex\ControllerCollection;
 use Symfony\Component\HttpFoundation\Request;
-use Symfony\Component\HttpFoundation\Response;
 use Alchemy\Phrasea\Helper\Record as RecordHelper;
 
 /**

lib/Alchemy/Phrasea/Controller/Prod/Query.php

@@ -120,8 +120,7 @@ class Query implements ControllerProviderInterface
                             }
                             if ($npages > 4)
                                 $string .= "<a onclick='gotopage(" . ($npages) . ");return false;' class='btn btn-primary btn-mini'>&gt;&gt;</a>";
-                        }
+                        } else {
-                        else {
                             $start = $npages - 4;
                             if (($start) > 0)
                                 $string .= "<a onclick='gotopage(1);return false;' class='btn btn-primary btn-mini'>&lt;&lt;</a>";
@@ -134,8 +133,7 @@ class Query implements ControllerProviderInterface
                                     $string .= "<a onclick='gotopage(" . $i . ");return false;' class='btn btn-primary btn-mini'>" . $i . "</a>";
                             }
                         }
-                    }
+                    } else {
-                    else {
                         $string .= "<a onclick='gotopage(1);return false;' class='btn btn-primary btn-mini'>&lt;&lt;</a>";
 
                         for ($i = ($page - 2); $i <= ($page + 2); $i ++ ) {

lib/Alchemy/Phrasea/Controller/Prod/TOU.php

@@ -16,9 +16,6 @@ use Silex\ControllerProviderInterface;
 use Silex\ControllerCollection;
 use Symfony\Component\HttpFoundation\Request;
 use Symfony\Component\HttpFoundation\Response;
-use Symfony\Component\HttpKernel\Exception\HttpException;
-use Symfony\Component\HttpKernel\Exception\NotFoundHttpException;
-use Alchemy\Phrasea\Helper\Record as RecordHelper;
 
 /**
  *

lib/Alchemy/Phrasea/Controller/Prod/Tools.php

@@ -11,7 +11,6 @@
 
 namespace Alchemy\Phrasea\Controller\Prod;
 
-use Alchemy\Phrasea\RouteProcessor\Basket as BasketRoute;
 use Alchemy\Phrasea\Helper;
 use DataURI;
 use MediaVorus\MediaVorus;
@@ -20,9 +19,6 @@ use Silex\ControllerProviderInterface;
 use Silex\ControllerCollection;
 use Symfony\Component\HttpFoundation\Request;
 use Symfony\Component\HttpFoundation\Response;
-use Symfony\Component\HttpFoundation\RedirectResponse;
-use Symfony\Component\HttpKernel\Exception\HttpException;
-use Symfony\Component\HttpKernel\Exception\NotFoundHttpException;
 
 /**
  *

lib/Alchemy/Phrasea/Controller/Prod/Tooltip.php

@@ -16,9 +16,6 @@ use Silex\ControllerProviderInterface;
 use Silex\ControllerCollection;
 use Symfony\Component\HttpFoundation\Request;
 use Symfony\Component\HttpFoundation\Response;
-use Symfony\Component\HttpKernel\Exception\HttpException;
-use Symfony\Component\HttpKernel\Exception\NotFoundHttpException;
-use Alchemy\Phrasea\Helper\Record as RecordHelper;
 
 /**
  *

lib/Alchemy/Phrasea/Controller/Prod/Upload.php

@@ -12,7 +12,6 @@
 namespace Alchemy\Phrasea\Controller\Prod;
 
 use Alchemy\Phrasea\Border;
-use Alchemy\Phrasea\Helper;
 use MediaVorus\MediaVorus;
 use Silex\Application;
 use Silex\ControllerProviderInterface;

lib/Alchemy/Phrasea/Controller/Root/RSSFeeds.php

@@ -13,8 +13,6 @@ namespace Alchemy\Phrasea\Controller\Root;
 
 use Symfony\Component\HttpFoundation\Request;
 use Symfony\Component\HttpFoundation\Response;
-use Symfony\Component\HttpKernel\Exception\HttpException;
-use Symfony\Component\HttpKernel\Exception\NotFoundHttpException;
 use Silex\Application;
 use Silex\ControllerProviderInterface;
 use Silex\ControllerCollection;
@@ -68,8 +66,7 @@ class RSSFeeds implements ControllerProviderInterface
                         $content->set_previous_page($feed->get_user_link($registry, $user, $format, ($page - 1)));
                     if ($total > ($page * $perPage))
                         $content->set_next_page($feed->get_user_link($registry, $user, $format, ($page + 1)));
-                }
+                } else {
-                else {
                     if ($page > 1)
                         $content->set_previous_page($feed->get_homepage_link($registry, $format, ($page - 1)));
                     if ($total > ($page * $perPage))

lib/Alchemy/Phrasea/Controller/Setup/Installer.php

@@ -13,8 +13,6 @@ namespace Alchemy\Phrasea\Controller\Setup;
 
 use Symfony\Component\HttpFoundation\Request;
 use Symfony\Component\HttpFoundation\Response;
-use Symfony\Component\HttpKernel\Exception\HttpException;
-use Symfony\Component\HttpKernel\Exception\NotFoundHttpException;
 use Silex\Application;
 use Silex\ControllerProviderInterface;
 use Silex\ControllerCollection;

lib/Alchemy/Phrasea/Controller/Setup/Upgrader.php

@@ -11,10 +11,7 @@
 
 namespace Alchemy\Phrasea\Controller\Setup;
 
-use Symfony\Component\HttpFoundation\Request;
 use Symfony\Component\HttpFoundation\Response;
-use Symfony\Component\HttpKernel\Exception\HttpException;
-use Symfony\Component\HttpKernel\Exception\NotFoundHttpException;
 use Silex\Application;
 use Silex\ControllerProviderInterface;
 use Silex\ControllerCollection;

lib/Alchemy/Phrasea/Controller/Utils/ConnectionTest.php

@@ -13,8 +13,6 @@ namespace Alchemy\Phrasea\Controller\Utils;
 
 use Symfony\Component\HttpFoundation\Request;
 use Symfony\Component\HttpFoundation\Response;
-use Symfony\Component\HttpKernel\Exception\HttpException;
-use Symfony\Component\HttpKernel\Exception\NotFoundHttpException;
 use Silex\Application;
 use Silex\ControllerProviderInterface;
 use Silex\ControllerCollection;

lib/Alchemy/Phrasea/Controller/Utils/PathFileTest.php

@@ -13,8 +13,6 @@ namespace Alchemy\Phrasea\Controller\Utils;
 
 use Symfony\Component\HttpFoundation\Request;
 use Symfony\Component\HttpFoundation\Response;
-use Symfony\Component\HttpKernel\Exception\HttpException;
-use Symfony\Component\HttpKernel\Exception\NotFoundHttpException;
 use Silex\Application;
 use Silex\ControllerProviderInterface;
 use Silex\ControllerCollection;

lib/Alchemy/Phrasea/Core/Service/Log/FirePHP.php

@@ -16,7 +16,6 @@ use Alchemy\Phrasea\Core,
     Alchemy\Phrasea\Core\Service\ServiceAbstract,
     Alchemy\Phrasea\Core\Service\ServiceInterface;
 use Monolog\Logger;
-use Monolog\Handler\StreamHandler;
 use Monolog\Handler\FirePHPHandler;
 
 /**

lib/Alchemy/Phrasea/Core/Service/Orm/Doctrine.php

@@ -16,7 +16,6 @@ use Alchemy\Phrasea\Core,
     Alchemy\Phrasea\Core\Service\ServiceAbstract,
     Alchemy\Phrasea\Core\Service\ServiceInterface;
 use Doctrine\DBAL\Types\Type;
-use Symfony\Component\DependencyInjection\ParameterBag\ParameterBag;
 
 /**
  *

lib/Alchemy/Phrasea/Core/Service/ServiceAbstract.php

@@ -12,7 +12,6 @@
 namespace Alchemy\Phrasea\Core\Service;
 
 use Alchemy\Phrasea\Core;
-use Symfony\Component\DependencyInjection\ParameterBag\ParameterBag;
 
 /**
  *

lib/Alchemy/Phrasea/Helper/Prod.php

@@ -11,8 +11,6 @@
 
 namespace Alchemy\Phrasea\Helper;
 
-use Alchemy\Phrasea\Core;
-use Symfony\Component\HttpFoundation\Request;
 
 /**
  *

lib/Alchemy/Phrasea/Helper/Record/Bridge.php

@@ -13,7 +13,6 @@ namespace Alchemy\Phrasea\Helper\Record;
 
 use Alchemy\Phrasea\Helper\Record\Helper as RecordHelper,
     Alchemy\Phrasea\Core;
-use Symfony\Component\HttpFoundation\Request;
 
 /**
  *

lib/Alchemy/Phrasea/Helper/Record/Push.php

@@ -11,7 +11,6 @@
 
 namespace Alchemy\Phrasea\Helper\Record;
 
-use Alchemy\Phrasea\Core;
 use Alchemy\Phrasea\Helper\Record\Helper as RecordHelper,
     Symfony\Component\HttpFoundation\Request;
 

lib/Alchemy/Phrasea/Helper/Record/Tools.php

@@ -11,8 +11,6 @@
 
 namespace Alchemy\Phrasea\Helper\Record;
 
-use Alchemy\Phrasea\Core;
-use Symfony\Component\HttpFoundation\Request;
 use Alchemy\Phrasea\Helper\Record\Helper as RecordHelper;
 
 /**

lib/Alchemy/Phrasea/Helper/Record/Tooltip.php

@@ -11,8 +11,6 @@
 
 namespace Alchemy\Phrasea\Helper\Record;
 
-use Alchemy\Phrasea\Core;
-use Symfony\Component\HttpFoundation\Request;
 use Alchemy\Phrasea\Helper\Record\Helper as RecordHelper;
 
 /**

lib/Alchemy/Phrasea/Helper/User/Edit.php

@@ -417,11 +417,9 @@ class Edit extends \Alchemy\Phrasea\Helper\Helper
                     if ($v === '1') {
                         $create_sbas[\phrasea::sbasFromBas($base_id)] = \phrasea::sbasFromBas($base_id);
                         $create[] = $base_id;
-                    }
+                    } else
-                    else
                         $delete[] = $base_id;
-                }
+                } else {
-                else {
                     $create_sbas[\phrasea::sbasFromBas($base_id)] = \phrasea::sbasFromBas($base_id);
                     $update[$base_id][$p] = $v;
                 }

lib/Alchemy/Phrasea/Helper/WorkZone.php

@@ -11,8 +11,6 @@
 
 namespace Alchemy\Phrasea\Helper;
 
-use Alchemy\Phrasea\Core;
-use Symfony\Component\HttpFoundation\Request;
 
 /**
  *

lib/Alchemy/Phrasea/Out/Module/PDF.php

@@ -401,8 +401,7 @@ class PDF
                             rename($tmp_filename, $tmp_filename . '.png');
                             $miniConv[$RIGHT_IMG] = $tmp_filename . '.png';
                             $RIGHT_IMG = $tmp_filename . '.png';
-                        }
+                        } else
-                        else
                             $RIGHT_IMG = $miniConv[$RIGHT_IMG];
 
                         $wmm = (int) $size[0] * 25.4 / 72;
@@ -416,8 +415,7 @@ class PDF
                         if ($hmm < 6)
                             $tt = (6 - $hmm) / 2;
                         $this->pdf->Image($RIGHT_IMG, 200 - 0.5 - $wmm, $ytmp + 0.5 + $tt);
-                    }
+                    } else {
-                    else {
                         $wmm = (int) $size[0] * 25.4 / 72;
                         $hmm = (int) $size[1] * 25.4 / 72;
                         if ($hmm > 6) {

lib/Alchemy/Phrasea/Out/Tool/PhraseaPDF.php

@@ -20,12 +20,12 @@ class PhraseaPDF extends \TCPDF
 {
     const FONT = 'freesans';
 
-    function Header()
+    public function Header()
     {
 
     }
 
-    function Footer()
+    public function Footer()
     {
         $ml = $this->SetLeftMargin(0);
         $mr = $this->SetRightMargin(0);

lib/Alchemy/Phrasea/Vocabulary/Controller.php

@@ -33,8 +33,7 @@ class Controller
   {
     $classname = __NAMESPACE__ . '\\ControlProvider\\' . $type . 'Provider';
 
-    if (!class_exists($classname))
+    if (!class_exists($classname)) {
-    {
       throw new \Exception('Vocabulary type not found');
     }
 

lib/Doctrine/Entities/LazaretAttribute.php

@@ -2,7 +2,6 @@
 
 namespace Entities;
 
-use Doctrine\ORM\Mapping as ORM;
 
 /**
  * Entities\LazaretAttribute
@@ -59,6 +58,7 @@ class LazaretAttribute
     public function setName($name)
     {
         $this->name = $name;
+
         return $this;
     }
 
@@ -81,6 +81,7 @@ class LazaretAttribute
     public function setValue($value)
     {
         $this->value = $value;
+
         return $this;
     }
 
@@ -103,6 +104,7 @@ class LazaretAttribute
     public function setCreated($created)
     {
         $this->created = $created;
+
         return $this;
     }
 
@@ -125,6 +127,7 @@ class LazaretAttribute
     public function setUpdated($updated)
     {
         $this->updated = $updated;
+
         return $this;
     }
 
@@ -147,6 +150,7 @@ class LazaretAttribute
     public function setLazaretFile(\Entities\LazaretFile $lazaretFile = null)
     {
         $this->lazaretFile = $lazaretFile;
+
         return $this;
     }
 

lib/Doctrine/Entities/LazaretCheck.php

@@ -2,7 +2,6 @@
 
 namespace Entities;
 
-use Doctrine\ORM\Mapping as ORM;
 
 /**
  * Entities\LazaretCheck
@@ -43,6 +42,7 @@ class LazaretCheck
     public function setLazaretFile(\Entities\LazaretFile $lazaretFile = null)
     {
         $this->lazaretFile = $lazaretFile;
+
         return $this;
     }
 
@@ -65,6 +65,7 @@ class LazaretCheck
     public function setCheckClassname($checkClassname)
     {
         $this->checkClassname = $checkClassname;
+
         return $this;
     }
 

lib/Doctrine/Entities/LazaretFile.php

@@ -2,7 +2,6 @@
 
 namespace Entities;
 
-use Doctrine\ORM\Mapping as ORM;
 
 /**
  * Entities\LazaretFile
@@ -93,6 +92,7 @@ class LazaretFile
     public function setPathname($pathname)
     {
         $this->pathname = $pathname;
+
         return $this;
     }
 
@@ -115,6 +115,7 @@ class LazaretFile
     public function setBaseId($baseId)
     {
         $this->base_id = $baseId;
+
         return $this;
     }
 
@@ -137,6 +138,7 @@ class LazaretFile
     public function setUuid($uuid)
     {
         $this->uuid = $uuid;
+
         return $this;
     }
 
@@ -159,6 +161,7 @@ class LazaretFile
     public function setSha256($sha256)
     {
         $this->sha256 = $sha256;
+
         return $this;
     }
 
@@ -181,6 +184,7 @@ class LazaretFile
     public function setCreated($created)
     {
         $this->created = $created;
+
         return $this;
     }
 
@@ -203,6 +207,7 @@ class LazaretFile
     public function setUpdated($updated)
     {
         $this->updated = $updated;
+
         return $this;
     }
 
@@ -225,6 +230,7 @@ class LazaretFile
     public function addLazaretAttribute(\Entities\LazaretAttribute $attributes)
     {
         $this->attributes[] = $attributes;
+
         return $this;
     }
 
@@ -247,6 +253,7 @@ class LazaretFile
     public function setSession(\Entities\LazaretSession $session = null)
     {
         $this->session = $session;
+
         return $this;
     }
 
@@ -269,6 +276,7 @@ class LazaretFile
     public function setOriginalName($originalName)
     {
         $this->originalName = $originalName;
+
         return $this;
     }
 
@@ -291,6 +299,7 @@ class LazaretFile
     public function addLazaretCheck(\Entities\LazaretCheck $checks)
     {
         $this->checks[] = $checks;
+
         return $this;
     }
 
@@ -313,6 +322,7 @@ class LazaretFile
     public function setForced($forced)
     {
         $this->forced = $forced;
+
         return $this;
     }
 

lib/Doctrine/Entities/LazaretSession.php

@@ -2,7 +2,6 @@
 
 namespace Entities;
 
-use Doctrine\ORM\Mapping as ORM;
 
 /**
  * Entities\LazaretSession
@@ -58,6 +57,7 @@ class LazaretSession
     public function setUsrId($usrId)
     {
         $this->usr_id = $usrId;
+
         return $this;
     }
 
@@ -70,10 +70,10 @@ class LazaretSession
     {
         $user = null;
 
-        try{
+        try {
             $appbox = \appbox::get_instance(\bootstrap::getCore());
             $user = \User_Adapter::getInstance($this->usr_id, $appbox);
-        }catch(\Exception $e){
+        } catch (\Exception $e) {
 
         }
 
@@ -89,6 +89,7 @@ class LazaretSession
     public function setCreated($created)
     {
         $this->created = $created;
+
         return $this;
     }
 
@@ -111,6 +112,7 @@ class LazaretSession
     public function setUpdated($updated)
     {
         $this->updated = $updated;
+
         return $this;
     }
 
@@ -133,6 +135,7 @@ class LazaretSession
     public function addLazaretFiles(\Entities\LazaretFile $files)
     {
         $this->files[] = $files;
+
         return $this;
     }
 
@@ -155,6 +158,7 @@ class LazaretSession
     public function addLazaretFile(\Entities\LazaretFile $files)
     {
         $this->files[] = $files;
+
         return $this;
     }
 }

lib/Doctrine/Logger/MonologSQLLogger.php

@@ -12,7 +12,6 @@
 namespace Doctrine\Logger;
 
 use Monolog\Logger;
-use Monolog\Handler\StreamHandler;
 
 /**
  * Log doctrine sql request with monolog

lib/Doctrine/Proxies/__CG__EntitiesBasket.php

@@ -48,168 +48,196 @@ class Basket extends \Entities\Basket implements \Doctrine\ORM\Proxy\Proxy
             return (int) $this->_identifier["id"];
         }
         $this->__load();
+
         return parent::getId();
     }
 
     public function setName($name)
     {
         $this->__load();
+
         return parent::setName($name);
     }
 
     public function getName()
     {
         $this->__load();
+
         return parent::getName();
     }
 
     public function setDescription($description)
     {
         $this->__load();
+
         return parent::setDescription($description);
     }
 
     public function getDescription()
     {
         $this->__load();
+
         return parent::getDescription();
     }
 
     public function setUsrId($usrId)
     {
         $this->__load();
+
         return parent::setUsrId($usrId);
     }
 
     public function getUsrId()
     {
         $this->__load();
+
         return parent::getUsrId();
     }
 
     public function setPusherId($pusherId)
     {
         $this->__load();
+
         return parent::setPusherId($pusherId);
     }
 
     public function getPusherId()
     {
         $this->__load();
+
         return parent::getPusherId();
     }
 
     public function setArchived($archived)
     {
         $this->__load();
+
         return parent::setArchived($archived);
     }
 
     public function getArchived()
     {
         $this->__load();
+
         return parent::getArchived();
     }
 
     public function setCreated($created)
     {
         $this->__load();
+
         return parent::setCreated($created);
     }
 
     public function getCreated()
     {
         $this->__load();
+
         return parent::getCreated();
     }
 
     public function setUpdated($updated)
     {
         $this->__load();
+
         return parent::setUpdated($updated);
     }
 
     public function getUpdated()
     {
         $this->__load();
+
         return parent::getUpdated();
     }
 
     public function addBasketElement(\Entities\BasketElement $elements)
     {
         $this->__load();
+
         return parent::addBasketElement($elements);
     }
 
     public function getElements()
     {
         $this->__load();
+
         return parent::getElements();
     }
 
     public function getElementsByOrder($ordre)
     {
         $this->__load();
+
         return parent::getElementsByOrder($ordre);
     }
 
     public function setPusher(\User_Adapter $user)
     {
         $this->__load();
+
         return parent::setPusher($user);
     }
 
     public function getPusher()
     {
         $this->__load();
+
         return parent::getPusher();
     }
 
     public function setOwner(\User_Adapter $user)
     {
         $this->__load();
+
         return parent::setOwner($user);
     }
 
     public function getOwner()
     {
         $this->__load();
+
         return parent::getOwner();
     }
 
     public function setValidation(\Entities\ValidationSession $validation)
     {
         $this->__load();
+
         return parent::setValidation($validation);
     }
 
     public function getValidation()
     {
         $this->__load();
+
         return parent::getValidation();
     }
 
     public function setIsRead($isRead)
     {
         $this->__load();
+
         return parent::setIsRead($isRead);
     }
 
     public function getIsRead()
     {
         $this->__load();
+
         return parent::getIsRead();
     }
 
     public function hasRecord(\record_adapter $record)
     {
         $this->__load();
+
         return parent::hasRecord($record);
     }
 
     public function getSize()
     {
         $this->__load();
+
         return parent::getSize();
     }
 

lib/Doctrine/Proxies/__CG__EntitiesBasketElement.php

@@ -48,114 +48,133 @@ class BasketElement extends \Entities\BasketElement implements \Doctrine\ORM\Pro
             return (int) $this->_identifier["id"];
         }
         $this->__load();
+
         return parent::getId();
     }
 
     public function setRecordId($recordId)
     {
         $this->__load();
+
         return parent::setRecordId($recordId);
     }
 
     public function getRecordId()
     {
         $this->__load();
+
         return parent::getRecordId();
     }
 
     public function setSbasId($sbasId)
     {
         $this->__load();
+
         return parent::setSbasId($sbasId);
     }
 
     public function getSbasId()
     {
         $this->__load();
+
         return parent::getSbasId();
     }
 
     public function setOrd($ord)
     {
         $this->__load();
+
         return parent::setOrd($ord);
     }
 
     public function getOrd()
     {
         $this->__load();
+
         return parent::getOrd();
     }
 
     public function setCreated($created)
     {
         $this->__load();
+
         return parent::setCreated($created);
     }
 
     public function getCreated()
     {
         $this->__load();
+
         return parent::getCreated();
     }
 
     public function setUpdated($updated)
     {
         $this->__load();
+
         return parent::setUpdated($updated);
     }
 
     public function getUpdated()
     {
         $this->__load();
+
         return parent::getUpdated();
     }
 
     public function setBasket(\Entities\Basket $basket)
     {
         $this->__load();
+
         return parent::setBasket($basket);
     }
 
     public function getBasket()
     {
         $this->__load();
+
         return parent::getBasket();
     }
 
     public function getRecord()
     {
         $this->__load();
+
         return parent::getRecord();
     }
 
     public function setRecord(\record_adapter $record)
     {
         $this->__load();
+
         return parent::setRecord($record);
     }
 
     public function setLastInBasket()
     {
         $this->__load();
+
         return parent::setLastInBasket();
     }
 
     public function addValidationData(\Entities\ValidationData $validationDatas)
     {
         $this->__load();
+
         return parent::addValidationData($validationDatas);
     }
 
     public function getValidationDatas()
     {
         $this->__load();
+
         return parent::getValidationDatas();
     }
 
     public function getUserValidationDatas(\User_Adapter $user)
     {
         $this->__load();
+
         return parent::getUserValidationDatas($user);
     }
 

lib/Doctrine/Proxies/__CG__EntitiesLazaretAttribute.php

@@ -48,66 +48,77 @@ class LazaretAttribute extends \Entities\LazaretAttribute implements \Doctrine\O
             return (int) $this->_identifier["id"];
         }
         $this->__load();
+
         return parent::getId();
     }
 
     public function setName($name)
     {
         $this->__load();
+
         return parent::setName($name);
     }
 
     public function getName()
     {
         $this->__load();
+
         return parent::getName();
     }
 
     public function setValue($value)
     {
         $this->__load();
+
         return parent::setValue($value);
     }
 
     public function getValue()
     {
         $this->__load();
+
         return parent::getValue();
     }
 
     public function setCreated($created)
     {
         $this->__load();
+
         return parent::setCreated($created);
     }
 
     public function getCreated()
     {
         $this->__load();
+
         return parent::getCreated();
     }
 
     public function setUpdated($updated)
     {
         $this->__load();
+
         return parent::setUpdated($updated);
     }
 
     public function getUpdated()
     {
         $this->__load();
+
         return parent::getUpdated();
     }
 
     public function setLazaretFile(\Entities\LazaretFile $lazaretFile = NULL)
     {
         $this->__load();
+
         return parent::setLazaretFile($lazaretFile);
     }
 
     public function getLazaretFile()
     {
         $this->__load();
+
         return parent::getLazaretFile();
     }
 

lib/Doctrine/Proxies/__CG__EntitiesLazaretCheck.php

@@ -48,30 +48,35 @@ class LazaretCheck extends \Entities\LazaretCheck implements \Doctrine\ORM\Proxy
             return (int) $this->_identifier["id"];
         }
         $this->__load();
+
         return parent::getId();
     }
 
     public function setCheck($check)
     {
         $this->__load();
+
         return parent::setCheck($check);
     }
 
     public function getCheck()
     {
         $this->__load();
+
         return parent::getCheck();
     }
 
     public function setLazaretFile(\Entities\LazaretFile $lazaretFile = NULL)
     {
         $this->__load();
+
         return parent::setLazaretFile($lazaretFile);
     }
 
     public function getLazaretFile()
     {
         $this->__load();
+
         return parent::getLazaretFile();
     }
 

lib/Doctrine/Proxies/__CG__EntitiesLazaretFile.php

@@ -48,138 +48,161 @@ class LazaretFile extends \Entities\LazaretFile implements \Doctrine\ORM\Proxy\P
             return (int) $this->_identifier["id"];
         }
         $this->__load();
+
         return parent::getId();
     }
 
     public function setPathname($pathname)
     {
         $this->__load();
+
         return parent::setPathname($pathname);
     }
 
     public function getPathname()
     {
         $this->__load();
+
         return parent::getPathname();
     }
 
     public function setBaseId($baseId)
     {
         $this->__load();
+
         return parent::setBaseId($baseId);
     }
 
     public function getBaseId()
     {
         $this->__load();
+
         return parent::getBaseId();
     }
 
     public function setUuid($uuid)
     {
         $this->__load();
+
         return parent::setUuid($uuid);
     }
 
     public function getUuid()
     {
         $this->__load();
+
         return parent::getUuid();
     }
 
     public function setSha256($sha256)
     {
         $this->__load();
+
         return parent::setSha256($sha256);
     }
 
     public function getSha256()
     {
         $this->__load();
+
         return parent::getSha256();
     }
 
     public function setCreated($created)
     {
         $this->__load();
+
         return parent::setCreated($created);
     }
 
     public function getCreated()
     {
         $this->__load();
+
         return parent::getCreated();
     }
 
     public function setUpdated($updated)
     {
         $this->__load();
+
         return parent::setUpdated($updated);
     }
 
     public function getUpdated()
     {
         $this->__load();
+
         return parent::getUpdated();
     }
 
     public function addLazaretAttribute(\Entities\LazaretAttribute $attributes)
     {
         $this->__load();
+
         return parent::addLazaretAttribute($attributes);
     }
 
     public function getAttributes()
     {
         $this->__load();
+
         return parent::getAttributes();
     }
 
     public function setSession(\Entities\LazaretSession $session = NULL)
     {
         $this->__load();
+
         return parent::setSession($session);
     }
 
     public function getSession()
     {
         $this->__load();
+
         return parent::getSession();
     }
 
     public function setOriginalName($originalName)
     {
         $this->__load();
+
         return parent::setOriginalName($originalName);
     }
 
     public function getOriginalName()
     {
         $this->__load();
+
         return parent::getOriginalName();
     }
 
     public function addLazaretCheck(\Entities\LazaretCheck $checks)
     {
         $this->__load();
+
         return parent::addLazaretCheck($checks);
     }
 
     public function getChecks()
     {
         $this->__load();
+
         return parent::getChecks();
     }
 
     public function setForced($forced)
     {
         $this->__load();
+
         return parent::setForced($forced);
     }
 
     public function getForced()
     {
         $this->__load();
+
         return parent::getForced();
     }
 

lib/Doctrine/Proxies/__CG__EntitiesLazaretSession.php

@@ -48,60 +48,70 @@ class LazaretSession extends \Entities\LazaretSession implements \Doctrine\ORM\P
             return (int) $this->_identifier["id"];
         }
         $this->__load();
+
         return parent::getId();
     }
 
     public function setUsrId($usrId)
     {
         $this->__load();
+
         return parent::setUsrId($usrId);
     }
 
     public function getUsrId()
     {
         $this->__load();
+
         return parent::getUsrId();
     }
 
     public function setCreated($created)
     {
         $this->__load();
+
         return parent::setCreated($created);
     }
 
     public function getCreated()
     {
         $this->__load();
+
         return parent::getCreated();
     }
 
     public function setUpdated($updated)
     {
         $this->__load();
+
         return parent::setUpdated($updated);
     }
 
     public function getUpdated()
     {
         $this->__load();
+
         return parent::getUpdated();
     }
 
     public function addLazaretFiles(\Entities\LazaretFile $files)
     {
         $this->__load();
+
         return parent::addLazaretFiles($files);
     }
 
     public function getFiles()
     {
         $this->__load();
+
         return parent::getFiles();
     }
 
     public function addLazaretFile(\Entities\LazaretFile $files)
     {
         $this->__load();
+
         return parent::addLazaretFile($files);
     }
 

lib/Doctrine/Proxies/__CG__EntitiesStoryWZ.php

@@ -48,78 +48,91 @@ class StoryWZ extends \Entities\StoryWZ implements \Doctrine\ORM\Proxy\Proxy
             return (int) $this->_identifier["id"];
         }
         $this->__load();
+
         return parent::getId();
     }
 
     public function setSbasId($sbasId)
     {
         $this->__load();
+
         return parent::setSbasId($sbasId);
     }
 
     public function getSbasId()
     {
         $this->__load();
+
         return parent::getSbasId();
     }
 
     public function setRecordId($recordId)
     {
         $this->__load();
+
         return parent::setRecordId($recordId);
     }
 
     public function getRecordId()
     {
         $this->__load();
+
         return parent::getRecordId();
     }
 
     public function setUsrId($usrId)
     {
         $this->__load();
+
         return parent::setUsrId($usrId);
     }
 
     public function getUsrId()
     {
         $this->__load();
+
         return parent::getUsrId();
     }
 
     public function setCreated($created)
     {
         $this->__load();
+
         return parent::setCreated($created);
     }
 
     public function getCreated()
     {
         $this->__load();
+
         return parent::getCreated();
     }
 
     public function setUser(\User_Adapter $user)
     {
         $this->__load();
+
         return parent::setUser($user);
     }
 
     public function getUser()
     {
         $this->__load();
+
         return parent::getUser();
     }
 
     public function getRecord()
     {
         $this->__load();
+
         return parent::getRecord();
     }
 
     public function setRecord(\record_adapter $record)
     {
         $this->__load();
+
         return parent::setRecord($record);
     }
 

lib/Doctrine/Proxies/__CG__EntitiesUsrList.php

@@ -48,84 +48,98 @@ class UsrList extends \Entities\UsrList implements \Doctrine\ORM\Proxy\Proxy
             return (int) $this->_identifier["id"];
         }
         $this->__load();
+
         return parent::getId();
     }
 
     public function setName($name)
     {
         $this->__load();
+
         return parent::setName($name);
     }
 
     public function getName()
     {
         $this->__load();
+
         return parent::getName();
     }
 
     public function setCreated($created)
     {
         $this->__load();
+
         return parent::setCreated($created);
     }
 
     public function getCreated()
     {
         $this->__load();
+
         return parent::getCreated();
     }
 
     public function setUpdated($updated)
     {
         $this->__load();
+
         return parent::setUpdated($updated);
     }
 
     public function getUpdated()
     {
         $this->__load();
+
         return parent::getUpdated();
     }
 
     public function addUsrListOwner(\Entities\UsrListOwner $owners)
     {
         $this->__load();
+
         return parent::addUsrListOwner($owners);
     }
 
     public function getOwners()
     {
         $this->__load();
+
         return parent::getOwners();
     }
 
     public function hasAccess(\User_Adapter $user)
     {
         $this->__load();
+
         return parent::hasAccess($user);
     }
 
     public function getOwner(\User_Adapter $user)
     {
         $this->__load();
+
         return parent::getOwner($user);
     }
 
     public function addUsrListEntry(\Entities\UsrListEntry $entry)
     {
         $this->__load();
+
         return parent::addUsrListEntry($entry);
     }
 
     public function getEntries()
     {
         $this->__load();
+
         return parent::getEntries();
     }
 
     public function has(\User_Adapter $user)
     {
         $this->__load();
+
         return parent::has($user);
     }
 

lib/Doctrine/Proxies/__CG__EntitiesUsrListEntry.php

@@ -48,66 +48,77 @@ class UsrListEntry extends \Entities\UsrListEntry implements \Doctrine\ORM\Proxy
             return (int) $this->_identifier["id"];
         }
         $this->__load();
+
         return parent::getId();
     }
 
     public function setUsrId($usrId)
     {
         $this->__load();
+
         return parent::setUsrId($usrId);
     }
 
     public function getUsrId()
     {
         $this->__load();
+
         return parent::getUsrId();
     }
 
     public function setCreated($created)
     {
         $this->__load();
+
         return parent::setCreated($created);
     }
 
     public function getCreated()
     {
         $this->__load();
+
         return parent::getCreated();
     }
 
     public function setUpdated($updated)
     {
         $this->__load();
+
         return parent::setUpdated($updated);
     }
 
     public function getUpdated()
     {
         $this->__load();
+
         return parent::getUpdated();
     }
 
     public function setList(\Entities\UsrList $list)
     {
         $this->__load();
+
         return parent::setList($list);
     }
 
     public function getList()
     {
         $this->__load();
+
         return parent::getList();
     }
 
     public function getUser()
     {
         $this->__load();
+
         return parent::getUser();
     }
 
     public function setUser(\User_Adapter $user)
     {
         $this->__load();
+
         return parent::setUser($user);
     }
 

lib/Doctrine/Proxies/__CG__EntitiesUsrListOwner.php

@@ -48,78 +48,91 @@ class UsrListOwner extends \Entities\UsrListOwner implements \Doctrine\ORM\Proxy
             return (int) $this->_identifier["id"];
         }
         $this->__load();
+
         return parent::getId();
     }
 
     public function setUsrId($usrId)
     {
         $this->__load();
+
         return parent::setUsrId($usrId);
     }
 
     public function getUsrId()
     {
         $this->__load();
+
         return parent::getUsrId();
     }
 
     public function setRole($role)
     {
         $this->__load();
+
         return parent::setRole($role);
     }
 
     public function getRole()
     {
         $this->__load();
+
         return parent::getRole();
     }
 
     public function setCreated($created)
     {
         $this->__load();
+
         return parent::setCreated($created);
     }
 
     public function getCreated()
     {
         $this->__load();
+
         return parent::getCreated();
     }
 
     public function setUpdated($updated)
     {
         $this->__load();
+
         return parent::setUpdated($updated);
     }
 
     public function getUpdated()
     {
         $this->__load();
+
         return parent::getUpdated();
     }
 
     public function setList(\Entities\UsrList $list)
     {
         $this->__load();
+
         return parent::setList($list);
     }
 
     public function getList()
     {
         $this->__load();
+
         return parent::getList();
     }
 
     public function setUser(\User_Adapter $user)
     {
         $this->__load();
+
         return parent::setUser($user);
     }
 
     public function getUser()
     {
         $this->__load();
+
         return parent::getUser();
     }
 

lib/Doctrine/Proxies/__CG__EntitiesValidationData.php

@@ -48,66 +48,77 @@ class ValidationData extends \Entities\ValidationData implements \Doctrine\ORM\P
             return (int) $this->_identifier["id"];
         }
         $this->__load();
+
         return parent::getId();
     }
 
     public function setAgreement($agreement)
     {
         $this->__load();
+
         return parent::setAgreement($agreement);
     }
 
     public function getAgreement()
     {
         $this->__load();
+
         return parent::getAgreement();
     }
 
     public function setNote($note)
     {
         $this->__load();
+
         return parent::setNote($note);
     }
 
     public function getNote()
     {
         $this->__load();
+
         return parent::getNote();
     }
 
     public function setUpdated($updated)
     {
         $this->__load();
+
         return parent::setUpdated($updated);
     }
 
     public function getUpdated()
     {
         $this->__load();
+
         return parent::getUpdated();
     }
 
     public function setParticipant(\Entities\ValidationParticipant $participant)
     {
         $this->__load();
+
         return parent::setParticipant($participant);
     }
 
     public function getParticipant()
     {
         $this->__load();
+
         return parent::getParticipant();
     }
 
     public function setBasketElement(\Entities\BasketElement $basketElement)
     {
         $this->__load();
+
         return parent::setBasketElement($basketElement);
     }
 
     public function getBasketElement()
     {
         $this->__load();
+
         return parent::getBasketElement();
     }
 

lib/Doctrine/Proxies/__CG__EntitiesValidationParticipant.php

@@ -48,120 +48,140 @@ class ValidationParticipant extends \Entities\ValidationParticipant implements \
             return (int) $this->_identifier["id"];
         }
         $this->__load();
+
         return parent::getId();
     }
 
     public function setUsrId($usrId)
     {
         $this->__load();
+
         return parent::setUsrId($usrId);
     }
 
     public function getUsrId()
     {
         $this->__load();
+
         return parent::getUsrId();
     }
 
     public function addValidationData(\Entities\ValidationData $datas)
     {
         $this->__load();
+
         return parent::addValidationData($datas);
     }
 
     public function setSession(\Entities\ValidationSession $session)
     {
         $this->__load();
+
         return parent::setSession($session);
     }
 
     public function getSession()
     {
         $this->__load();
+
         return parent::getSession();
     }
 
     public function setIsAware($isAware)
     {
         $this->__load();
+
         return parent::setIsAware($isAware);
     }
 
     public function getIsAware()
     {
         $this->__load();
+
         return parent::getIsAware();
     }
 
     public function setUser(\User_Adapter $user)
     {
         $this->__load();
+
         return parent::setUser($user);
     }
 
     public function getUser()
     {
         $this->__load();
+
         return parent::getUser();
     }
 
     public function setReminded($reminded)
     {
         $this->__load();
+
         return parent::setReminded($reminded);
     }
 
     public function getReminded()
     {
         $this->__load();
+
         return parent::getReminded();
     }
 
     public function getDatas()
     {
         $this->__load();
+
         return parent::getDatas();
     }
 
     public function setIsConfirmed($isConfirmed)
     {
         $this->__load();
+
         return parent::setIsConfirmed($isConfirmed);
     }
 
     public function getIsConfirmed()
     {
         $this->__load();
+
         return parent::getIsConfirmed();
     }
 
     public function setCanAgree($canAgree)
     {
         $this->__load();
+
         return parent::setCanAgree($canAgree);
     }
 
     public function getCanAgree()
     {
         $this->__load();
+
         return parent::getCanAgree();
     }
 
     public function setCanSeeOthers($canSeeOthers)
     {
         $this->__load();
+
         return parent::setCanSeeOthers($canSeeOthers);
     }
 
     public function getCanSeeOthers()
     {
         $this->__load();
+
         return parent::getCanSeeOthers();
     }
 
     public function isReleasable()
     {
         $this->__load();
+
         return parent::isReleasable();
     }
 

lib/Doctrine/Proxies/__CG__EntitiesValidationSession.php

@@ -48,162 +48,189 @@ class ValidationSession extends \Entities\ValidationSession implements \Doctrine
             return (int) $this->_identifier["id"];
         }
         $this->__load();
+
         return parent::getId();
     }
 
     public function setName($name)
     {
         $this->__load();
+
         return parent::setName($name);
     }
 
     public function getName()
     {
         $this->__load();
+
         return parent::getName();
     }
 
     public function setDescription($description)
     {
         $this->__load();
+
         return parent::setDescription($description);
     }
 
     public function getDescription()
     {
         $this->__load();
+
         return parent::getDescription();
     }
 
     public function setArchived($archived)
     {
         $this->__load();
+
         return parent::setArchived($archived);
     }
 
     public function getArchived()
     {
         $this->__load();
+
         return parent::getArchived();
     }
 
     public function setCreated($created)
     {
         $this->__load();
+
         return parent::setCreated($created);
     }
 
     public function getCreated()
     {
         $this->__load();
+
         return parent::getCreated();
     }
 
     public function setUpdated($updated)
     {
         $this->__load();
+
         return parent::setUpdated($updated);
     }
 
     public function getUpdated()
     {
         $this->__load();
+
         return parent::getUpdated();
     }
 
     public function setExpires($expires)
     {
         $this->__load();
+
         return parent::setExpires($expires);
     }
 
     public function getExpires()
     {
         $this->__load();
+
         return parent::getExpires();
     }
 
     public function setReminded($reminded)
     {
         $this->__load();
+
         return parent::setReminded($reminded);
     }
 
     public function getReminded()
     {
         $this->__load();
+
         return parent::getReminded();
     }
 
     public function setBasket(\Entities\Basket $basket)
     {
         $this->__load();
+
         return parent::setBasket($basket);
     }
 
     public function getBasket()
     {
         $this->__load();
+
         return parent::getBasket();
     }
 
     public function addValidationParticipant(\Entities\ValidationParticipant $participants)
     {
         $this->__load();
+
         return parent::addValidationParticipant($participants);
     }
 
     public function getParticipants()
     {
         $this->__load();
+
         return parent::getParticipants();
     }
 
     public function getParticipant(\User_Adapter $user)
     {
         $this->__load();
+
         return parent::getParticipant($user);
     }
 
     public function setInitiatorId($initiatorId)
     {
         $this->__load();
+
         return parent::setInitiatorId($initiatorId);
     }
 
     public function getInitiatorId()
     {
         $this->__load();
+
         return parent::getInitiatorId();
     }
 
     public function isInitiator(\User_Adapter $user)
     {
         $this->__load();
+
         return parent::isInitiator($user);
     }
 
     public function setInitiator(\User_Adapter $user)
     {
         $this->__load();
+
         return parent::setInitiator($user);
     }
 
     public function getInitiator()
     {
         $this->__load();
+
         return parent::getInitiator();
     }
 
     public function isFinished()
     {
         $this->__load();
+
         return parent::isFinished();
     }
 
     public function getValidationString(\User_Adapter $user)
     {
         $this->__load();
+
         return parent::getValidationString($user);
     }
 

lib/Doctrine/Repositories/BasketElementRepository.php

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

lib/classes/API/OAuth2/Adapter.class.php

@@ -477,8 +477,7 @@ class API_OAuth2_Adapter extends OAuth2
                 ), $redirect_uri);
             if ($compare !== 0)
                 $this->errorDoRedirectUriCallback($input["redirect_uri"], OAUTH2_ERROR_REDIRECT_URI_MISMATCH, NULL, NULL, $input["state"]);
-        }
+        } elseif ($redirect_uri) {
-        elseif ($redirect_uri) {
             /**
              *  They did not provide a uri from input, so use the stored one
              */

lib/classes/API/OAuth2/Form/DevAppDesktop.class.php

@@ -142,7 +142,7 @@ class API_OAuth2_Form_DevAppDesktop
      * @param  ClassMetadata          $metadata
      * @return API_OAuth2_Form_DevApp
      */
-    static public function loadValidatorMetadata(ClassMetadata $metadata)
+    public static function loadValidatorMetadata(ClassMetadata $metadata)
     {
         $blank = array('message' => _('Cette valeur ne peut être vide'));
         $url = array('message' => _('Url non valide'));

lib/classes/API/OAuth2/Form/DevAppInternet.class.php

@@ -145,7 +145,7 @@ class API_OAuth2_Form_DevAppInternet
      * @param  ClassMetadata          $metadata
      * @return API_OAuth2_Form_DevApp
      */
-    static public function loadValidatorMetadata(ClassMetadata $metadata)
+    public static function loadValidatorMetadata(ClassMetadata $metadata)
     {
         $blank = array('message' => _('Cette valeur ne peut être vide'));
         $url = array('message' => _('Url non valide'));

lib/classes/API/V1/Log.class.php

@@ -6,7 +6,6 @@
  */
 
 use Symfony\Component\HttpFoundation\Request;
-use Symfony\Component\HttpFoundation\Response;
 
 class API_V1_Log
 {

lib/classes/API/V1/adapter.class.php

@@ -1698,6 +1698,7 @@ class API_V1_adapter extends API_V1_Abstract
          * @todo  ajouter une option pour avoir les values serialisées
          *        dans un cas multi
          */
+
         return array(
             'meta_id'           => $value->getId(),
             'meta_structure_id' => $field->get_meta_struct_id(),

lib/classes/Bridge/Api/Dailymotion.class.php

@@ -637,6 +637,7 @@ class Bridge_Api_Dailymotion extends Bridge_Api_Abstract implements Bridge_Api_I
                 /**
                  * @todo Retieve thumb
                  */
+
                 return new Bridge_Api_Dailymotion_Container($entry, $object, '');
                 break;
             default:
@@ -798,8 +799,7 @@ class Bridge_Api_Dailymotion extends Bridge_Api_Abstract implements Bridge_Api_I
                 if ( ! isset($datas[$name]) || trim($datas[$name]) === '') {
                     if ($required)
                         $errors[$name . '_' . $key] = _("Ce champ est obligatoire");
-                }
+                } else {
-                else {
                     if ($length != 0 && mb_strlen($datas[$name]) > $length)
                         $errors[$name . '_' . $key] = sprintf(_("Ce champ est trop long %s caracteres max"), $length);
                     if ($length_min != 0 && mb_strlen($datas[$name]) < $length_min)
@@ -825,8 +825,7 @@ class Bridge_Api_Dailymotion extends Bridge_Api_Abstract implements Bridge_Api_I
                 if ( ! isset($datas[$name]) || trim($datas[$name]) === '') {
                     if ($required)
                         $errors[$name] = _("Ce champ est obligatoire");
-                }
+                } else {
-                else {
                     if ($length != 0 && mb_strlen($datas[$name]) > $length)
                         $errors[$name] = sprintf(_("Ce champ est trop long %s caracteres max"), $length);
                     if ($length_min != 0 && mb_strlen($datas[$name]) < $length_min)

lib/classes/Bridge/Api/Flickr.class.php

@@ -707,8 +707,7 @@ class Bridge_Api_Flickr extends Bridge_Api_Abstract implements Bridge_Api_Interf
                 if ( ! isset($datas[$name]) || trim($datas[$name]) === '') {
                     if ($required)
                         $errors[$name . '_' . $key] = _("Ce champ est obligatoire");
-                }
+                } elseif ($length !== 0) {
-                elseif ($length !== 0) {
                     if (mb_strlen($datas[$name]) > $length)
                         $errors[$name . '_' . $key] = sprintf(_("Ce champ est trop long %s caracteres max"), $length);
                 }
@@ -730,8 +729,7 @@ class Bridge_Api_Flickr extends Bridge_Api_Abstract implements Bridge_Api_Interf
                 if ( ! isset($datas[$name]) || trim($datas[$name]) === '') {
                     if ($required)
                         $errors[$name] = _("Ce champ est obligatoire");
-                }
+                } elseif ($length !== 0) {
-                elseif ($length !== 0) {
                     if (mb_strlen($datas[$name]) > $length)
                         $errors[$name] = sprintf(_("Ce champ est trop long %s caracteres max"), $length);
                 }

lib/classes/Bridge/Api/Interface.class.php

@@ -9,7 +9,6 @@
  * file that was distributed with this source code.
  */
 
-use \Symfony\Component\HttpFoundation;
 
 /**
  *

lib/classes/Bridge/Api/Youtube.class.php

@@ -921,12 +921,10 @@ class Bridge_Api_Youtube extends Bridge_Api_Abstract implements Bridge_Api_Inter
                 if ( ! isset($datas[$name])) {
                     if ($required)
                         $errors[$name . '_' . $key] = _("Ce champ est obligatoire");
-                }
+                } elseif (trim($datas[$name]) === '') {
-                elseif (trim($datas[$name]) === '') {
                     if ( ! $empty)
                         $errors[$name . '_' . $key] = _("Ce champ est obligatoire");
-                }
+                } elseif ($length !== 0) {
-                elseif ($length !== 0) {
                     if (mb_strlen($datas[$name]) > $length)
                         $errors[$name . '_' . $key] = sprintf(_("Ce champ est trop long %s caracteres max"), $length);
                 }
@@ -949,12 +947,10 @@ class Bridge_Api_Youtube extends Bridge_Api_Abstract implements Bridge_Api_Inter
                 if ( ! isset($datas[$name])) {
                     if ($required)
                         $errors[$name] = _("Ce champ est obligatoire");
-                }
+                } elseif (trim($datas[$name]) === '') {
-                elseif (trim($datas[$name]) === '') {
                     if ( ! $empty)
                         $errors[$name] = _("Ce champ est obligatoire");
-                }
+                } elseif ($length !== 0) {
-                elseif ($length !== 0) {
                     if (mb_strlen($datas[$name]) > $length)
                         $errors[$name] = sprintf(_("Ce champ est trop long %s caracteres max"), $length);
                 }

lib/classes/Browser.class.php

@@ -24,7 +24,7 @@
  * Typical Usage:
  *
  *   $browser = Browser::getInstance();
- *   if( $browser->getBrowser() == Browser::BROWSER_FIREFOX && $browser->getVersion() >= 2 ) {
+ *   if ( $browser->getBrowser() == Browser::BROWSER_FIREFOX && $browser->getVersion() >= 2 ) {
  *     echo 'You have FireFox version 2 or greater';
  *   }
  *
@@ -248,7 +248,7 @@ class Browser
      * @param  string $browserName
      * @return True   if the browser is the specified browser
      */
-    function isBrowser($browserName)
+    public function isBrowser($browserName)
     {
         return( 0 == strcasecmp($this->_browser_name, trim($browserName)));
     }
@@ -644,7 +644,7 @@ class Browser
             $this->_browser_name = self::BROWSER_W3CVALIDATOR;
 
             return true;
-        } else if (stripos($this->_agent, 'W3C_Validator') !== false) {
+        } elseif (stripos($this->_agent, 'W3C_Validator') !== false) {
             // Some of the Validator versions do not delineate w/ a slash - add it back in
             $ua = str_replace("W3C_Validator ", "W3C_Validator/", $this->_agent);
             $aresult = explode('/', stristr($ua, 'W3C_Validator'));
@@ -752,11 +752,11 @@ class Browser
             $this->setMobile(true);
 
             return true;
-        } else if (stripos($this->_agent, 'opera') !== false) {
+        } elseif (stripos($this->_agent, 'opera') !== false) {
             $resultant = stristr($this->_agent, 'opera');
             if (preg_match('/Version\/([0-9]{2}.*)$/', $resultant, $matches)) {
                 $this->setVersion($matches[1]);
-            } else if (preg_match('/\//', $resultant)) {
+            } elseif (preg_match('/\//', $resultant)) {
                 $aresult = explode('/', str_replace("(", " ", $resultant));
                 $aversion = explode(' ', $aresult[1]);
                 $this->setVersion($aversion[0]);
@@ -943,7 +943,7 @@ class Browser
             $this->setBrowser(self::BROWSER_NETSCAPE_NAVIGATOR);
 
             return true;
-        } else if (stripos($this->_agent, 'Firefox') === false && preg_match('/Netscape6?\/([^ ]*)/i', $this->_agent, $matches)) {
+        } elseif (stripos($this->_agent, 'Firefox') === false && preg_match('/Netscape6?\/([^ ]*)/i', $this->_agent, $matches)) {
             $this->setVersion($matches[1]);
             $this->setBrowser(self::BROWSER_NETSCAPE_NAVIGATOR);
 
@@ -1018,7 +1018,7 @@ class Browser
                 $this->setBrowser(self::BROWSER_FIREFOX);
 
                 return true;
-            } else if (preg_match("/Firefox$/i", $this->_agent, $matches)) {
+            } elseif (preg_match("/Firefox$/i", $this->_agent, $matches)) {
                 $this->setVersion("");
                 $this->setBrowser(self::BROWSER_FIREFOX);
 
@@ -1060,13 +1060,13 @@ class Browser
             $this->setBrowser(self::BROWSER_MOZILLA);
 
             return true;
-        } else if (stripos($this->_agent, 'mozilla') !== false && preg_match('/rv:[0-9]\.[0-9]/i', $this->_agent) && stripos($this->_agent, 'netscape') === false) {
+        } elseif (stripos($this->_agent, 'mozilla') !== false && preg_match('/rv:[0-9]\.[0-9]/i', $this->_agent) && stripos($this->_agent, 'netscape') === false) {
             $aversion = explode('', stristr($this->_agent, 'rv:'));
             $this->setVersion(str_replace('rv:', '', $aversion[0]));
             $this->setBrowser(self::BROWSER_MOZILLA);
 
             return true;
-        } else if (stripos($this->_agent, 'mozilla') !== false && preg_match('/mozilla\/([^ ]*)/i', $this->_agent, $matches) && stripos($this->_agent, 'netscape') === false) {
+        } elseif (stripos($this->_agent, 'mozilla') !== false && preg_match('/mozilla\/([^ ]*)/i', $this->_agent, $matches) && stripos($this->_agent, 'netscape') === false) {
             $this->setVersion($matches[1]);
             $this->setBrowser(self::BROWSER_MOZILLA);
 
@@ -1234,11 +1234,11 @@ class Browser
     {
         if (stripos($this->_agent, 'windows') !== false) {
             $this->_platform = self::PLATFORM_WINDOWS;
-        } else if (stripos($this->_agent, 'iPad') !== false) {
+        } elseif (stripos($this->_agent, 'iPad') !== false) {
             $this->_platform = self::PLATFORM_IPAD;
-        } else if (stripos($this->_agent, 'iPod') !== false) {
+        } elseif (stripos($this->_agent, 'iPod') !== false) {
             $this->_platform = self::PLATFORM_IPOD;
-        } else if (stripos($this->_agent, 'iPhone') !== false) {
+        } elseif (stripos($this->_agent, 'iPhone') !== false) {
             $this->_platform = self::PLATFORM_IPHONE;
         } elseif (stripos($this->_agent, 'mac') !== false) {
             $this->_platform = self::PLATFORM_APPLE;
@@ -1246,9 +1246,9 @@ class Browser
             $this->_platform = self::PLATFORM_ANDROID;
         } elseif (stripos($this->_agent, 'linux') !== false) {
             $this->_platform = self::PLATFORM_LINUX;
-        } else if (stripos($this->_agent, 'Nokia') !== false) {
+        } elseif (stripos($this->_agent, 'Nokia') !== false) {
             $this->_platform = self::PLATFORM_NOKIA;
-        } else if (stripos($this->_agent, 'BlackBerry') !== false) {
+        } elseif (stripos($this->_agent, 'BlackBerry') !== false) {
             $this->_platform = self::PLATFORM_BLACKBERRY;
         } elseif (stripos($this->_agent, 'FreeBSD') !== false) {
             $this->_platform = self::PLATFORM_FREEBSD;

lib/classes/Feed/Publisher/Adapter.class.php

@@ -209,8 +209,7 @@ class Feed_Publisher_Adapter implements Feed_Publisher_Interface, cache_cacheabl
     public static function getPublisher(appbox &$appbox, Feed_Adapter &$feed, User_Adapter &$user)
     {
         foreach ($feed->get_publishers() as $publisher) {
-            if ($publisher->get_user()->get_id() === $user->get_id())
+            if ($publisher->get_user()->get_id() === $user->get_id()) {
-            {
                 return $publisher;
             }
         }

lib/classes/Session/Handler.class.php

@@ -277,8 +277,7 @@ class Session_Handler
                 self::$_cookie[$name] = $value;
             else
                 $_COOKIE[$name] = $value;
-        }
+        } else {
-        else {
             if (http_request::is_command_line() && isset(self::$_cookie[$name]))
                 unset(self::$_cookie[$name]);
             else
@@ -655,8 +654,7 @@ class Session_Handler
         if ($enter) {
             if ($app && ! in_array($app, $apps))
                 $apps[] = $app;
-        }
+        } elseif (in_array($app, $apps)) {
-        elseif (in_array($app, $apps)) {
             unset($apps[$app]);
         }
 

lib/classes/Session/Storage/PHPSession.class.php

@@ -127,7 +127,7 @@ class Session_Storage_PHPSession extends Session_Storage_Abstract implements Ses
      *
      * @return string
      */
-    function getName()
+    public function getName()
     {
         return session_name();
     }
@@ -137,7 +137,7 @@ class Session_Storage_PHPSession extends Session_Storage_Abstract implements Ses
      *
      * @return <type>
      */
-    function getId()
+    public function getId()
     {
         return session_id();
     }

lib/classes/User/Adapter.class.php

@@ -335,8 +335,7 @@ class User_Adapter implements User_Interface, cache_cacheableInterface
     {
         if (is_int((int) $id) && (int) $id > 0) {
             $id = (int) $id;
-        }
+        } else
-        else
             throw new Exception('Invalid usr_id');
 
         if ( ! isset(self::$_instance[$id])) {

lib/classes/User/Query.class.php

@@ -257,8 +257,7 @@ class User_Query implements User_QueryInterface
         if (count($this->base_ids) == 0) {
             if ($this->bases_restrictions)
                 throw new Exception('No base available for you, not enough rights');
-        }
+        } else {
-        else {
             $extra = $this->include_phantoms ? ' OR base_id IS NULL ' : '';
 
             $not_base_id = array_diff($this->active_bases, $this->base_ids);
@@ -278,8 +277,7 @@ class User_Query implements User_QueryInterface
         if (count($this->sbas_ids) == 0) {
             if ($this->sbas_restrictions)
                 throw new Exception('No base available for you, not enough rights');
-        }
+        } else {
-        else {
             $extra = $this->include_phantoms ? ' OR sbas_id IS NULL ' : '';
 
             $not_sbas_id = array_diff($this->active_sbas, $this->sbas_ids);

lib/classes/base.class.php

@@ -68,7 +68,7 @@ abstract class base implements cache_cacheableInterface
     /**
      *
      */
-    abstract function get_base_type();
+    abstract public function get_base_type();
 
     /**
      *

lib/classes/caption/field.class.php

@@ -189,8 +189,7 @@ class caption_field
                 $separator = $this->databox_field->get_separator();
 
             return self::serialize_value($this->values, $separator, $highlightTheso);
-        }
+        } else {
-        else {
             foreach ($this->values as $value) {
                 /* @var $value Caption_Field_Value */
 

lib/classes/databox/status.class.php

@@ -411,7 +411,7 @@ class databox_status
 
         $switch = in_array($switch, array('on', 'off')) ? $switch : false;
 
-        if ( ! $switch){
+        if ( ! $switch) {
             throw new Exception_InvalidArgument();
         }
 

lib/classes/databox/subdef.class.php

@@ -9,7 +9,6 @@
  * file that was distributed with this source code.
  */
 
-use MediaAlchemyst\Specification\Specification;
 use Alchemy\Phrasea\Media\Subdef\Image;
 use Alchemy\Phrasea\Media\Subdef\Audio;
 use Alchemy\Phrasea\Media\Subdef\Video;

lib/classes/deprecated/inscript.api.php

@@ -156,8 +156,7 @@ function giveMeBases($usr = null)
                     $inscriptions[$sbas_id]['CollsNonactif'][$collection->get_coll_id()] = $lacgu;
                 elseif ($usrerRegis[$databox->get_dbname()][$collection->get_coll_id()] === true)
                     $inscriptions[$sbas_id]['CollsRegistered'][$collection->get_coll_id()] = $lacgu;
-            }
+            } elseif ( ! $cguSpec && $collInscript) {//ne va pas.. si l'inscriptio na la coll est explicitement non autorise, je refuse'
-            elseif ( ! $cguSpec && $collInscript) {//ne va pas.. si l'inscriptio na la coll est explicitement non autorise, je refuse'
                 $inscriptions[$sbas_id]['Colls'][$collection->get_coll_id()] = $collection->get_name();
             } elseif ($cguSpec) {
                 $inscriptions[$sbas_id]['CollsCGU'][$collection->get_coll_id()]['name'] = $collection->get_name();

lib/classes/eventsmanager/broker.class.php

@@ -39,7 +39,7 @@ class eventsmanager_broker
         return self::$_instance;
     }
 
-    function start()
+    public function start()
     {
         $iterators_pool = array(
             'event' => (is_array($this->appbox->get_registry()->get('GV_events')) ? $this->appbox->get_registry()->get('GV_events') : array()),
@@ -107,7 +107,7 @@ class eventsmanager_broker
         return $ret;
     }
 
-    function trigger($event, $array_params = array(), &$object = false)
+    public function trigger($event, $array_params = array(), &$object = false)
     {
         if (array_key_exists($event, $this->events)) {
             foreach ($this->events[$event] as $classname) {
@@ -118,7 +118,7 @@ class eventsmanager_broker
         return;
     }
 
-    function bind($event, $object_name)
+    public function bind($event, $object_name)
     {
 
         if ( ! array_key_exists($event, $this->events))
@@ -127,7 +127,7 @@ class eventsmanager_broker
         $this->events[$event][] = $object_name;
     }
 
-    function notify($usr_id, $event_type, $datas, $mailed = false)
+    public function notify($usr_id, $event_type, $datas, $mailed = false)
     {
         try {
             $event_type = str_replace('eventsmanager_', '', $event_type);
@@ -153,7 +153,7 @@ class eventsmanager_broker
         return true;
     }
 
-    function get_json_notifications($page = 0)
+    public function get_json_notifications($page = 0)
     {
         $appbox = appbox::get_instance(\bootstrap::getCore());
         $session = $appbox->get_session();
@@ -226,7 +226,7 @@ class eventsmanager_broker
         return p4string::jsonencode($datas);
     }
 
-    function get_unread_notifications_number()
+    public function get_unread_notifications_number()
     {
         $appbox = appbox::get_instance(\bootstrap::getCore());
         $session = $appbox->get_session();
@@ -248,7 +248,7 @@ class eventsmanager_broker
         return $total;
     }
 
-    function get_notifications()
+    public function get_notifications()
     {
         $appbox = appbox::get_instance(\bootstrap::getCore());
         $session = $appbox->get_session();
@@ -314,7 +314,7 @@ class eventsmanager_broker
         return $ret;
     }
 
-    function read(Array $notifications, $usr_id)
+    public function read(Array $notifications, $usr_id)
     {
         if (count($notifications) == 0) {
             return false;
@@ -331,7 +331,7 @@ class eventsmanager_broker
         return $this;
     }
 
-    function mailed($notification, $usr_id)
+    public function mailed($notification, $usr_id)
     {
         $sql = 'UPDATE notifications SET mailed="0"
             WHERE usr_id = :usr_id AND id = :notif_id';
@@ -343,7 +343,7 @@ class eventsmanager_broker
         return;
     }
 
-    function list_notifications_available($usr_id)
+    public function list_notifications_available($usr_id)
     {
 
         $personnal_notifications = array();

lib/classes/eventsmanager/notify/autoregister.class.php

@@ -194,7 +194,7 @@ class eventsmanager_notify_autoregister extends eventsmanager_notifyAbstract
      * @param  Array   $datas
      * @return boolean
      */
-    function mail($to, $from, $datas)
+    public function mail($to, $from, $datas)
     {
         $subject = sprintf(_('admin::register: Inscription automatique sur %s')
             , $this->registry->get('GV_homeTitle'));
@@ -258,7 +258,7 @@ class eventsmanager_notify_autoregister extends eventsmanager_notifyAbstract
      *
      * @return boolean
      */
-    function is_available()
+    public function is_available()
     {
         $bool = false;
         $session = $this->appbox->get_session();

lib/classes/eventsmanager/notify/bridgeuploadfail.class.php

@@ -157,7 +157,7 @@ class eventsmanager_notify_bridgeuploadfail extends eventsmanager_notifyAbstract
      * @param  Array   $datas
      * @return boolean
      */
-    function mail($to, $from, $datas)
+    public function mail($to, $from, $datas)
     {
         $subject = sprintf('Echec upload sur %s'
             , $this->registry->get('GV_homeTitle'));
@@ -175,7 +175,7 @@ class eventsmanager_notify_bridgeuploadfail extends eventsmanager_notifyAbstract
      *
      * @return boolean
      */
-    function is_available()
+    public function is_available()
     {
         return true;
     }

lib/classes/eventsmanager/notify/downloadmailfail.class.php

@@ -162,7 +162,7 @@ class eventsmanager_notify_downloadmailfail extends eventsmanager_notifyAbstract
      *
      * @return boolean
      */
-    function is_available()
+    public function is_available()
     {
         return true;
     }

lib/classes/eventsmanager/notify/feed.class.php

@@ -108,8 +108,7 @@ class eventsmanager_notify_feed extends eventsmanager_notifyAbstract
                 $this->broker->notify($user_to_notif->get_id(), __CLASS__, $datas, $mailed);
             }
             $start += $perLoop;
-        }
+        } while (count($results) > 0);
-        while (count($results) > 0);
 
         return true;
     }
@@ -164,7 +163,7 @@ class eventsmanager_notify_feed extends eventsmanager_notifyAbstract
      *
      * @return boolean
      */
-    function is_available()
+    public function is_available()
     {
         return true;
     }
@@ -178,7 +177,7 @@ class eventsmanager_notify_feed extends eventsmanager_notifyAbstract
      * @param  boolean $accuse
      * @return boolean
      */
-    function mail($to, $from, $url, \Feed_Entry_Adapter $entry)
+    public function mail($to, $from, $url, \Feed_Entry_Adapter $entry)
     {
         $subject = sprintf(_('Nouvelle publication : %s'), $entry->get_title());
 

lib/classes/eventsmanager/notify/order.class.php

@@ -181,7 +181,7 @@ class eventsmanager_notify_order extends eventsmanager_notifyAbstract
      * @param  Array   $datas
      * @return boolean
      */
-    function mail($to, $from, $datas)
+    public function mail($to, $from, $datas)
     {
         $subject = sprintf(_('admin::register: Nouvelle commande sur %s')
             , $this->registry->get('GV_homeTitle'));
@@ -235,7 +235,7 @@ class eventsmanager_notify_order extends eventsmanager_notifyAbstract
      *
      * @return boolean
      */
-    function is_available()
+    public function is_available()
     {
         $bool = false;
         $session = $this->appbox->get_session();

lib/classes/eventsmanager/notify/orderdeliver.class.php

@@ -27,7 +27,7 @@ class eventsmanager_notify_orderdeliver extends eventsmanager_notifyAbstract
      *
      * @return notify_orderdeliver
      */
-    function __construct(appbox &$appbox, \Alchemy\Phrasea\Core $core, eventsmanager_broker &$broker)
+    public function __construct(appbox &$appbox, \Alchemy\Phrasea\Core $core, eventsmanager_broker &$broker)
     {
         $this->group = _('Commande');
         parent::__construct($appbox, $core, $broker);
@@ -182,7 +182,7 @@ class eventsmanager_notify_orderdeliver extends eventsmanager_notifyAbstract
      * @param  int     $ssel_id
      * @return boolean
      */
-    function mail($to, $from, $ssel_id)
+    public function mail($to, $from, $ssel_id)
     {
         try {
             $em = $this->core->getEntityManager();
@@ -214,7 +214,7 @@ class eventsmanager_notify_orderdeliver extends eventsmanager_notifyAbstract
      *
      * @return boolean
      */
-    function is_available()
+    public function is_available()
     {
         return true;
     }

lib/classes/eventsmanager/notify/ordernotdelivered.class.php

@@ -22,7 +22,7 @@ class eventsmanager_notify_ordernotdelivered extends eventsmanager_notifyAbstrac
      */
     public $events = array('__ORDER_NOT_DELIVERED__');
 
-    function __construct(appbox &$appbox, \Alchemy\Phrasea\Core $core, eventsmanager_broker &$broker)
+    public function __construct(appbox &$appbox, \Alchemy\Phrasea\Core $core, eventsmanager_broker &$broker)
     {
         $this->group = _('Commande');
         parent::__construct($appbox, $core, $broker);
@@ -130,7 +130,7 @@ class eventsmanager_notify_ordernotdelivered extends eventsmanager_notifyAbstrac
         return _('Refus d\'elements de commande');
     }
 
-    function mail($to, $from, $n)
+    public function mail($to, $from, $n)
     {
         $subject = sprintf(_('push::mail:: Refus d\'elements de votre commande'));
 
@@ -146,7 +146,7 @@ class eventsmanager_notify_ordernotdelivered extends eventsmanager_notifyAbstrac
      *
      * @return boolean
      */
-    function is_available()
+    public function is_available()
     {
         return true;
     }

lib/classes/eventsmanager/notify/push.class.php

@@ -152,7 +152,7 @@ class eventsmanager_notify_push extends eventsmanager_notifyAbstract
      *
      * @return boolean
      */
-    function is_available()
+    public function is_available()
     {
         return true;
     }
@@ -166,7 +166,7 @@ class eventsmanager_notify_push extends eventsmanager_notifyAbstract
      * @param  boolean $accuse
      * @return boolean
      */
-    function mail($to, $from, $message, $url, $accuse)
+    public function mail($to, $from, $message, $url, $accuse)
     {
         $subject = _('push::mail:: Reception de documents');
 

lib/classes/eventsmanager/notify/register.class.php

@@ -194,7 +194,7 @@ class eventsmanager_notify_register extends eventsmanager_notifyAbstract
      * @param  string  $datas
      * @return boolean
      */
-    function mail($to, $from, $datas)
+    public function mail($to, $from, $datas)
     {
         $subject = sprintf(
             _('admin::register: demande d\'inscription sur %s'), $this->registry->get('GV_homeTitle')
@@ -263,7 +263,7 @@ class eventsmanager_notify_register extends eventsmanager_notifyAbstract
      *
      * @return boolean
      */
-    function is_available()
+    public function is_available()
     {
         $bool = false;
 

lib/classes/eventsmanager/notify/validate.class.php

@@ -27,7 +27,7 @@ class eventsmanager_notify_validate extends eventsmanager_notifyAbstract
      *
      * @return notify_validate
      */
-    function __construct(appbox &$appbox, \Alchemy\Phrasea\Core $core, eventsmanager_broker &$broker)
+    public function __construct(appbox &$appbox, \Alchemy\Phrasea\Core $core, eventsmanager_broker &$broker)
     {
         $this->group = _('Validation');
         parent::__construct($appbox, $core, $broker);
@@ -187,7 +187,7 @@ class eventsmanager_notify_validate extends eventsmanager_notifyAbstract
      * @param  boolean $accuse
      * @return boolean
      */
-    function mail($to, $from, $message, $url, $accuse)
+    public function mail($to, $from, $message, $url, $accuse)
     {
         $subject = _('push::mail:: Demande de validation de documents');
 
@@ -210,7 +210,7 @@ class eventsmanager_notify_validate extends eventsmanager_notifyAbstract
      *
      * @return boolean
      */
-    function is_available()
+    public function is_available()
     {
         return true;
     }

lib/classes/eventsmanager/notify/validationdone.class.php

@@ -27,7 +27,7 @@ class eventsmanager_notify_validationdone extends eventsmanager_notifyAbstract
      *
      * @return notify_validationdone
      */
-    function __construct(appbox &$appbox, \Alchemy\Phrasea\Core $core, eventsmanager_broker &$broker)
+    public function __construct(appbox &$appbox, \Alchemy\Phrasea\Core $core, eventsmanager_broker &$broker)
     {
         $this->group = _('Validation');
         parent::__construct($appbox, $core, $broker);
@@ -179,7 +179,7 @@ class eventsmanager_notify_validationdone extends eventsmanager_notifyAbstract
      * @param  int     $ssel_id
      * @return boolean
      */
-    function mail($to, $from, $ssel_id, $url)
+    public function mail($to, $from, $ssel_id, $url)
     {
         try {
             $em = $this->core->getEntityManager();
@@ -207,7 +207,7 @@ class eventsmanager_notify_validationdone extends eventsmanager_notifyAbstract
      *
      * @return boolean
      */
-    function is_available()
+    public function is_available()
     {
         $bool = false;
 

lib/classes/eventsmanager/notify/validationreminder.class.php

@@ -27,7 +27,7 @@ class eventsmanager_notify_validationreminder extends eventsmanager_notifyAbstra
      *
      * @return notify_validationreminder
      */
-    function __construct(appbox &$appbox, \Alchemy\Phrasea\Core $core, eventsmanager_broker &$broker)
+    public function __construct(appbox &$appbox, \Alchemy\Phrasea\Core $core, eventsmanager_broker &$broker)
     {
         $this->group = _('Validation');
         parent::__construct($appbox, $core, $broker);
@@ -193,7 +193,7 @@ class eventsmanager_notify_validationreminder extends eventsmanager_notifyAbstra
      * @param  string  $url
      * @return boolean
      */
-    function mail($to, $from, $url)
+    public function mail($to, $from, $url)
     {
         $subject = _('push::mail:: Rappel de demande de validation de documents');
 
@@ -224,7 +224,7 @@ class eventsmanager_notify_validationreminder extends eventsmanager_notifyAbstra
      *
      * @return string
      */
-    function is_available()
+    public function is_available()
     {
         return true;
     }

lib/classes/eventsmanager/notifyAbstract.class.php

@@ -4,24 +4,24 @@ abstract class eventsmanager_notifyAbstract extends eventsmanager_eventAbstract
 {
     protected $events = array('__EVENT__');
 
-    function fire($event, $params, &$object)
+    public function fire($event, $params, &$object)
     {
 
     }
 
-    abstract function datas($datas, $unread);
+    abstract public function datas($datas, $unread);
 
-    function is_available()
+    public function is_available()
     {
         return true;
     }
 
-    function email()
+    public function email()
     {
         return true;
     }
 
-    abstract function icon_url();
+    abstract public function icon_url();
 
     protected function get_prefs($class, $usr_id)
     {

lib/classes/format.class.php

@@ -3,7 +3,7 @@
 class format
 {
 
-    static public function arr_to_csv_line($arr, $tri_column = false)
+    public static function arr_to_csv_line($arr, $tri_column = false)
     {
         $line = array();
         $tmp = array();
@@ -17,8 +17,7 @@ class format
                 if (array_key_exists($key, $tri_column)) {
                     $tmp[$key] = $v;
                 }
-            }
+            } else
-            else
                 $line[] = '"' . str_replace('"', '""', strip_tags($v)) . '"';
         }
         if ($tri_column) {
@@ -35,12 +34,11 @@ class format
             return implode(",", $line);
         } elseif (count($arr) == count($line)) {
             return implode(",", $line);
-        }
+        } else
-        else
             throw new Exception('CSV failed');
     }
 
-    static public function arr_to_csv($arr, $tri_column = false)
+    public static function arr_to_csv($arr, $tri_column = false)
     {
         $lines = array();
 

lib/classes/gatekeeper.class.php

@@ -58,7 +58,7 @@ class gatekeeper
      *
      * @return gatekeeper
      */
-    function __construct(\Alchemy\Phrasea\Core $Core)
+    public function __construct(\Alchemy\Phrasea\Core $Core)
     {
         $this->Core = $Core;
 
@@ -71,7 +71,7 @@ class gatekeeper
      *
      * @return Void
      */
-    function check_directory()
+    public function check_directory()
     {
         $request = \Symfony\Component\HttpFoundation\Request::createFromGlobals();
         $appbox = appbox::get_instance($this->Core);

lib/classes/http/request.class.php

@@ -75,7 +75,7 @@ class http_request
      *
      * @return http_request
      */
-    function __construct()
+    public function __construct()
     {
         return $this;
     }

lib/classes/lazaret.class.php

@@ -23,7 +23,7 @@ class lazaret extends set_abstract
      *
      * @return lazaret
      */
-    function __construct()
+    public function __construct()
     {
         $appbox = appbox::get_instance(\bootstrap::getCore());
         $session = $appbox->get_session();

lib/classes/lazaretFile.class.php

@@ -18,7 +18,7 @@ class lazaretFile
      * @param  int         $lazaret_id
      * @return lazaretFile
      */
-    function __construct($lazaret_id)
+    public function __construct($lazaret_id)
     {
         $conn = connection::getPDOConnection();
 

lib/classes/logs.class.php

@@ -2,9 +2,9 @@
 
 class logs
 {
-    static $_last_check = array();
+    public static $_last_check = array();
 
-    static function rotate($filepath)
+    public static function rotate($filepath)
     {
         $limit = (1024 * 1024 * 20);