Revert "Issue #2062573 by claudiu.cristea, tim.plunkett, Xano: Add method...

Revert "Issue #2062573 by claudiu.cristea, tim.plunkett, Xano: Add method defaultConfiguration() in ConfigurablePluginInterface."

This reverts commit bf37effc.

core/modules/image/lib/Drupal/image/ConfigurableImageEffectInterface.php

@@ -12,14 +12,6 @@
  */
 interface ConfigurableImageEffectInterface extends ImageEffectInterface {
 
-  /**
-   * Define the effect configuration defaults.
-   *
-   * @return array
-   *   An associative array with defaults keyed by configuration names.
-   */
-  public function getConfigurationDefaults();
-
   /**
    * Builds the part of the image effect form specific to this image effect.
    *

core/modules/image/lib/Drupal/image/ImageEffectBase.php

@@ -103,17 +103,10 @@ public function setConfiguration(array $configuration) {
       'uuid' => '',
       'weight' => '',
     );
-    $this->configuration = $configuration['data'] + $this->getConfigurationDefaults();
+    $this->configuration = $configuration['data'];
     $this->uuid = $configuration['uuid'];
     $this->weight = $configuration['weight'];
     return $this;
   }
 
-  /**
-   * Fallback for non-configurable effects.
-   */
-  public function getConfigurationDefaults() {
-    return array();
-  }
-
 }

core/modules/image/lib/Drupal/image/Plugin/ImageEffect/CropImageEffect.php

@@ -26,6 +26,11 @@ class CropImageEffect extends ResizeImageEffect {
    * {@inheritdoc}
    */
   public function applyEffect(ImageInterface $image) {
+    // Set sane default values.
+    $this->configuration += array(
+      'anchor' => 'center-center',
+    );
+
     list($x, $y) = explode('-', $this->configuration['anchor']);
     $x = image_filter_keyword($x, $image->getWidth(), $this->configuration['width']);
     $y = image_filter_keyword($y, $image->getHeight(), $this->configuration['height']);
@@ -49,16 +54,12 @@ public function getSummary() {
   /**
    * {@inheritdoc}
    */
-  public function getConfigurationDefaults() {
-    return parent::getConfigurationDefaults() + array(
+  public function getForm() {
+    $this->configuration += array(
+      'width' => '',
+      'height' => '',
       'anchor' => 'center-center',
     );
-  }
-
-  /**
-   * {@inheritdoc}
-   */
-  public function getForm() {
     $form = parent::getForm();
     $form['anchor'] = array(
       '#type' => 'radios',

core/modules/image/lib/Drupal/image/Plugin/ImageEffect/ResizeImageEffect.php

@@ -54,16 +54,6 @@ public function getSummary() {
     );
   }
 
-  /**
-   * {@inheritdoc}
-   */
-  public function getConfigurationDefaults() {
-    return array(
-      'width' => NULL,
-      'height' => NULL,
-    );
-  }
-
   /**
    * {@inheritdoc}
    */
@@ -71,7 +61,7 @@ public function getForm() {
     $form['width'] = array(
       '#type' => 'number',
       '#title' => t('Width'),
-      '#default_value' => $this->configuration['width'],
+      '#default_value' => isset($this->configuration['width']) ? $this->configuration['width'] : '',
       '#field_suffix' => ' ' . t('pixels'),
       '#required' => TRUE,
       '#min' => 1,
@@ -79,7 +69,7 @@ public function getForm() {
     $form['height'] = array(
       '#type' => 'number',
       '#title' => t('Height'),
-      '#default_value' => $this->configuration['height'],
+      '#default_value' => isset($this->configuration['height']) ? $this->configuration['height'] : '',
       '#field_suffix' => ' ' . t('pixels'),
       '#required' => TRUE,
       '#min' => 1,

core/modules/image/lib/Drupal/image/Plugin/ImageEffect/RotateImageEffect.php

@@ -28,6 +28,13 @@ class RotateImageEffect extends ImageEffectBase implements ConfigurableImageEffe
    * {@inheritdoc}
    */
   public function applyEffect(ImageInterface $image) {
+    // Set sane default values.
+    $this->configuration += array(
+      'degrees' => 0,
+      'bgcolor' => NULL,
+      'random' => FALSE,
+    );
+
     // Convert short #FFF syntax to full #FFFFFF syntax.
     if (strlen($this->configuration['bgcolor']) == 4) {
       $c = $this->configuration['bgcolor'];
@@ -82,24 +89,13 @@ public function getSummary() {
     );
   }
 
-  /**
-   * {@inheritdoc}
-   */
-  public function getConfigurationDefaults() {
-    return array(
-      'degrees' => 0,
-      'bgcolor' => NULL,
-      'random' => FALSE,
-    );
-  }
-
   /**
    * {@inheritdoc}
    */
   public function getForm() {
     $form['degrees'] = array(
       '#type' => 'number',
-      '#default_value' => $this->configuration['degrees'],
+      '#default_value' => (isset($this->configuration['degrees'])) ? $this->configuration['degrees'] : 0,
       '#title' => t('Rotation angle'),
       '#description' => t('The number of degrees the image should be rotated. Positive numbers are clockwise, negative are counter-clockwise.'),
       '#field_suffix' => '°',
@@ -107,7 +103,7 @@ public function getForm() {
     );
     $form['bgcolor'] = array(
       '#type' => 'textfield',
-      '#default_value' => $this->configuration['bgcolor'],
+      '#default_value' => (isset($this->configuration['bgcolor'])) ? $this->configuration['bgcolor'] : '#FFFFFF',
       '#title' => t('Background color'),
       '#description' => t('The background color to use for exposed areas of the image. Use web-style hex colors (#FFFFFF for white, #000000 for black). Leave blank for transparency on image types that support it.'),
       '#size' => 7,
@@ -116,7 +112,7 @@ public function getForm() {
     );
     $form['random'] = array(
       '#type' => 'checkbox',
-      '#default_value' => $this->configuration['random'],
+      '#default_value' => (isset($this->configuration['random'])) ? $this->configuration['random'] : 0,
       '#title' => t('Randomize'),
       '#description' => t('Randomize the rotation angle for each image. The angle specified above is used as a maximum.'),
     );

core/modules/image/lib/Drupal/image/Plugin/ImageEffect/ScaleImageEffect.php

@@ -27,6 +27,13 @@ class ScaleImageEffect extends ResizeImageEffect {
    * {@inheritdoc}
    */
   public function applyEffect(ImageInterface $image) {
+    // Set sane default values.
+    $this->configuration += array(
+      'width' => NULL,
+      'height' => NULL,
+      'upscale' => FALSE,
+    );
+
     if (!$image->scale($this->configuration['width'], $this->configuration['height'], $this->configuration['upscale'])) {
       watchdog('image', 'Image scale failed using the %toolkit toolkit on %path (%mimetype, %dimensions)', array('%toolkit' => $image->getToolkitId(), '%path' => $image->getSource(), '%mimetype' => $image->getMimeType(), '%dimensions' => $image->getWidth() . 'x' . $image->getHeight()), WATCHDOG_ERROR);
       return FALSE;
@@ -53,15 +60,6 @@ public function getSummary() {
     );
   }
 
-  /**
-   * {@inheritdoc}
-   */
-  public function getConfigurationDefaults() {
-    return parent::getConfigurationDefaults() + array(
-      'upscale' => FALSE,
-    );
-  }
-
   /**
    * {@inheritdoc}
    */
@@ -72,7 +70,7 @@ public function getForm() {
     $form['height']['#required'] = FALSE;
     $form['upscale'] = array(
       '#type' => 'checkbox',
-      '#default_value' => $this->configuration['upscale'],
+      '#default_value' => (isset($this->configuration['upscale'])) ? $this->configuration['upscale'] : 0,
       '#title' => t('Allow Upscaling'),
       '#description' => t('Let scale make images larger than their original size'),
     );