PHPUnit 10 - Various fixes for "E2E" suite

CRM/Core/ClassLoader.php

@@ -65,7 +65,7 @@ protected function __construct() {
       'CiviTestSuite',
       'CiviUnitTestCase',
       'CiviEndToEndTestCase',
-      'CiviSimpleCacheTest',
+      'CiviSimpleCacheTestCase',
       'Contact',
       'ContributionPage',
       'Custom',

tests/phpunit/CiviTest/CiviSimpleCacheTest.php → tests/phpunit/CiviTest/CiviSimpleCacheTestCase.php

@@ -32,20 +32,20 @@
 
 use PHPUnit\Framework\TestCase;
 
-abstract class CiviSimpleCacheTest extends TestCase {
+abstract class CiviSimpleCacheTestCase extends TestCase {
   /**
    * @var array
    * with functionName => reason.
    */
   protected $skippedTests = [];
 
   /**
-   * @var CiviSimpleCacheTest
+   * @var CiviSimpleCacheTestCase
    */
   protected $cache;
 
   /**
-   * @return CiviSimpleCacheTest that is used in the tests
+   * @return CiviSimpleCacheTestCase that is used in the tests
    */
   abstract public function createSimpleCache();
 

tests/phpunit/E2E/Api4/LocaleTest.php

@@ -12,7 +12,7 @@
  */
 class LocaleTest extends \CiviEndToEndTestCase {
 
-  public function getLanguageExamples(): array {
+  public static function getLanguageExamples(): array {
     $results = [];
     switch (CIVICRM_UF) {
       case 'Backdrop':

tests/phpunit/E2E/Cache/CacheTestCase.php

@@ -14,7 +14,7 @@
  *
  * @group e2e
  */
-abstract class E2E_Cache_CacheTestCase extends CiviSimpleCacheTest implements \Civi\Test\EndToEndInterface {
+abstract class E2E_Cache_CacheTestCase extends CiviSimpleCacheTestCase implements \Civi\Test\EndToEndInterface {
 
   const MAX_KEY = 255;
 

tests/phpunit/E2E/Cache/TwoInstancesTest.php

@@ -44,7 +44,7 @@ protected function tearDown(): void {
   /**
    * Get a list of cache-creation specs.
    */
-  public function getSingleGenerators() {
+  public static function getSingleGenerators() {
     $exs = [];
     $exs[] = [
       ['type' => ['SqlGroup'], 'name' => 'TwoInstancesTest_SameSQL'],
@@ -81,7 +81,7 @@ public function testSingle_reload($cacheDef) {
   /**
    * Get a list of distinct cache-creation specs.
    */
-  public function getTwoGenerators() {
+  public static function getTwoGenerators() {
     $exs = [];
     $exs[] = [
       ['type' => ['SqlGroup'], 'name' => 'testTwo_a'],

tests/phpunit/E2E/Core/AssetBuilderTest.php

@@ -75,7 +75,7 @@ public function buildSquareJs(GenericHookEvent $e) {
    * Get a list of example assets to build/request.
    * @return array
    */
-  public function getExamples() {
+  public static function getExamples() {
     $examples = [];
 
     $examples[] = [

tests/phpunit/E2E/Core/ErrorTest.php

@@ -35,7 +35,7 @@ class ErrorTest extends \CiviEndToEndTestCase {
     '/Backdrop_testErrorChrome_(fatal|exception)/',
   ];
 
-  public function getErrorTypes() {
+  public static function getErrorTypes() {
     return [
       'frontend_fatal' => ['frontend://civicrm/dev/fake-error', 'fatal'],
       'frontend_exception' => ['frontend://civicrm/dev/fake-error', 'exception'],

tests/phpunit/E2E/Core/PrevNextTest.php

@@ -113,7 +113,7 @@ public function testFetch(): void {
     $this->assertEquals([200, 300], $cids);
   }
 
-  public function getFillFunctions() {
+  public static function getFillFunctions() {
     return [
       ['testFillSql'],
       ['testFillArray'],

tests/phpunit/E2E/Core/SmartyStringTest.php

@@ -51,7 +51,7 @@ public function testDisallowedSmartyCalls($template, $expectedResult): void {
     }
   }
 
-  public function allowedSmartyCallsProvider(): array {
+  public static function allowedSmartyCallsProvider(): array {
     return [
       [
         '{if count($numbers) == 2}yes{else}no{/if}',
@@ -70,7 +70,7 @@ public function allowedSmartyCallsProvider(): array {
     ];
   }
 
-  public function disallowedSmartyCallProviders(): array {
+  public static function disallowedSmartyCallProviders(): array {
     return [
       [
         "{if call_user_func(array('CRM_Utils_String', 'isAscii'), 'foo')}yes{else}no{/if}",

tests/phpunit/E2E/Extern/AuthxRestTest.php

@@ -14,7 +14,7 @@
  *
  * @group e2e
  */
-class E2E_Extern_AuthxRestTest extends E2E_Extern_BaseRestTest {
+class E2E_Extern_AuthxRestTest extends E2E_Extern_RestTestCase {
 
   public static function setUpBeforeClass(): void {
     parent::setUpBeforeClass();
@@ -33,7 +33,7 @@ protected function getRestUrl() {
     return CRM_Utils_System::url('civicrm/ajax/rest', NULL, TRUE, NULL, FALSE, TRUE);
   }
 
-  protected function isOldQSupported(): bool {
+  protected static function isOldQSupported(): bool {
     return FALSE;
   }
 

tests/phpunit/E2E/Extern/CliRunnerTest.php

@@ -90,7 +90,7 @@ public function testPermissionLookup(): void {
    *   Each case gives a name (eg "cv") and template for executing the command
    *   (eg "cv ev @PHP").
    */
-  public function getRunners() {
+  public static function getRunners() {
     $cliRunners = [];
 
     if (CIVICRM_UF === 'WordPress') {
@@ -110,9 +110,9 @@ public function getRunners() {
     return $cliRunners;
   }
 
-  public function getRunnersAndPaths() {
+  public static function getRunnersAndPaths() {
     $exs = [];
-    foreach ($this->getRunners() as $runner) {
+    foreach (static::getRunners() as $runner) {
       $exs[] = array_merge($runner, ['[civicrm.root]/css/civicrm.css']);
       $exs[] = array_merge($runner, ['[civicrm.packages]/jquery/css/images/arrow.png']);
     }

tests/phpunit/E2E/Extern/LegacyRestTest.php

@@ -14,7 +14,7 @@
  *
  * @group e2e
  */
-class E2E_Extern_LegacyRestTest extends E2E_Extern_BaseRestTest {
+class E2E_Extern_LegacyRestTest extends E2E_Extern_RestTestCase {
 
   protected $LEGACY_EXTERN_SUPPORTED = ['Drupal', 'Backdrop', 'Joomla', 'WordPress'];
 
@@ -30,7 +30,7 @@ protected function getRestUrl() {
       ->getUrl('civicrm', 'extern/rest.php');
   }
 
-  protected function isOldQSupported(): bool {
+  protected static function isOldQSupported(): bool {
     return TRUE;
   }
 

tests/phpunit/E2E/Extern/BaseRestTest.php → tests/phpunit/E2E/Extern/RestTestCase.php

@@ -16,7 +16,7 @@
  *
  * @group e2e
  */
-abstract class E2E_Extern_BaseRestTest extends CiviEndToEndTestCase {
+abstract class E2E_Extern_RestTestCase extends CiviEndToEndTestCase {
 
   use HttpTestTrait;
 
@@ -40,7 +40,7 @@ abstract class E2E_Extern_BaseRestTest extends CiviEndToEndTestCase {
    *
    * @return bool
    */
-  abstract protected function isOldQSupported(): bool;
+  abstract protected static function isOldQSupported(): bool;
 
   /**
    * @param $apiResult
@@ -94,7 +94,7 @@ protected function tearDown(): void {
    *
    * @return array; each item is a list of parameters for testAPICalls
    */
-  public function apiTestCases() {
+  public static function apiTestCases() {
     $cases = [];
 
     // entity,action: omit apiKey, valid entity+action
@@ -217,7 +217,7 @@ public function apiTestCases() {
       0,
     ];
 
-    if (!$this->isOldQSupported()) {
+    if (!static::isOldQSupported()) {
       $cases = array_filter($cases, function($case) {
         // The 'civicrm/ajax/rest' end-point does not support '?q' inputs.
         return !isset($case[0]['q']);