query describe failure

library/Class/TypeDoc.php

@@ -27,12 +27,6 @@ class TypeDocLoader extends Class_CosmoVar_ModelLoader  {
     $_all_instances,
     $_used_ids_cache;
 
-  public function __construct($class) {
-    parent::__construct($class);
-    $this->findAll();
-  }
-
-
   public function newInstanceWithId($id, $attributes = null) {
     $instance = $this->newInstance($attributes)
                      ->setId((string)$id);

library/digital_resources/Cvs2/Config.php

@@ -211,10 +211,13 @@ class Cvs2_Config extends Class_DigitalResource_Config {
   }
 
 
-  public function knownDoctypes() : array {
-    return Class_CodifTypeDoc::query()
+  public function knownDoctypes(): array
+  {
+    return $this->isEnabled()
+      ? Class_CodifTypeDoc::query()
       ->start('type_doc_id', $this->_name)
-      ->fetchAll();
+      ->fetchAll()
+      : [];
   }
 
 

tests/application/modules/opac/controllers/BlogControllerTest.php

@@ -111,7 +111,6 @@ class BlogControllerHierarchicalTest extends AbstractControllerTestCase {
     $this->assertSqlEquals(["SELECT `codif_thesaurus`.* FROM `codif_thesaurus` WHERE (`codif_thesaurus`.`code` = 'Catalogue' AND `codif_thesaurus`.`id_thesaurus` LIKE 'CCCC0001%') ORDER BY `codif_thesaurus`.`id_thesaurus` DESC LIMIT 1",
                             "SELECT `codif_thesaurus`.* FROM `codif_thesaurus` WHERE (`codif_thesaurus`.`code` = 'Catalogue' AND `codif_thesaurus`.`id_thesaurus` LIKE 'CCCC00010001%') ORDER BY `codif_thesaurus`.`id_thesaurus` DESC LIMIT 1",
                             "SELECT `codif_thesaurus`.* FROM `codif_thesaurus` WHERE (`codif_thesaurus`.`code` = 'Catalogue' AND `codif_thesaurus`.`id_thesaurus` LIKE 'CCCC00010002%') ORDER BY `codif_thesaurus`.`id_thesaurus` DESC LIMIT 1",
-                            "SELECT `codif_type_doc`.* FROM `codif_type_doc` WHERE (`codif_type_doc`.`type_doc_id` LIKE 'Cvs2%')",
                             "SELECT `avis_notices`.`id` FROM `notices_avis` AS `avis_notices` INNER JOIN `notices` ON `avis_notices`.`clef_oeuvre` = `notices`.`clef_oeuvre` AND MATCH(`notices`.`titres`, `notices`.`auteurs`, `notices`.`editeur`, `notices`.`collection`, `notices`.`matieres`, `notices`.`dewey`, `notices`.`other_terms`, `notices`.`facets`) AGAINST('+F_Zjeuxvideo' IN BOOLEAN MODE) AND `notices`.`type` = 1 WHERE (`avis_notices`.`flags` = 0) ORDER BY `avis_notices`.`date_avis` DESC LIMIT 2",
                             "SELECT `notices_avis`.* FROM `notices_avis` WHERE (`notices_avis`.`id` IN (2, 1)) ORDER BY `notices_avis`.`date_avis` DESC"]);
   }

tests/library/Class/CatalogueTest.php

@@ -293,7 +293,7 @@ class CatalogueGetSelectionFacetteTest extends CatalogueTestCase {
     $this->_fetchRequestsBy(['id_catalogue' => $domain->getId()]);
     $expected_request
       ? $this->assertSql($expected_request)
-      : $this->assertSqlEquals(["SELECT `codif_type_doc`.* FROM `codif_type_doc` WHERE (`codif_type_doc`.`type_doc_id` LIKE 'Cvs2%')"]);
+      : $this->assertSqlEmpty();
   }
 
 
@@ -364,8 +364,7 @@ class CatalogueGetRequetesWithFacettesAndNoCatalogueTest extends CatalogueTestCa
     $this->_fetchRequestsBy($params, 'req_ids');
     $this->_fetchRequestsBy($params, 'req_facettes');
 
-    $this->assertSqlEquals(["SELECT `codif_type_doc`.* FROM `codif_type_doc` WHERE (`codif_type_doc`.`type_doc_id` LIKE 'Cvs2%')",
-                            "SELECT `notices`.* FROM `notices` WHERE ((`notices`.`url_vignette` > '' AND `notices`.`url_vignette` != 'NO') AND `notices`.`type` = 1) LIMIT 50",
+    $this->assertSqlEquals(["SELECT `notices`.* FROM `notices` WHERE ((`notices`.`url_vignette` > '' AND `notices`.`url_vignette` != 'NO') AND `notices`.`type` = 1) LIMIT 50",
                             "SELECT COUNT(*) AS `numberof` FROM `notices` WHERE ((`notices`.`url_vignette` > '' AND `notices`.`url_vignette` != 'NO') AND `notices`.`type` = 1)",
                             "SELECT `notices`.`id_notice` FROM `notices` WHERE ((`notices`.`url_vignette` > '' AND `notices`.`url_vignette` != 'NO') AND `notices`.`type` = 1) LIMIT 50",
                             "SELECT `notices`.`id_notice`, `notices`.`type_doc`, `notices`.`facettes` FROM `notices` WHERE ((`notices`.`url_vignette` > '' AND `notices`.`url_vignette` != 'NO') AND `notices`.`type` = 1) LIMIT 50"]);

tests/scenarios/AlbumAudioRecord/AlbumAudioRecordTest.php

@@ -21,11 +21,12 @@
 
 
 abstract class AlbumAudioRecordTestCase extends AbstractControllerTestCase {
+
+  protected bool $_storm_mock_zend_adapter = true;
   protected
     $_notice,
     $_tracks;
 
-
   public function setUp() {
     parent::setUp();
 
@@ -109,6 +110,7 @@ abstract class AlbumAudioRecordTestCase extends AbstractControllerTestCase {
 
 
 class AlbumAudioRecordViewNoticeTest extends AlbumAudioRecordTestCase {
+
   public function setUp() {
     parent::setUp();
 
@@ -168,8 +170,7 @@ class AlbumAudioRecordViewNoticeTest extends AlbumAudioRecordTestCase {
   /** @test */
   public function titrePrincipalShouldBeSeventhSonOfASeventhSon() {
     $this->assertXPathContentContains('//h1',
-                                      'Seventh Son of a Seventh Son',
-                                      $this->_response->getBody());
+                                      'Seventh Son of a Seventh Son');
   }
 
 
@@ -257,8 +258,10 @@ class AlbumAudioRecordViewNoticeTest extends AlbumAudioRecordTestCase {
 
 
 class AlbumAudioRecordViewMorceauxTest extends AlbumAudioRecordTestCase {
+
   public function setUp() {
     parent::setUp();
+
     $this->dispatch('/opac/noticeajax/morceaux/id_notice/' . $this->_notice->getId());
   }
 
@@ -294,34 +297,39 @@ class AlbumAudioRecordViewMorceauxTest extends AlbumAudioRecordTestCase {
 
 
 class AlbumAudioRecordViewDetailsTest extends AlbumAudioRecordTestCase {
+
   public function setUp() {
     parent::setUp();
+
     Class_AdminVar::set('AUTHOR_PAGE', 0);
-    $this->dispatch('/opac/noticeajax/detail/id_notice/'.$this->_notice->getId(), true);
+
+    $this->dispatch('/opac/noticeajax/detail/id_notice/' . $this->_notice->getId());
   }
 
+
   /** @test */
   public function titresShouldContainsMoonchild() {
     $this->assertXPathContentContains('//dd[@class="first"]//div', 'Moonchild');
   }
 
+
   /** @test */
   public function titresShouldContainsIronMaidenAsCodeRebond() {
     $this->assertXPathContentContains('//dd//a[contains(@href, "code_rebond/A1")]',
                                       'Iron Maiden');
   }
 
+
   /** @test */
   public function noUrlShouldBePresent() {
-    $this->assertNotXPath('//dt[contains(@class, "internet")]', $this->_response->getBody());
+    $this->assertNotXPath('//dt[contains(@class, "internet")]');
   }
 
 
   /** @test */
   public function distributorShouldBeGeffenRecords() {
     $this->assertXPathContentContains('//dl//dd',
-                                      'Geffen Records',
-                                      $this->_response->getBody());
+                                      'Geffen Records');
   }
 
 
@@ -334,8 +342,7 @@ class AlbumAudioRecordViewDetailsTest extends AlbumAudioRecordTestCase {
   /** @test */
   public function aDDForAuthorsShouldContainsBruceDickinsonAsChanteur() {
     $this->assertXPathContentContains('//dl//dd//a',
-                                      'Bruce Dickinson (Chanteur)',
-                                      $this->_response->getBody());
+                                      'Bruce Dickinson (Chanteur)');
   }
 }
 
@@ -345,7 +352,7 @@ class AlbumAudioRecordViewDetailsTest extends AlbumAudioRecordTestCase {
 class AlbumAudioRecordViewRessourcesNumeriquesTest extends AlbumAudioRecordTestCase {
   public function setUp() {
     parent::setUp();
-    $this->dispatch('/opac/noticeajax/resnumeriques/id_notice/'.$this->_notice->getId(), true);
+    $this->dispatch('/opac/noticeajax/resnumeriques/id_notice/'.$this->_notice->getId());
   }
 
 
@@ -369,7 +376,7 @@ class AlbumAudioRecordViewRessourcesNumeriquesTest extends AlbumAudioRecordTestC
 
   /** @test */
   public function moonchildTrackShouldBePresent() {
-    $this->assertXPath('//ol//li//a[contains(@data-src, "/bib-numerique/play-ressource/id/1.mp3")]', $this->_response->getBody());
+    $this->assertXPath('//ol//li//a[contains(@data-src, "/bib-numerique/play-ressource/id/1.mp3")]');
   }
 
 
@@ -411,13 +418,13 @@ class AlbumAudioRecordViewRessourceInTelephoneModeTest extends AlbumAudioRecordT
   public function setup() {
     parent::setup();
     Class_Profil::getCurrentProfil()->beTelephone();
-    $this->dispatch('/opac/recherche/viewnotice/id/1', true);
+    $this->dispatch('/opac/recherche/viewnotice/id/1');
   }
 
 
   /** @test */
   public function pageShouldContainsLinkToOpenRessourcesNumeriques() {
-    $this->assertXPathContentContains('//a[contains(@href,"recherche/ressourcesnumeriques/id/1")]', 'Accéder à l\'album',$this->_response->getBody());
+    $this->assertXPathContentContains('//a[contains(@href,"recherche/ressourcesnumeriques/id/1")]', 'Accéder à l\'album');
   }
 }
 
@@ -427,13 +434,13 @@ class AlbumAudioRecordAsTelephoneViewRessourcesNumeriquesTest extends AlbumAudio
   public function setUp() {
     parent::setUp();
     Class_Profil::getCurrentProfil()->beTelephone();
-    $this->dispatch('/recherche/ressourcesnumeriques/id/1', true);
+    $this->dispatch('/recherche/ressourcesnumeriques/id/1');
   }
 
 
   /** @test */
   public function moonchildPlayerShouldBePresent() {
-    $this->assertXPath('//ol//li//a[contains(@data-src, "/bib-numerique/play-ressource/id/1.mp3")]', $this->_response->getBody());
+    $this->assertXPath('//ol//li//a[contains(@data-src, "/bib-numerique/play-ressource/id/1.mp3")]');
   }
 
 
@@ -467,5 +474,3 @@ class AlbumAudioRecordNotVisibleTest extends AlbumAudioRecordTestCase {
     $this->assertEmpty(Class_Notice::findAll());
   }
 }
-
-?>

tests/scenarios/ArticlesMultipleTimings/ArticlesMultipleTimingsAdminTest.php

@@ -22,8 +22,11 @@
 
 class ArticlesMultipleTimingsAdminVarTest extends Admin_AbstractControllerTestCase {
 
+  protected bool $_storm_mock_zend_adapter = true;
+
   public function setUp() {
     parent::setUp();
+
     $this->dispatch('/admin/index/adminvar');
   }
 
@@ -41,8 +44,11 @@ class ArticlesMultipleTimingsAdminVarTest extends Admin_AbstractControllerTestCa
 class ArticlesMultipleTimingsAdminActivationCmsControllerTest
   extends Admin_AbstractControllerTestCase {
 
+  protected bool $_storm_mock_zend_adapter = true;
+
   public function setUp() {
     parent::setUp();
+
     $this->fixture(Class_Article::class,
                    ['id' => 2,
                     'titre' => 'Heure du conte',
@@ -73,8 +79,11 @@ class ArticlesMultipleTimingsAdminActivationCmsControllerTest
 
 abstract class ArticlesMultipleTimingsAdminTestCase extends Admin_AbstractControllerTestCase {
 
+  protected bool $_storm_mock_zend_adapter = true;
+
   public function setUp() {
     parent::setUp();
+
     $this->fixture(Class_Article::class,
                    ['id' => 2,
                     'titre' => 'Heure du conte',
@@ -102,6 +111,7 @@ class ArticlesMultipleTimingsAdminCmsControllerEventTimingIndexArticleNotFoundTe
 
   public function setUp() {
     parent::setUp();
+
     $this->dispatch('/admin/cms/event-timings/article_id/666');
   }
 
@@ -120,6 +130,7 @@ class ArticlesMultipleTimingsAdminCmsControllerEventTimingIndexTest
 
   public function setUp() {
     parent::setUp();
+
     $this->dispatch('/admin/cms/event-timings/article_id/2');
   }
 
@@ -190,6 +201,7 @@ class ArticlesMultipleTimingsAdminDeleteTest extends ArticlesMultipleTimingsAdmi
 
   public function setUp() {
     parent::setUp();
+
     $this->dispatch('/admin/cms/event-timing-delete/id/1');
   }
 
@@ -220,6 +232,7 @@ class ArticlesMultipleTimingsAdminCmsDeleteArticleTest
 
   public function setUp() {
     parent::setUp();
+
     $this->dispatch('/admin/cms/force-delete/id/2');
   }
 
@@ -230,7 +243,7 @@ class ArticlesMultipleTimingsAdminCmsDeleteArticleTest
   }
 
 
-    /** @test */
+  /** @test */
   public function articleTwoShouldBeDeleted() {
     $this->assertEmpty(Class_Article::find(2));
   }
@@ -244,6 +257,7 @@ class ArticlesMultipleTimingsAdminEditTest extends ArticlesMultipleTimingsAdminT
 
   public function setUp() {
     parent::setUp();
+
     $this->dispatch('/admin/cms/event-timing-edit/id/1');
   }
 
@@ -268,7 +282,7 @@ class ArticlesMultipleTimingsAdminEditTest extends ArticlesMultipleTimingsAdminT
 
   /** @test */
   public function editFormShouldContainsActionToEventTimingEdit() {
-    $this->assertXPath('//form[contains(@action,"event-timing-edit")]',$this->_response->getBody());
+    $this->assertXPath('//form[contains(@action,"event-timing-edit")]');
   }
 }
 
@@ -280,6 +294,7 @@ class ArticlesMultipleTimingsAdminEditWithWrongIdTest
 
   public function setUp() {
     parent::setup();
+
     $this->dispatch('/admin/cms/event-timing-edit/id/42');
   }
 
@@ -299,6 +314,7 @@ class ArticlesMultipleTimingsAdminEditWithParamsTest extends ArticlesMultipleTim
 
   public function setUp() {
     parent::setup();
+
     $this->postDispatch('/admin/cms/event-timing-edit/id/1',
                         ['start' => '07/07/2021 11:00',
                          'end' => '07/07/2021 12:00']);
@@ -345,6 +361,7 @@ class ArticlesMultipleTimingsAdminAddDispatchTest
 
   public function setUp() {
     parent::setup();
+
     $this->dispatch('/admin/cms/event-timing-add/article_id/2');
   }
 
@@ -378,9 +395,11 @@ class ArticlesMultipleTimingsAdminAddPostDispatchTest
 
   public function setUp() {
     parent::setup();
+
     $this->postDispatch('/admin/cms/event-timing-add/article_id/2',
                         ['start' => '21/07/2021 10:00',
                          'end' => '21/07/2021 11:00']);
+
     $this->_event_time = Class_Article_EventTiming::find(3);
   }
 
@@ -424,6 +443,7 @@ class ArticlesMultipleTimingsAdminAddPostDispatchWithEndBeforeStartTest
 
   public function setUp() {
     parent::setup();
+
     $this->postDispatch('/admin/cms/event-timing-add/article_id/2',
                         ['start' => '22/07/2021 10:00',
                          'end' => '21/07/2021 11:00']);
@@ -432,7 +452,7 @@ class ArticlesMultipleTimingsAdminAddPostDispatchWithEndBeforeStartTest
 
   /** @test */
   public function contextShouldExpectation() {
-    $this->assertXPathContentContains('//ul[@class="errors"]/li','La date de début doit être antérieure à la date de fin',$this->_response->getBody());
+    $this->assertXPathContentContains('//ul[@class="errors"]/li','La date de début doit être antérieure à la date de fin');
   }
 }
 
@@ -444,6 +464,7 @@ class ArticlesMultipleTimingsAdminAddPostDispatchWithSingleDateTest
 
   public function setUp() {
     parent::setup();
+
     $this->postDispatch('/admin/cms/event-timing-add/article_id/2',
                         ['start' => '22/07/2021 10:00']);
   }
@@ -463,6 +484,7 @@ class ArticlesEventTimingAddPostDispatchWithWrongFormatDateTest
 
   public function setUp() {
     parent::setup();
+
     $this->postDispatch('/admin/cms/event-timing-add/article_id/2',
                         ['start' => 'test']);
   }
@@ -482,6 +504,7 @@ class ArticlesMultipleTimingsAdminCmsEditEventTimingAsRedacteurTest
 
   public function setUp() {
     parent::setUp();
+
     $this->fixture(Class_Bib::class,
                    ['id' => 1,
                     'libelle' => 'Spirou' ]);
@@ -512,9 +535,9 @@ class ArticlesMultipleTimingsAdminCmsEditEventTimingAsRedacteurTest
                                  'id_site' => 1]);
 
     $this->fixture(Class_Permission::class,
-                     ['id' => 666,
-                      'code' => 'ARTICLE',
-                      'module' => 'ARTICLE']);
+                   ['id' => 666,
+                    'code' => 'ARTICLE',
+                    'module' => 'ARTICLE']);
 
     Class_Permission::createArticle()->permitTo($redacteur_group, $article_categorie);
     ZendAfi_Auth::getInstance()->logUser($redacteur);

tests/scenarios/DynamicFacetOnDomains/DynamicFacetOnDomainsPhaseTest.php

@@ -176,8 +176,6 @@ class DynamicFacetOnDomainsPhaseEnabledTest extends DynamicFacetOnDomainsPhaseTe
 
                             "SELECT `codif_matiere`.* FROM `codif_matiere` WHERE (`codif_matiere`.`libelle` LIKE 'Animaux de la ferme : %')",
 
-                            "SELECT `codif_type_doc`.* FROM `codif_type_doc` WHERE (`codif_type_doc`.`type_doc_id` LIKE 'Cvs2%')",
-
                             "UPDATE `notices` SET `facettes` = CONCAT(`facettes`, ' HANIM0001'), `facets` = CONCAT(`facets`, ' F_HANIM0001') WHERE (MATCH(`notices`.`titres`, `notices`.`auteurs`, `notices`.`editeur`, `notices`.`collection`, `notices`.`matieres`, `notices`.`dewey`, `notices`.`other_terms`, `notices`.`facets`) AGAINST('+F_M1' IN BOOLEAN MODE) AND `notices`.`type` = 1)",
 
                             "SELECT `codif_matiere`.* FROM `codif_matiere` WHERE (`codif_matiere`.`libelle` LIKE 'Animaux de compagnie : %')",

tests/scenarios/Templates/MyBibAppTemplateTest.php

@@ -567,8 +567,7 @@ class MyBibAppTemplateNoveltyDomainTest extends MyBibAppTemplateTestCase {
     Class_Catalogue::getRequetes(['id_catalogue' => $domain->getId()])['req_liste']()
       ->fetchAll();
 
-    $this->assertSqlEquals(["SELECT `codif_type_doc`.* FROM `codif_type_doc` WHERE (`codif_type_doc`.`type_doc_id` LIKE 'Cvs2%')",
-                            "SELECT DISTINCT `notices`.`type_doc` FROM `notices`",
+    $this->assertSqlEquals(["SELECT DISTINCT `notices`.`type_doc` FROM `notices`",
                             "SELECT `notices`.* FROM `notices` WHERE (`notices`.`date_creation` >= '2023-04-24' AND `notices`.`type` = 1) ORDER BY `notices`.`alpha_titre` ASC LIMIT 5000"]);
   }