Merge branch '3.8'

Conflicts:
	lib/Alchemy/Phrasea/Controller/Prod/Lazaret.php
	lib/classes/API/OAuth2/Adapter.php
	lib/classes/API/V1/adapter.php
	lib/classes/Feed/Adapter.php
	lib/classes/Feed/Collection.php
	lib/classes/Feed/Entry/Adapter.php
	lib/classes/Feed/Entry/Item.php
	lib/classes/Feed/Publisher/Adapter.php
	lib/classes/User/Adapter.php
	lib/classes/base.php
	lib/classes/connection.php
	lib/classes/databox/cgu.php
	lib/classes/eventsmanager/notify/autoregister.php
	lib/classes/eventsmanager/notify/bridgeuploadfail.php
	lib/classes/eventsmanager/notify/order.php
	lib/classes/eventsmanager/notify/orderdeliver.php
	lib/classes/eventsmanager/notify/ordernotdelivered.php
	lib/classes/eventsmanager/notify/push.php
	lib/classes/eventsmanager/notify/register.php
	lib/classes/eventsmanager/notify/validate.php
	lib/classes/eventsmanager/notify/validationdone.php
	lib/classes/eventsmanager/notify/validationreminder.php
	lib/classes/module/console/taskState.php
	lib/classes/module/console/taskrun.php
	lib/classes/record/adapter.php
	lib/classes/registry.php
	lib/classes/set/order.php
	lib/classes/task/abstract.php
	lib/classes/task/appboxAbstract.php
	lib/classes/task/databoxAbstract.php
	lib/classes/task/manager.php
	lib/classes/task/period/RecordMover.php
	lib/classes/task/period/apibridge.php
	lib/classes/task/period/archive.php
	lib/classes/task/period/ftp.php
	lib/classes/task/period/ftpPull.php
	templates/web/prod/upload/lazaret.html.twig

lib/Alchemy/Phrasea/Application.php

@@ -631,6 +631,8 @@ class Application extends SilexApplication
                 $twig->addFilter('stripdoublequotes', new \Twig_Filter_Function('stripdoublequotes'));
                 $twig->addFilter('get_collection_logo', new \Twig_Filter_Function('collection::getLogo'));
                 $twig->addFilter('floor', new \Twig_Filter_Function('floor'));
+                $twig->addFilter('ceil', new \Twig_Filter_Function('ceil'));
+                $twig->addFilter('max', new \Twig_Filter_Function('max'));
                 $twig->addFilter('min', new \Twig_Filter_Function('min'));
                 $twig->addFilter('bas_labels', new \Twig_Filter_Function('phrasea::bas_labels'));
                 $twig->addFilter('sbas_names', new \Twig_Filter_Function('phrasea::sbas_names'));

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

@@ -83,18 +83,20 @@ class Lazaret implements ControllerProviderInterface
         $baseIds = array_keys($app['acl']->get($app['authentication']->getUser())->get_granted_base(['canaddrecord']));
 
         $lazaretFiles = null;
+        $perPage = 10;
+        $page = max(1, $request->query->get('page', 1));
+        $offset = ($page - 1) * $perPage;
 
         if (count($baseIds) > 0) {
             $lazaretRepository = $app['EM']->getRepository('Phraseanet:LazaretFile');
-
-            $lazaretFiles = $lazaretRepository->findPerPage(
-                $baseIds, $request->query->get('offset', 0), $request->query->get('limit', 10)
-            );
+            $lazaretFiles = $lazaretRepository->findPerPage($baseIds, $offset, $perPage);
         }
 
-        return $app['twig']->render(
-            'prod/upload/lazaret.html.twig', ['lazaretFiles' => $lazaretFiles]
-        );
+        return $app['twig']->render('prod/upload/lazaret.html.twig', array(
+            'lazaretFiles' => $lazaretFiles,
+            'currentPage'  => $page,
+            'perPage'      => $perPage,
+        ));
     }
 
     /**

lib/Alchemy/Phrasea/Model/Entities/Basket.php

@@ -493,7 +493,7 @@ class Basket
                 $totSize += $basket_element->getRecord($app)
                     ->get_subdef('document')
                     ->get_size();
-            } catch (Exception $e) {
+            } catch (\Exception $e) {
 
             }
         }

lib/Alchemy/Phrasea/Model/Repositories/LazaretFileRepository.php

@@ -12,6 +12,7 @@
 namespace Alchemy\Phrasea\Model\Repositories;
 
 use Doctrine\ORM\EntityRepository;
+use Doctrine\ORM\Tools\Pagination\Paginator;
 
 /**
  * LazaretFileRepository
@@ -21,12 +22,11 @@ use Doctrine\ORM\EntityRepository;
  */
 class LazaretFileRepository extends EntityRepository
 {
-
     public function findPerPage(array $base_ids, $offset = 0, $perPage = 10)
     {
         $base_ids = implode(', ', array_map(function ($int) {
-                    return (int) $int;
-                }, $base_ids));
+            return (int) $int;
+        }, $base_ids));
 
         $dql = '
             SELECT f
@@ -38,8 +38,6 @@ class LazaretFileRepository extends EntityRepository
         $query->setFirstResult($offset)
             ->setMaxResults($perPage);
 
-        $paginator = new \Doctrine\ORM\Tools\Pagination\Paginator($query, true);
-
-        return $paginator;
+        return new Paginator($query, true);
     }
 }