Commit b879ac14 authored by Youri van Koppen's avatar Youri van Koppen
Browse files

Issue #3092823 by MegaChriz: Fixed uninstalling modules that provide third... 

Issue #3092823 by MegaChriz: Fixed uninstalling modules that provide third party configuration (such as Feeds Tamper) will result into feeds type getting deleted.
parent 8d8ba369

src/Entity/FeedType.php

+1 −1
Changes for src/Entity/FeedType.php: 1 added line, 1 removed line.
Original line number Diff line number Diff line
@@ -702,7 +702,7 @@ class FeedType extends ConfigEntityBundleBase implements FeedTypeInterface, Enti 
   * {@inheritdoc}

   */

  public function onDependencyRemoval(array $dependencies) {

    $changed = FALSE;

    $changed = parent::onDependencyRemoval($dependencies);



    // Don't intervene if the feeds module is removed.

    if (isset($dependencies['module']) && in_array('feeds', $dependencies['module'])) {

tests/modules/feeds_test_plugin/config/schema/feeds_test_plugin.schema.yml

+8 −0
Changes for tests/modules/feeds_test_plugin/config/schema/feeds_test_plugin.schema.yml: 8 added lines, 0 removed lines.
Original line number Diff line number Diff line
@@ -26,3 +26,11 @@ feeds.custom_source.foo: 
      type: boolean

    proptext:

      type: string



# Custom third party settings.

feeds.feed_type.*.third_party.feeds_test_plugin:

  type: mapping

  label: 'Foo settings'

  mapping:

    status:

      type: boolean

tests/src/Functional/FeedsUninstallTest.php

+33 −0
Changes for tests/src/Functional/FeedsUninstallTest.php: 33 added lines, 0 removed lines.
Original line number Diff line number Diff line
@@ -5,6 +5,7 @@ namespace Drupal\Tests\feeds\Functional; 
use Drupal\Core\Database\Database;

use Drupal\Core\Queue\DatabaseQueue;

use Drupal\feeds\FeedInterface;

use Drupal\feeds\FeedTypeInterface;



/**

 * Tests module uninstallation.
@@ -235,4 +236,36 @@ class FeedsUninstallTest extends FeedsBrowserTestBase { 
    $this->assertNoFeedsQueueTasks();

  }



  /**

   * Tests uninstalling a third party module.

   */

  public function testUninstallModuleWithThirdPartySettings() {

    // Install Feeds test plugin which provides a config schema for third party

    // settings.

    $this->assertTrue($this->container->get('module_installer')->install(['feeds_test_plugin']));



    // Create a feed type and add third party config to it.

    $feed_type = $this->createFeedType();

    $feed_type->setThirdPartySetting('feeds_test_plugin', 'status', TRUE);

    $feed_type->save();



    // Now uninstall the feeds_test_plugin module.

    $this->container->get('module_installer')->uninstall(['feeds_test_plugin']);



    // Flushing all caches is needed because else the testbot can read reload

    // the feed type from cache.

    drupal_flush_all_caches();

    // The testbot uses or can use the cache backed "ApcuBackend" to cache

    // config objects. This cache backend is wrapped inside a backend called

    // "ChainedFastBackend". Based on the docs from that backend, some time

    // needs to pass in order to read data from the database instead of from the

    // APCu cache. Since there is very little time between creating the feed

    // type and uninstalling a module, make sure that the feed type does not

    // exist on the APCu cache.

    apcu_clear_cache();



    // Assert that the feed type no longer exist.

    $this->assertInstanceOf(FeedTypeInterface::class, $this->reloadEntity($feed_type));

  }



}