Merge branch '5.31' into master

[civicrm-core.git] / tests / phpunit / api / v4 / Entity / ConformanceTest.php

diff --git a/tests/phpunit/api/v4/Entity/ConformanceTest.php b/tests/phpunit/api/v4/Entity/ConformanceTest.php
index 91ec3a3df0e44fd03e86f21346ac03d4d49725db..957ed485d7568c601482938abbe6909e3db3ef63 100644 (file)
--- a/tests/phpunit/api/v4/Entity/ConformanceTest.php
+++ b/tests/phpunit/api/v4/Entity/ConformanceTest.php
@@ -20,7 +20,6 @@
 namespace api\v4\Entity;
 
 use Civi\Api4\Entity;
-use api\v4\Traits\TableDropperTrait;
 use api\v4\UnitTestCase;
 
 /**
@@ -28,7 +27,7 @@ use api\v4\UnitTestCase;
  */
 class ConformanceTest extends UnitTestCase {
 
-  use TableDropperTrait;
+  use \api\v4\Traits\TableDropperTrait;
   use \api\v4\Traits\OptionCleanupTrait {
     setUp as setUpOptionCleanup;
   }
@@ -121,8 +120,7 @@ class ConformanceTest extends UnitTestCase {
 
     // Go no further if it's not a CRUD entity
     if (array_diff(['get', 'create', 'update', 'delete'], array_keys($actions))) {
-      $this->markTestSkipped("The entity \"$entity\" does not ");
-      return;
+      $this->markTestSkipped("The API \"$entity\" does not implement CRUD actions");
     }
 
     $this->checkFields($entityClass, $entity);
@@ -165,7 +163,7 @@ class ConformanceTest extends UnitTestCase {
   }
 
   /**
-   * @param string $entityClass
+   * @param \Civi\Api4\Generic\AbstractEntity|string $entityClass
    *
    * @return array
    */