Update to drupal-org-drupal 8.0.0-rc2. For more information, see https://www.drupal.org/node/2598668

core/modules/image/src/Form/ImageEffectAddForm.php

@@ -7,7 +7,6 @@
 
 namespace Drupal\image\Form;
 
-use Drupal\Core\DependencyInjection\ContainerInjectionInterface;
 use Drupal\Core\Form\FormStateInterface;
 use Drupal\image\ImageEffectManager;
 use Drupal\image\ImageStyleInterface;

core/modules/image/src/Form/ImageStyleEditForm.php

@@ -273,7 +273,7 @@ class ImageStyleEditForm extends ImageStyleFormBase {
    * Updates image effect weights.
    *
    * @param array $effects
-   *   Associative array with effects having effect uuid as keys and and array
+   *   Associative array with effects having effect uuid as keys and array
    *   with effect data as values.
    */
   protected function updateEffectWeights(array $effects) {

core/modules/image/src/Plugin/Field/FieldFormatter/ImageFormatter.php

@@ -12,10 +12,8 @@ use Drupal\Core\Field\FieldItemListInterface;
 use Drupal\Core\Field\FieldDefinitionInterface;
 use Drupal\Core\Link;
 use Drupal\Core\Plugin\ContainerFactoryPluginInterface;
-use Drupal\Core\Routing\UrlGeneratorInterface;
 use Drupal\Core\Session\AccountInterface;
 use Drupal\Core\Url;
-use Drupal\Core\Utility\LinkGeneratorInterface;
 use Symfony\Component\DependencyInjection\ContainerInterface;
 use Drupal\Core\Form\FormStateInterface;
 use Drupal\Core\Cache\Cache;

core/modules/image/src/Plugin/Field/FieldFormatter/ImageFormatterBase.php

@@ -8,7 +8,6 @@
 namespace Drupal\image\Plugin\Field\FieldFormatter;
 
 use Drupal\Core\Field\EntityReferenceFieldItemListInterface;
-use Drupal\Core\Language\LanguageInterface;
 use Drupal\field\FieldConfigInterface;
 use Drupal\file\Plugin\Field\FieldFormatter\FileFormatterBase;
 

core/modules/image/src/Plugin/Field/FieldWidget/ImageWidget.php

@@ -71,7 +71,7 @@ class ImageWidget extends FileWidget {
       $preview_image_style = t('Preview image style: @style', array('@style' => $image_styles[$image_style_setting]));
     }
     else {
-      $preview_image_style = t('Original image');
+      $preview_image_style = t('No preview');
     }
 
     array_unshift($summary, $preview_image_style);

core/modules/image/src/Plugin/migrate/process/d6/ImageCacheActions.php

@@ -8,7 +8,6 @@
 namespace Drupal\image\Plugin\migrate\process\d6;
 
 use Drupal\migrate\MigrateExecutableInterface;
-use Drupal\migrate\MigrateSkipRowException;
 use Drupal\migrate\ProcessPluginBase;
 use Drupal\migrate\Row;
 

core/modules/image/src/Plugin/migrate/source/d6/ImageCachePreset.php

@@ -14,7 +14,8 @@ use Drupal\migrate\Row;
  * Drupal 6 imagecache presets source from database.
  *
  * @MigrateSource(
- *   id = "d6_imagecache_presets"
+ *   id = "d6_imagecache_presets",
+ *   source_provider = "imagecache"
  * )
  */
 class ImageCachePreset extends DrupalSqlBase {

core/modules/image/src/Tests/ImageStylesPathAndUrlTest.php

@@ -8,7 +8,6 @@
 namespace Drupal\image\Tests;
 
 use Drupal\simpletest\WebTestBase;
-use Symfony\Component\HttpFoundation\Request;
 
 /**
  * Tests the functions for generating paths and URLs for image styles.

core/modules/image/src/Tests/Migrate/d6/MigrateImageCacheTest.php

@@ -9,13 +9,13 @@ namespace Drupal\image\Tests\Migrate\d6;
 
 use Drupal\Core\Database\Database;
 use Drupal\image\Entity\ImageStyle;
-use \Drupal\image\ConfigurableImageEffectBase;
+use Drupal\migrate\Entity\Migration;
 use Drupal\migrate\Entity\MigrationInterface;
-use Drupal\migrate\MigrateException;
+use Drupal\migrate\Exception\RequirementsException;
 use Drupal\migrate_drupal\Tests\d6\MigrateDrupal6TestBase;
 
 /**
- * Migrate ImageCache presets to Image styles
+ * Tests migration of ImageCache presets to image styles.
  *
  * @group image
  */
@@ -29,6 +29,29 @@ class MigrateImageCacheTest extends MigrateDrupal6TestBase {
     $this->installConfig(['image']);
   }
 
+  /**
+   * Tests that an exception is thrown when ImageCache is not installed.
+   */
+  public function testMissingTable() {
+    $this->sourceDatabase->update('system')
+      ->fields(array(
+        'status' => 0,
+      ))
+      ->condition('name', 'imagecache')
+      ->condition('type', 'module')
+      ->execute();
+
+    try {
+      Migration::load('d6_imagecache_presets')
+        ->getSourcePlugin()
+        ->checkRequirements();
+      $this->fail('Did not catch expected RequirementsException.');
+    }
+    catch (RequirementsException $e) {
+      $this->pass('Caught expected RequirementsException: ' . $e->getMessage());
+    }
+  }
+
   /**
    * Test basic passing migrations.
    */