Merge branches 'develop' and 'master' of https://git.unicaen.fr/lib/unicaen/app

src/UnicaenApp/Form/View/Helper/FormControlGroup.php

@@ -74,6 +74,8 @@ class FormControlGroup extends AbstractHelper
             return $this;
         }
 
+        $this->helpContent = ['before' => '', 'after' => ''];
+
         return $this->render($element, $pluginClass);
     }
 

src/UnicaenApp/Mapper/Ldap/AbstractMapper.php

@@ -116,7 +116,7 @@ abstract class AbstractMapper
         if (!$attributes) {
             $attributes = $this->getAttributes() ?: ['*'];
         }
-        $entries = $this->getLdap()->searchEntries($filter, $baseDn, $scope, $attributes, $sort);
+        $entries = @$this->getLdap()->searchEntries($filter, $baseDn, $scope, $attributes, $sort);
         if (count($entries) > 1) {
             throw new RuntimeException("Plus d'une entrée trouvée avec ce filtre: " . $filter);
         }