Rely on feature

diff --git a/galette/lib/Galette/Entity/Adherent.php b/galette/lib/Galette/Entity/Adherent.php
index cf6361db9d0a9917220799c31a554444b920a0d4..916c59cc305b2d584c556616ff6cdb81c12138ab 100644 (file)
--- a/galette/lib/Galette/Entity/Adherent.php
+++ b/galette/lib/Galette/Entity/Adherent.php
@@ -191,15 +191,6 @@ class Adherent
     private $_row_classes;
 
     private $_self_adh = false;
-    protected array $_deps = array(
-        'picture'   => true,
-        'groups'    => true,
-        'dues'      => true,
-        'parent'    => false,
-        'children'  => false,
-        'dynamics'  => false,
-        'socials'   => false
-    );
 
     private $zdb;
     private $preferences;
@@ -234,16 +225,10 @@ class Adherent
 
         if ($deps !== null) {
             if (is_array($deps)) {
-                $this->_deps = array_merge(
-                    $this->_deps,
-                    $deps
-                );
+                $this->setDeps($deps);
             } elseif ($deps === false) {
                 //no dependencies
-                $this->_deps = array_fill_keys(
-                    array_keys($this->_deps),
-                    false
-                );
+                $this->disableAllDeps();
             } else {
                 Analog::log(
                     '$deps should be an array, ' . gettype($deps) . ' given!',

diff --git a/galette/lib/Galette/Features/Dependencies.php b/galette/lib/Galette/Features/Dependencies.php
index b24a96e15a004296a452c45482f8afba40bfba7c..ec91bcb02ac1ebacd97230b573cf61b160be6d89 100644 (file)
--- a/galette/lib/Galette/Features/Dependencies.php
+++ b/galette/lib/Galette/Features/Dependencies.php
@@ -77,6 +77,22 @@ trait Dependencies
         'socials'   => false
     );
 
+    /**
+     * Set dependencies
+     *
+     * @param array $deps Dependencies to set
+     *
+     * @return $this
+     */
+    public function setDeps(array $deps): self
+    {
+        $this->_deps = array_merge(
+            $this->_deps,
+            $deps
+        );
+        return $this;
+    }
+
     /**
      * Reset dependencies to load
      *
@@ -84,9 +100,10 @@ trait Dependencies
      */
     public function disableAllDeps(): self
     {
-        foreach ($this->_deps as &$dep) {
-            $dep = false;
-        }
+        $this->_deps = array_fill_keys(
+            array_keys($this->_deps),
+            false
+        );
         return $this;
     }