Merge branch 'hotline#180601_mel_connecteur_cvs_acces_assimil' into 'master'

[RTko] hotline : facet dynamic find without code

See merge request !4755

VERSIONS_HOTLINE/180690

+ - correctif #180690 : Recherche avancée : Les formulaires personnalisés récupèrent maintenant correctement les libellés des facettes dynamiques

library/ZendAfi/Form/Element/SelectDynamicFacet.php

@@ -21,22 +21,22 @@
 
 
 class ZendAfi_Form_Element_SelectDynamicFacet extends Zend_Form_Element_Select {
+
   public function init() {
-    if (!$thesaurus = Class_CodifThesaurus::findFirstBy(['rules not' => null,
-                                                         'code' => $this->_getCodeThesaurus(),
-                                                         'id_thesaurus not' => null]))
+    if ( ! $thesaurus = Class_CodifThesaurus::findFirstBy(['rules not' => null,
+                                                           'id_thesaurus' => $this->_getIdThesaurus()]))
       return;
 
     $this->setMultiOptions($this->_buildThesaurusChildrenEntries($thesaurus));
   }
 
 
-  protected function _getCodeThesaurus() {
+  protected function _getIdThesaurus() : string {
     return str_replace('rech_' . Class_CodifThesaurus::CODE_FACETTE, '', $this->getName());
   }
 
 
-  protected function _buildThesaurusChildrenEntries($thesaurus) {
+  protected function _buildThesaurusChildrenEntries(Class_CodifThesaurus $thesaurus) : array {
     $options = ['' => ''];
 
     foreach (Class_CodifThesaurus::findChildrenOfWith($thesaurus->getIdThesaurus(),

tests/scenarios/AdvancedSearch/AdvancedSearchTest.php

@@ -402,7 +402,7 @@ class AdvancedSearchFormWithDateSelectorsTest extends AdvancedSearchCustomFormSe
                     'libelle' => 'Année de publication',
                     'id_thesaurus' => 'APUB',
                     'id_origine' => null,
-                    'code' => 'APUB',
+                    'code' => 'UNIMARC',
                     'rule_list_zone' => ['995'],
                     'rule_list_label_field' => ['w'],
                     'rule_list_label_start_pos' => [1],
@@ -415,7 +415,7 @@ class AdvancedSearchFormWithDateSelectorsTest extends AdvancedSearchCustomFormSe
                     'libelle' => 'Mois de publication',
                     'id_thesaurus' => 'MPUB',
                     'id_origine' => null,
-                    'code' => 'MPUB',
+                    'code' => 'UNIMARC',
                     'rule_list_zone' => ['995'],
                     'rule_list_label_field' => ['w'],
                     'rule_list_label_start_pos' => [6],
@@ -427,7 +427,7 @@ class AdvancedSearchFormWithDateSelectorsTest extends AdvancedSearchCustomFormSe
                     'libelle' => 'Jour de publication',
                     'id_thesaurus' => 'JPUB',
                     'id_origine' => null,
-                    'code' => 'JPUB',
+                    'code' => 'UNIMARC',
                     'rule_list_zone' => ['995'],
                     'rule_list_label_field' => ['w'],
                     'rule_list_label_start_pos' => [9],
@@ -439,7 +439,7 @@ class AdvancedSearchFormWithDateSelectorsTest extends AdvancedSearchCustomFormSe
                     'libelle' => '3',
                     'id_thesaurus' => 'JPUB0003',
                     'id_origine' => null,
-                    'code' => 'JPUB',
+                    'code' => 'UNIMARC',
                    ]);
 
     $this->fixture(Class_CodifThesaurus::class,
@@ -447,7 +447,7 @@ class AdvancedSearchFormWithDateSelectorsTest extends AdvancedSearchCustomFormSe
                     'libelle' => '1',
                     'id_thesaurus' => 'JPUB0001',
                     'id_origine' => null,
-                    'code' => 'JPUB',
+                    'code' => 'UNIMARC',
                    ]);