CE-33709: Fixed using of removed classes

Author: bohdan-harniuk

dev/tests/api-functional/testsuite/Magento/WebApiTest.php

@@ -11,27 +11,23 @@
 use Magento\TestFramework\Workaround\Override\Config;
 use Magento\TestFramework\Workaround\Override\WrapperGenerator;
 use PHPUnit\Framework\TestSuite;
-use PHPUnit\TextUI\Configuration\Configuration as LegacyConfiguration;
-use PHPUnit\TextUI\Configuration\Registry;
-use PHPUnit\TextUI\Configuration\TestSuite as LegacyTestSuiteConfiguration;
-use PHPUnit\TextUI\Configuration\TestSuiteCollection as LegacyTestSuiteCollection;
-use PHPUnit\TextUI\Configuration\TestSuiteMapper as LegacyTestSuiteMapper;
+use PHPUnit\TextUI\TestSuiteMapper;
 use PHPUnit\TextUI\XmlConfiguration\Configuration;
 use PHPUnit\TextUI\XmlConfiguration\Loader;
 use PHPUnit\TextUI\XmlConfiguration\TestSuite as TestSuiteConfiguration;
 use PHPUnit\TextUI\XmlConfiguration\TestSuiteCollection;
-use PHPUnit\TextUI\XmlConfiguration\TestSuiteMapper;
 
 /**
  * Web API tests wrapper.
  */
 class WebApiTest extends TestSuite
 {
     /**
-     * @SuppressWarnings(PHPMD.UnusedFormalParameter)
      * @param string $className
+     *
      * @return TestSuite
      * @throws \ReflectionException
+     * @SuppressWarnings(PHPMD.UnusedFormalParameter)
      */
     public static function suite($className)
     {
@@ -73,41 +69,28 @@ private static function getConfigurationFile(): string
         $longConfig = $params['configuration'] ?? '';
         $shortConfig = $params['c'] ?? '';
 
-        return $shortConfig ? $shortConfig : $longConfig;
+        return $shortConfig ?: $longConfig;
     }
 
     /**
-     * Retrieve configuration depends on used phpunit version
+     * Retrieve configuration.
      *
-     * @return Configuration|LegacyConfiguration
+     * @return Configuration
      */
     private static function getConfiguration()
     {
-        // Compatibility with phpunit < 9.3
-        if (!class_exists(Configuration::class)) {
-            // @phpstan-ignore-next-line
-            return Registry::getInstance()->get(self::getConfigurationFile());
-        }
-
-        // @phpstan-ignore-next-line
         return (new Loader())->load(self::getConfigurationFile());
     }
 
     /**
-     * Retrieve test suites by suite config depends on used phpunit version
+     * Retrieve test suites by suite config.
+     *
+     * @param TestSuiteConfiguration $suiteConfig
      *
-     * @param TestSuiteConfiguration|LegacyTestSuiteConfiguration $suiteConfig
      * @return TestSuite
      */
     private static function getSuites($suiteConfig)
     {
-        // Compatibility with phpunit < 9.3
-        if (!class_exists(Configuration::class)) {
-            // @phpstan-ignore-next-line
-            return (new LegacyTestSuiteMapper())->map(LegacyTestSuiteCollection::fromArray([$suiteConfig]), '');
-        }
-
-        // @phpstan-ignore-next-line
         return (new TestSuiteMapper())->map(TestSuiteCollection::fromArray([$suiteConfig]), '');
     }
 }

dev/tests/integration/testsuite/Magento/IntegrationTest.php

@@ -11,27 +11,23 @@
 use Magento\TestFramework\Workaround\Override\Config;
 use Magento\TestFramework\Workaround\Override\WrapperGenerator;
 use PHPUnit\Framework\TestSuite;
-use PHPUnit\TextUI\Configuration\Configuration as LegacyConfiguration;
-use PHPUnit\TextUI\Configuration\Registry;
-use PHPUnit\TextUI\Configuration\TestSuite as LegacyTestSuiteConfiguration;
-use PHPUnit\TextUI\Configuration\TestSuiteCollection as LegacyTestSuiteCollection;
-use PHPUnit\TextUI\Configuration\TestSuiteMapper as LegacyTestSuiteMapper;
+use PHPUnit\TextUI\TestSuiteMapper;
 use PHPUnit\TextUI\XmlConfiguration\Configuration;
 use PHPUnit\TextUI\XmlConfiguration\Loader;
 use PHPUnit\TextUI\XmlConfiguration\TestSuite as TestSuiteConfiguration;
 use PHPUnit\TextUI\XmlConfiguration\TestSuiteCollection;
-use PHPUnit\TextUI\XmlConfiguration\TestSuiteMapper;
 
 /**
  * Integration tests wrapper.
  */
 class IntegrationTest extends TestSuite
 {
     /**
-     * @SuppressWarnings(PHPMD.UnusedFormalParameter)
      * @param string $className
+     *
      * @return TestSuite
      * @throws \ReflectionException
+     * @SuppressWarnings(PHPMD.UnusedFormalParameter)
      */
     public static function suite($className)
     {
@@ -79,41 +75,28 @@ private static function getConfigurationFile(): string
         $longConfig = $params['configuration'] ?? $defaultConfigFile;
         $shortConfig = $params['c'] ?? '';
 
-        return $shortConfig ? $shortConfig : $longConfig;
+        return $shortConfig ?: $longConfig;
     }
 
     /**
-     * Retrieve configuration depends on used phpunit version
+     * Retrieve configuration.
      *
-     * @return Configuration|LegacyConfiguration
+     * @return Configuration
      */
     private static function getConfiguration()
     {
-        // Compatibility with phpunit < 9.3
-        if (!class_exists(Configuration::class)) {
-            // @phpstan-ignore-next-line
-            return Registry::getInstance()->get(self::getConfigurationFile());
-        }
-
-        // @phpstan-ignore-next-line
         return (new Loader())->load(self::getConfigurationFile());
     }
 
     /**
-     * Retrieve test suites by suite config depends on used phpunit version
+     * Retrieve test suites by suite config.
+     *
+     * @param TestSuiteConfiguration $suiteConfig
      *
-     * @param TestSuiteConfiguration|LegacyTestSuiteConfiguration $suiteConfig
      * @return TestSuite
      */
     private static function getSuites($suiteConfig)
     {
-        // Compatibility with phpunit < 9.3
-        if (!class_exists(Configuration::class)) {
-            // @phpstan-ignore-next-line
-            return (new LegacyTestSuiteMapper())->map(LegacyTestSuiteCollection::fromArray([$suiteConfig]), '');
-        }
-
-        // @phpstan-ignore-next-line
         return (new TestSuiteMapper())->map(TestSuiteCollection::fromArray([$suiteConfig]), '');
     }
 }