Commit 2fbac34e authored by catch's avatar catch
Browse files

Issue #3223725 by Spokje, imalabya, quietone, longwave: Remove unused class...

Issue #3223725 by Spokje, imalabya, quietone, longwave: Remove unused class property \Drupal\migrate\Plugin\Migration::$dependencies
parent 70098a68
Loading
Loading
Loading
Loading
+0 −13
Changes for core/modules/migrate/src/Plugin/Migration.php: 0 added lines, 13 removed lines.
Original line number Diff line number Diff line
@@ -272,19 +272,6 @@ class Migration extends PluginBase implements MigrationInterface, RequirementsIn
   */
  protected $migration_dependencies = [];

  /**
   * The migration's configuration dependencies.
   *
   * These store any dependencies on modules or other configuration (including
   * other migrations) that must be available before the migration can be
   * created.
   *
   * @see \Drupal\Core\Config\Entity\ConfigDependencyManager
   *
   * @var array
   */
  protected $dependencies = [];

  /**
   * The migration plugin manager for loading other migration plugins.
   *
+13 −13
Changes for core/modules/migrate/tests/src/Unit/MigrationPluginManagerTest.php: 13 added lines, 13 removed lines.
Original line number Diff line number Diff line
@@ -40,7 +40,7 @@ protected function setUp(): void {
  public function testDependencyBuilding($migrations_data, $result_ids) {
    $migrations = [];
    foreach ($migrations_data as $migration_id => $migration_data) {
      $migrations[$migration_id] = new TestMigrationMock($migration_id, $migration_data['dependencies']);
      $migrations[$migration_id] = new TestMigrationMock($migration_id, $migration_data['migration_dependencies']);
    }

    $ordered_migrations = $this->pluginManager->buildDependencyMigration($migrations, []);
@@ -74,7 +74,7 @@ public function dependencyProvider() {
      [
        [
          'm1' => [
            'dependencies' => [],
            'migration_dependencies' => [],
            'result_requirements' => [],
          ],
        ],
@@ -85,7 +85,7 @@ public function dependencyProvider() {
      [
        [
          'm1' => [
            'dependencies' => [
            'migration_dependencies' => [
              'required' => ['required1', 'required2'],
            ],
            'result_requirements' => ['required1', 'required2'],
@@ -98,7 +98,7 @@ public function dependencyProvider() {
      [
        [
          'm1' => [
            'dependencies' => [
            'migration_dependencies' => [
              'optional' => ['optional1'],
            ],
            'result_requirements' => [],
@@ -111,13 +111,13 @@ public function dependencyProvider() {
      [
        [
          'm1' => [
            'dependencies' => [
            'migration_dependencies' => [
              'required' => ['required1', 'required2'],
            ],
            'result_requirements' => ['required1', 'required2'],
          ],
          'm2' => [
            'dependencies' => [
            'migration_dependencies' => [
              'optional' => ['optional1'],
            ],
            'result_requirements' => [],
@@ -130,13 +130,13 @@ public function dependencyProvider() {
      [
        [
          'm1' => [
            'dependencies' => [
            'migration_dependencies' => [
              'optional' => ['m2'],
            ],
            'result_requirements' => [],
          ],
          'm2' => [
            'dependencies' => [
            'migration_dependencies' => [
              'optional' => ['optional1'],
            ],
            'result_requirements' => [],
@@ -150,13 +150,13 @@ public function dependencyProvider() {
      [
        [
          'm1' => [
            'dependencies' => [
            'migration_dependencies' => [
              'optional' => ['m2'],
            ],
            'result_requirements' => [],
          ],
          'm2' => [
            'dependencies' => [],
            'migration_dependencies' => [],
            'result_requirements' => [],
          ],
        ],
@@ -190,10 +190,10 @@ class TestMigrationMock extends Migration {
  /**
   * TestMigrationMock constructor.
   */
  public function __construct($id, $dependencies) {
  public function __construct($id, $migration_dependencies) {
    // Intentionally ignore parent constructor.
    $this->id = $id;
    $this->dependencies = $dependencies;
    $this->migration_dependencies = $migration_dependencies;
  }

  /**
@@ -208,7 +208,7 @@ public function id() {
   */
  public function getMigrationDependencies(bool $expand = FALSE) {
    // For the purpose of testing, do not expand dependencies.
    return $this->dependencies;
    return $this->migration_dependencies;
  }

  /**