Issue #2795045 by legovaer, kmoll: Make SchemaCheckTestTrait available outside of the config module

core/modules/action/tests/src/Kernel/Migrate/d6/MigrateActionConfigsTest.php

@@ -2,7 +2,7 @@
 
 namespace Drupal\Tests\action\Kernel\Migrate\d6;
 
-use Drupal\config\Tests\SchemaCheckTestTrait;
+use Drupal\Tests\SchemaCheckTestTrait;
 use Drupal\Tests\migrate_drupal\Kernel\d6\MigrateDrupal6TestBase;
 
 /**

core/modules/action/tests/src/Kernel/Migrate/d7/MigrateActionConfigsTest.php

@@ -2,7 +2,7 @@
 
 namespace Drupal\Tests\action\Kernel\Migrate\d7;
 
-use Drupal\config\Tests\SchemaCheckTestTrait;
+use Drupal\Tests\SchemaCheckTestTrait;
 use Drupal\Tests\migrate_drupal\Kernel\d7\MigrateDrupal7TestBase;
 
 /**

core/modules/aggregator/tests/src/Kernel/Migrate/d6/MigrateAggregatorConfigsTest.php

@@ -2,7 +2,7 @@
 
 namespace Drupal\Tests\aggregator\Kernel\Migrate\d6;
 
-use Drupal\config\Tests\SchemaCheckTestTrait;
+use Drupal\Tests\SchemaCheckTestTrait;
 use Drupal\Tests\migrate_drupal\Kernel\d6\MigrateDrupal6TestBase;
 
 /**

core/modules/ban/tests/src/Kernel/Migrate/d7/MigrateBlockedIPsTest.php

@@ -2,7 +2,7 @@
 
 namespace Drupal\Tests\ban\Kernel\Migrate\d7;
 
-use Drupal\config\Tests\SchemaCheckTestTrait;
+use Drupal\Tests\SchemaCheckTestTrait;
 use Drupal\Tests\migrate_drupal\Kernel\d7\MigrateDrupal7TestBase;
 
 /**

core/modules/block/tests/src/Kernel/BlockConfigSchemaTest.php

@@ -3,7 +3,7 @@
 namespace Drupal\Tests\block\Kernel;
 
 use Drupal\block\Entity\Block;
-use Drupal\config\Tests\SchemaCheckTestTrait;
+use Drupal\Tests\SchemaCheckTestTrait;
 use Drupal\KernelTests\KernelTestBase;
 
 /**

core/modules/book/tests/src/Kernel/Migrate/d6/MigrateBookConfigsTest.php

@@ -2,7 +2,7 @@
 
 namespace Drupal\Tests\book\Kernel\Migrate\d6;
 
-use Drupal\config\Tests\SchemaCheckTestTrait;
+use Drupal\Tests\SchemaCheckTestTrait;
 use Drupal\Tests\migrate_drupal\Kernel\d6\MigrateDrupal6TestBase;
 
 /**

core/modules/config/src/Tests/SchemaCheckTestTrait.php

@@ -2,58 +2,13 @@
 
 namespace Drupal\config\Tests;
 
-use Drupal\Core\Config\TypedConfigManagerInterface;
-use Drupal\Core\Config\Schema\SchemaCheckTrait;
-use Drupal\Component\Utility\SafeMarkup;
-
 /**
  * Provides a class for checking configuration schema.
+ *
+ * @deprecated as of 8.3.x, will be removed in before Drupal 9.0.0.
  */
 trait SchemaCheckTestTrait {
 
-  use SchemaCheckTrait;
+  use \Drupal\Tests\SchemaCheckTestTrait;
-
-  /**
-   * Asserts the TypedConfigManager has a valid schema for the configuration.
-   *
-   * @param \Drupal\Core\Config\TypedConfigManagerInterface $typed_config
-   *   The TypedConfigManager.
-   * @param string $config_name
-   *   The configuration name.
-   * @param array $config_data
-   *   The configuration data.
-   */
-  public function assertConfigSchema(TypedConfigManagerInterface $typed_config, $config_name, $config_data) {
-    $errors = $this->checkConfigSchema($typed_config, $config_name, $config_data);
-    if ($errors === FALSE) {
-      // @todo Since the use of this trait is under TestBase, it works.
-      //   Can be fixed as part of https://www.drupal.org/node/2260053.
-      $this->fail(SafeMarkup::format('No schema for @config_name', array('@config_name' => $config_name)));
-      return;
-    }
-    elseif ($errors === TRUE) {
-      // @todo Since the use of this trait is under TestBase, it works.
-      //   Can be fixed as part of https://www.drupal.org/node/2260053.
-      $this->pass(SafeMarkup::format('Schema found for @config_name and values comply with schema.', array('@config_name' => $config_name)));
-    }
-    else {
-      foreach ($errors as $key => $error) {
-        // @todo Since the use of this trait is under TestBase, it works.
-        //   Can be fixed as part of https://www.drupal.org/node/2260053.
-        $this->fail(SafeMarkup::format('Schema key @key failed with: @error', array('@key' => $key, '@error' => $error)));
-      }
-    }
-  }
-
-  /**
-   * Asserts configuration, specified by name, has a valid schema.
-   *
-   * @param string $config_name
-   *   The configuration name.
-   */
-  public function assertConfigSchemaByName($config_name) {
-    $config = $this->config($config_name);
-    $this->assertConfigSchema(\Drupal::service('config.typed'), $config->getName(), $config->get());
-  }
 
 }

core/modules/config_translation/tests/src/Kernel/Migrate/d6/MigrateI18nUserConfigsTest.php

@@ -2,7 +2,7 @@
 
 namespace Drupal\Tests\config_translation\Kernel\Migrate\d6;
 
-use Drupal\config\Tests\SchemaCheckTestTrait;
+use Drupal\Tests\SchemaCheckTestTrait;
 use Drupal\Tests\migrate_drupal\Kernel\d6\MigrateDrupal6TestBase;
 
 /**

core/modules/contact/tests/src/Kernel/Migrate/d6/MigrateContactSettingsTest.php

@@ -2,7 +2,7 @@
 
 namespace Drupal\Tests\contact\Kernel\Migrate\d6;
 
-use Drupal\config\Tests\SchemaCheckTestTrait;
+use Drupal\Tests\SchemaCheckTestTrait;
 use Drupal\Tests\migrate_drupal\Kernel\d6\MigrateDrupal6TestBase;
 
 /**

core/modules/content_moderation/tests/src/Kernel/ContentModerationSchemaTest.php

@@ -3,7 +3,7 @@
 namespace Drupal\Tests\content_moderation\Kernel;
 
 use Drupal\block_content\Entity\BlockContentType;
-use Drupal\config\Tests\SchemaCheckTestTrait;
+use Drupal\Tests\SchemaCheckTestTrait;
 use Drupal\KernelTests\KernelTestBase;
 use Drupal\node\Entity\NodeType;
 use Drupal\content_moderation\Entity\ModerationState;

core/modules/dblog/tests/src/Kernel/Migrate/d6/MigrateDblogConfigsTest.php

@@ -2,7 +2,7 @@
 
 namespace Drupal\Tests\dblog\Kernel\Migrate\d6;
 
-use Drupal\config\Tests\SchemaCheckTestTrait;
+use Drupal\Tests\SchemaCheckTestTrait;
 use Drupal\Tests\migrate_drupal\Kernel\d6\MigrateDrupal6TestBase;
 
 /**

core/modules/field/src/Tests/EntityReference/EntityReferenceFieldDefaultValueTest.php

@@ -3,7 +3,7 @@
 namespace Drupal\field\Tests\EntityReference;
 
 use Drupal\Component\Utility\Unicode;
-use Drupal\config\Tests\SchemaCheckTestTrait;
+use Drupal\Tests\SchemaCheckTestTrait;
 use Drupal\field\Entity\FieldConfig;
 use Drupal\field\Entity\FieldStorageConfig;
 use Drupal\node\Entity\Node;

core/modules/file/tests/src/Kernel/Migrate/d6/MigrateFileConfigsTest.php

@@ -2,7 +2,7 @@
 
 namespace Drupal\Tests\file\Kernel\Migrate\d6;
 
-use Drupal\config\Tests\SchemaCheckTestTrait;
+use Drupal\Tests\SchemaCheckTestTrait;
 use Drupal\Tests\migrate_drupal\Kernel\d6\MigrateDrupal6TestBase;
 
 /**

core/modules/file/tests/src/Kernel/Migrate/d7/MigrateFileConfigsTest.php

@@ -2,7 +2,7 @@
 
 namespace Drupal\Tests\file\Kernel\Migrate\d7;
 
-use Drupal\config\Tests\SchemaCheckTestTrait;
+use Drupal\Tests\SchemaCheckTestTrait;
 use Drupal\Tests\migrate_drupal\Kernel\d7\MigrateDrupal7TestBase;
 
 /**

core/modules/forum/tests/src/Kernel/Migrate/d6/MigrateForumConfigsTest.php

@@ -2,7 +2,7 @@
 
 namespace Drupal\Tests\forum\Kernel\Migrate\d6;
 
-use Drupal\config\Tests\SchemaCheckTestTrait;
+use Drupal\Tests\SchemaCheckTestTrait;
 use Drupal\Tests\migrate_drupal\Kernel\d6\MigrateDrupal6TestBase;
 
 /**

core/modules/language/src/Tests/LanguageConfigSchemaTest.php

@@ -2,7 +2,7 @@
 
 namespace Drupal\language\Tests;
 
-use Drupal\config\Tests\SchemaCheckTestTrait;
+use Drupal\Tests\SchemaCheckTestTrait;
 use Drupal\simpletest\WebTestBase;
 
 /**

core/modules/locale/tests/src/Kernel/Migrate/MigrateLocaleConfigsTest.php

@@ -2,7 +2,7 @@
 
 namespace Drupal\Tests\locale\Kernel\Migrate;
 
-use Drupal\config\Tests\SchemaCheckTestTrait;
+use Drupal\Tests\SchemaCheckTestTrait;
 use Drupal\Tests\migrate_drupal\Kernel\d6\MigrateDrupal6TestBase;
 
 /**

core/modules/node/tests/src/Kernel/Migrate/d6/MigrateNodeConfigsTest.php

@@ -2,7 +2,7 @@
 
 namespace Drupal\Tests\node\Kernel\Migrate\d6;
 
-use Drupal\config\Tests\SchemaCheckTestTrait;
+use Drupal\Tests\SchemaCheckTestTrait;
 use Drupal\Tests\migrate_drupal\Kernel\d6\MigrateDrupal6TestBase;
 
 /**

core/modules/node/tests/src/Kernel/Migrate/d7/MigrateNodeSettingsTest.php

@@ -2,7 +2,7 @@
 
 namespace Drupal\Tests\node\Kernel\Migrate\d7;
 
-use Drupal\config\Tests\SchemaCheckTestTrait;
+use Drupal\Tests\SchemaCheckTestTrait;
 use Drupal\Tests\migrate_drupal\Kernel\d7\MigrateDrupal7TestBase;
 
 /**

core/modules/search/tests/src/Kernel/Migrate/d6/MigrateSearchSettingsTest.php

@@ -2,7 +2,7 @@
 
 namespace Drupal\Tests\search\Kernel\Migrate\d6;
 
-use Drupal\config\Tests\SchemaCheckTestTrait;
+use Drupal\Tests\SchemaCheckTestTrait;
 use Drupal\Tests\migrate_drupal\Kernel\d6\MigrateDrupal6TestBase;
 
 /**

core/modules/simpletest/tests/src/Kernel/Migrate/d6/MigrateSimpletestConfigsTest.php

@@ -2,7 +2,7 @@
 
 namespace Drupal\Tests\simpletest\Kernel\Migrate\d6;
 
-use Drupal\config\Tests\SchemaCheckTestTrait;
+use Drupal\Tests\SchemaCheckTestTrait;
 use Drupal\Tests\migrate_drupal\Kernel\d6\MigrateDrupal6TestBase;
 
 /**

core/modules/statistics/tests/src/Kernel/Migrate/d6/MigrateStatisticsConfigsTest.php

@@ -2,7 +2,7 @@
 
 namespace Drupal\Tests\statistics\Kernel\Migrate\d6;
 
-use Drupal\config\Tests\SchemaCheckTestTrait;
+use Drupal\Tests\SchemaCheckTestTrait;
 use Drupal\Tests\migrate_drupal\Kernel\d6\MigrateDrupal6TestBase;
 
 /**

core/modules/statistics/tests/src/Kernel/Migrate/d7/MigrateStatisticsConfigsTest.php

@@ -2,7 +2,7 @@
 
 namespace Drupal\Tests\statistics\Kernel\Migrate\d7;
 
-use Drupal\config\Tests\SchemaCheckTestTrait;
+use Drupal\Tests\SchemaCheckTestTrait;
 use Drupal\Tests\migrate_drupal\Kernel\d7\MigrateDrupal7TestBase;
 
 /**

core/modules/syslog/tests/src/Kernel/Migrate/d6/MigrateSyslogConfigsTest.php

@@ -2,7 +2,7 @@
 
 namespace Drupal\Tests\syslog\Kernel\Migrate\d6;
 
-use Drupal\config\Tests\SchemaCheckTestTrait;
+use Drupal\Tests\SchemaCheckTestTrait;
 use Drupal\Tests\migrate_drupal\Kernel\d6\MigrateDrupal6TestBase;
 
 /**

core/modules/syslog/tests/src/Kernel/Migrate/d7/MigrateSyslogConfigsTest.php

@@ -2,7 +2,7 @@
 
 namespace Drupal\Tests\syslog\Kernel\Migrate\d7;
 
-use Drupal\config\Tests\SchemaCheckTestTrait;
+use Drupal\Tests\SchemaCheckTestTrait;
 use Drupal\Tests\migrate_drupal\Kernel\d7\MigrateDrupal7TestBase;
 
 /**

core/modules/system/src/Tests/Update/UpdatePathTestBase.php

@@ -3,7 +3,7 @@
 namespace Drupal\system\Tests\Update;
 
 use Drupal\Component\Utility\Crypt;
-use Drupal\config\Tests\SchemaCheckTestTrait;
+use Drupal\Tests\SchemaCheckTestTrait;
 use Drupal\Core\Database\Database;
 use Drupal\Core\DependencyInjection\ContainerBuilder;
 use Drupal\Core\Language\Language;

core/modules/system/tests/src/Kernel/Migrate/d6/MigrateSystemLoggingTest.php

@@ -2,7 +2,7 @@
 
 namespace Drupal\Tests\system\Kernel\Migrate\d6;
 
-use Drupal\config\Tests\SchemaCheckTestTrait;
+use Drupal\Tests\SchemaCheckTestTrait;
 use Drupal\Tests\migrate_drupal\Kernel\d6\MigrateDrupal6TestBase;
 
 /**

core/modules/taxonomy/tests/src/Kernel/Migrate/MigrateTaxonomyConfigsTest.php

@@ -2,7 +2,7 @@
 
 namespace Drupal\Tests\taxonomy\Kernel\Migrate;
 
-use Drupal\config\Tests\SchemaCheckTestTrait;
+use Drupal\Tests\SchemaCheckTestTrait;
 use Drupal\Tests\migrate_drupal\Kernel\d6\MigrateDrupal6TestBase;
 
 /**

core/modules/text/tests/src/Kernel/Migrate/MigrateTextConfigsTest.php

@@ -2,7 +2,7 @@
 
 namespace Drupal\Tests\text\Kernel\Migrate;
 
-use Drupal\config\Tests\SchemaCheckTestTrait;
+use Drupal\Tests\SchemaCheckTestTrait;
 use Drupal\Tests\migrate_drupal\Kernel\d6\MigrateDrupal6TestBase;
 
 /**

core/modules/update/tests/src/Kernel/Migrate/d6/MigrateUpdateConfigsTest.php

@@ -2,7 +2,7 @@
 
 namespace Drupal\Tests\update\Kernel\Migrate\d6;
 
-use Drupal\config\Tests\SchemaCheckTestTrait;
+use Drupal\Tests\SchemaCheckTestTrait;
 use Drupal\Tests\migrate_drupal\Kernel\d6\MigrateDrupal6TestBase;
 
 /**

core/modules/user/tests/src/Kernel/Migrate/d6/MigrateUserConfigsTest.php

@@ -2,7 +2,7 @@
 
 namespace Drupal\Tests\user\Kernel\Migrate\d6;
 
-use Drupal\config\Tests\SchemaCheckTestTrait;
+use Drupal\Tests\SchemaCheckTestTrait;
 use Drupal\Tests\migrate_drupal\Kernel\d6\MigrateDrupal6TestBase;
 use Drupal\user\AccountSettingsForm;
 use Drupal\Core\Database\Database;

core/modules/user/tests/src/Kernel/UserActionConfigSchemaTest.php

@@ -2,7 +2,7 @@
 
 namespace Drupal\Tests\user\Kernel;
 
-use Drupal\config\Tests\SchemaCheckTestTrait;
+use Drupal\Tests\SchemaCheckTestTrait;
 use Drupal\KernelTests\KernelTestBase;
 use Drupal\user\Entity\Role;
 

core/modules/views/tests/src/FunctionalJavascript/Plugin/views/Handler/FieldTest.php

@@ -2,7 +2,7 @@
 
 namespace Drupal\Tests\views\FunctionalJavascript\Plugin\views\Handler;
 
-use Drupal\config\Tests\SchemaCheckTestTrait;
+use Drupal\Tests\SchemaCheckTestTrait;
 use Drupal\field\Entity\FieldConfig;
 use Drupal\FunctionalJavascriptTests\JavascriptTestBase;
 use Drupal\node\Entity\NodeType;

core/modules/views/tests/src/Kernel/TestViewsTest.php

@@ -2,7 +2,7 @@
 
 namespace Drupal\Tests\views\Kernel;
 
-use Drupal\config\Tests\SchemaCheckTestTrait;
+use Drupal\Tests\SchemaCheckTestTrait;
 use Drupal\config_test\TestInstallStorage;
 use Drupal\Core\Config\InstallStorage;
 use Drupal\Core\Config\TypedConfigManager;

core/modules/views_ui/src/Tests/FilterNumericWebTest.php

@@ -2,7 +2,7 @@
 
 namespace Drupal\views_ui\Tests;
 
-use Drupal\config\Tests\SchemaCheckTestTrait;
+use Drupal\Tests\SchemaCheckTestTrait;
 
 /**
  * Tests the numeric filter UI.

core/profiles/standard/tests/src/Functional/StandardTest.php

@@ -2,7 +2,7 @@
 
 namespace Drupal\Tests\standard\Functional;
 
-use Drupal\config\Tests\SchemaCheckTestTrait;
+use Drupal\Tests\SchemaCheckTestTrait;
 use Drupal\contact\Entity\ContactForm;
 use Drupal\Core\Url;
 use Drupal\dynamic_page_cache\EventSubscriber\DynamicPageCacheSubscriber;

core/tests/Drupal/KernelTests/Core/Config/DefaultConfigTest.php

@@ -2,7 +2,7 @@
 
 namespace Drupal\KernelTests\Core\Config;
 
-use Drupal\config\Tests\SchemaCheckTestTrait;
+use Drupal\Tests\SchemaCheckTestTrait;
 use Drupal\config_test\TestInstallStorage;
 use Drupal\Core\Config\InstallStorage;
 use Drupal\Core\DependencyInjection\ContainerBuilder;

core/tests/Drupal/KernelTests/Core/Entity/EntityReferenceFieldTest.php

@@ -2,7 +2,7 @@
 
 namespace Drupal\KernelTests\Core\Entity;
 
-use Drupal\config\Tests\SchemaCheckTestTrait;
+use Drupal\Tests\SchemaCheckTestTrait;
 use Drupal\Core\Entity\EntityInterface;
 use Drupal\Core\Entity\EntityStorageException;
 use Drupal\Core\Field\BaseFieldDefinition;

core/tests/Drupal/Tests/SchemaCheckTestTrait.php

@@ -0,0 +1,59 @@
+<?php
+
+namespace Drupal\Tests;
+
+use Drupal\Core\Config\TypedConfigManagerInterface;
+use Drupal\Core\Config\Schema\SchemaCheckTrait;
+use Drupal\Component\Utility\SafeMarkup;
+
+/**
+ * Provides a class for checking configuration schema.
+ */
+trait SchemaCheckTestTrait {
+
+  use SchemaCheckTrait;
+
+  /**
+   * Asserts the TypedConfigManager has a valid schema for the configuration.
+   *
+   * @param \Drupal\Core\Config\TypedConfigManagerInterface $typed_config
+   *   The TypedConfigManager.
+   * @param string $config_name
+   *   The configuration name.
+   * @param array $config_data
+   *   The configuration data.
+   */
+  public function assertConfigSchema(TypedConfigManagerInterface $typed_config, $config_name, $config_data) {
+    $errors = $this->checkConfigSchema($typed_config, $config_name, $config_data);
+    if ($errors === FALSE) {
+      // @todo Since the use of this trait is under TestBase, it works.
+      //   Can be fixed as part of https://www.drupal.org/node/2260053.
+      $this->fail(SafeMarkup::format('No schema for @config_name', array('@config_name' => $config_name)));
+      return;
+    }
+    elseif ($errors === TRUE) {
+      // @todo Since the use of this trait is under TestBase, it works.
+      //   Can be fixed as part of https://www.drupal.org/node/2260053.
+      $this->pass(SafeMarkup::format('Schema found for @config_name and values comply with schema.', array('@config_name' => $config_name)));
+    }
+    else {
+      foreach ($errors as $key => $error) {
+        // @todo Since the use of this trait is under TestBase, it works.
+        //   Can be fixed as part of https://www.drupal.org/node/2260053.
+        $this->fail(SafeMarkup::format('Schema key @key failed with: @error', array('@key' => $key, '@error' => $error)));
+      }
+    }
+  }
+
+  /**
+   * Asserts configuration, specified by name, has a valid schema.
+   *
+   * @param string $config_name
+   *   The configuration name.
+   */
+  public function assertConfigSchemaByName($config_name) {
+    $config = $this->config($config_name);
+    $this->assertConfigSchema(\Drupal::service('config.typed'), $config->getName(), $config->get());
+  }
+
+}