--- D:/Projecten/Drupal8/drupal/interdiff-4.txt Mon May 05 15:38:57 2014 +++ D:/Projecten/Drupal8/drupal/interdiff-8.txt Mon May 05 15:36:25 2014 diff --git a/core/lib/Drupal/Core/ImageToolkit/ImageToolkitBase.php b/core/lib/Drupal/Core/ImageToolkit/ImageToolkitBase.php index 4f28a6e..85dbe02 100644 --- a/core/lib/Drupal/Core/ImageToolkit/ImageToolkitBase.php +++ b/core/lib/Drupal/Core/ImageToolkit/ImageToolkitBase.php @@ -7,11 +7,36 @@ namespace Drupal\Core\ImageToolkit; +use Drupal\Core\Image\ImageInterface; use Drupal\Core\Plugin\PluginBase; abstract class ImageToolkitBase extends PluginBase implements ImageToolkitInterface { /** + * Image object this toolkit instance is tied to. + * + * @var \Drupal\Core\Image\ImageInterface + */ + protected $image; + + /** + * {@inheritdoc} + */ + public function setImage(ImageInterface $image) { + if ($this->image) { + throw new \BadMethodCallException(__METHOD__ . '() may only be called once.'); + } + $this->image = $image; + } + + /** + * {@inheritdoc} + */ + public function getImage() { + return $this->image; + } + + /** * {@inheritdoc} */ public function getRequirements() { diff --git a/core/lib/Drupal/Core/ImageToolkit/ImageToolkitInterface.php b/core/lib/Drupal/Core/ImageToolkit/ImageToolkitInterface.php index b7f4c8c..4c6f375 100644 --- a/core/lib/Drupal/Core/ImageToolkit/ImageToolkitInterface.php @@ -90,7 +131,8 @@ - * Scales an image to the specified size. + * Sets the image object that this toolkit instance is tied to. + * + * @throws \BadMethodCallException when called twice. + * @throws \BadMethodCallException + * When called twice. * * @param \Drupal\Core\Image\ImageInterface $image - * An image object. @@ -368,45 +410,17 @@ @@ -8,7 +8,6 @@ namespace Drupal\system\Plugin\ImageToolkit; +use BadMethodCallException; use Drupal\Component\Utility\Unicode; use Drupal\Core\Image\ImageInterface; -use Drupal\Core\Image\ImageInterface; use Drupal\Core\ImageToolkit\ImageToolkitBase; @@ -23,6 +24,13 @@ class GDToolkit extends ImageToolkitBase { use Drupal\Component\Utility\Image as ImageUtility; /** + * Image object this toolkit instance is tied to.. - * - * @var \Drupal\Core\Image\ImageInterface - */ - protected $image; - - /** - * A GD image resource. - * - * @var resource -@@ -37,6 +45,23 @@ class GDToolkit extends ImageToolkitBase { +@@ -35,7 +34,6 @@ class GDToolkit extends ImageToolkitBase { + * @var int + */ protected $type; - + /** - * {@inheritdoc} - */ - public function setImage(ImageInterface $image) { - if ($this->image) { - throw new BadMethodCallException(__METHOD__ . '() may only be called once'); - } - $this->image = $image; - } - - /** - * {@inheritdoc} - */ - public function getImage() { - return $this->image; - } - - /** * Sets the GD image resource. * @@ -88,7 +86,7 @@ public function settingsFormSubmit($form, &$form_state) {