diff --git a/composer.json b/composer.json index 6c45619..0a9d663 100644 --- a/composer.json +++ b/composer.json @@ -3,12 +3,13 @@ "type": "drupal-module", "description": "Provides effects and operations for the Image API.", "require": { - "drupal/core": ">=8.2.0", - "drupal/file_mdm_exif": "^1", - "drupal/file_mdm_font": "^1" + "php": ">=7", + "drupal/core": "8.8.x-dev", + "drupal/file_mdm_exif": "2.x-dev", + "drupal/file_mdm_font": "2.x-dev" }, "require-dev": { - "drupal/imagemagick": "^3@alpha", + "drupal/imagemagick": "3.x-dev", "drupal/jquery_colorpicker": "^1.4" }, "conflict": { diff --git a/image_effects.install b/image_effects.install index 700b852..d885061 100644 --- a/image_effects.install +++ b/image_effects.install @@ -29,33 +29,8 @@ function image_effects_requirements($phase) { } /** - * Minimum 1.x schema version to allow upgrading from. + * Minimum 2.x schema version to allow upgrading from. */ function image_effects_update_last_removed() { - return 8004; -} - -/** - * Enable file_mdm module and required submodules. - */ -function image_effects_update_8201() { - \Drupal::service('module_installer')->install([ - 'file_mdm', - 'file_mdm_exif', - 'file_mdm_font', - ]); -} - -/** - * Clear caches to discover new effects. - */ -function image_effects_update_8202() { - // Empty function. -} - -/** - * Clear caches to discover new effects. - */ -function image_effects_update_8203() { - // Empty function. + return 8203; } diff --git a/src/Tests/Update/Update8201Test.php b/src/Tests/Update/Update8201Test.php deleted file mode 100644 index 9629de8..0000000 --- a/src/Tests/Update/Update8201Test.php +++ /dev/null @@ -1,44 +0,0 @@ -databaseDumpFiles = [ - __DIR__ . '/../../../tests/fixtures/update/d834_ie810.php.gz', - ]; - } - - /** - * Tests that the file_mdm module enable is executed correctly. - */ - public function testModuleWeightUpdate() { - $this->assertFalse(\Drupal::moduleHandler()->moduleExists('file_mdm')); - $this->assertFalse(\Drupal::moduleHandler()->moduleExists('file_mdm_exif')); - $this->assertFalse(\Drupal::moduleHandler()->moduleExists('file_mdm_font')); - - $this->runUpdates(); - // @todo Fix https://www.drupal.org/node/2021959 so that module - // enable/disable changes are immediately reflected in - // \Drupal::getContainer(). Until then, tests can invoke this workaround - // when requiring services from newly enabled modules to be immediately - // available in the same request. - $this->rebuildContainer(); - - $this->assertTrue(\Drupal::moduleHandler()->moduleExists('file_mdm')); - $this->assertTrue(\Drupal::moduleHandler()->moduleExists('file_mdm_exif')); - $this->assertTrue(\Drupal::moduleHandler()->moduleExists('file_mdm_font')); - } - -}