Enhance CommonDBTM::getFromDBByCrit() warning trace (#9538)

* Enhance CommonDBTM::getFromDBByCrit() warning trace * Fix test
glpi-project · Sep 14, 2021 · 03a3687 · 03a3687
1 parent 7c4fe46
commit 03a3687
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 6 deletions.
diff --git a/inc/commondbtm.class.php b/inc/commondbtm.class.php
@@ -345,11 +345,13 @@ public function getFromDBByCrit(array $crit) {
          $row = $iter->next();
          return $this->getFromDB($row['id']);
       } else if (count($iter) > 1) {
-         Toolbox::logWarning(
+         trigger_error(
             sprintf(
-               'getFromDBByCrit expects to get one result, %1$s found!',
-               count($iter)
-            )
+               'getFromDBByCrit expects to get one result, %1$s found in query "%2$s".',
+               count($iter),
+               $iter->getSql()
+            ),
+            E_USER_WARNING
          );
       }
       return false;

diff --git a/tests/functionnal/Computer.php b/tests/functionnal/Computer.php
@@ -350,11 +350,14 @@ public function testGetFromDbByCrit() {
       $this->boolean($comp->getFromDBByCrit(['name' => '_test_pc01']))->isTrue();
       $this->string($comp->getField('name'))->isIdenticalTo('_test_pc01');
 
-      $this->exception(
+      $this->when(
          function () use ($comp) {
             $this->boolean($comp->getFromDBByCrit(['name' => ['LIKE', '_test%']]))->isFalse();
          }
-      )->message->contains('getFromDBByCrit expects to get one result, 8 found!');
+      )->error()
+         ->withType(E_USER_WARNING)
+         ->withMessage('getFromDBByCrit expects to get one result, 8 found in query "SELECT `id` FROM `glpi_computers` WHERE `name` LIKE \'_test%\'".')
+         ->exists();
    }
 
    public function testClone() {