Fixed #3034

`craft\fields\data\MultiOptionsFieldData` no longer implements the `craft\base\Serializable` interface, as its `serialize()` method conflicted with PHP’s `Serializable` interface.
craftcms · Jun 30, 2018 · aaa868f · aaa868f
1 parent e67236f
commit aaa868f
Show file tree

Hide file tree

Showing 3 changed files with 19 additions and 19 deletions.
diff --git a/CHANGELOG-v3.md b/CHANGELOG-v3.md
@@ -9,6 +9,7 @@
 - Fixed a bug where user verification links could get mangled when emails were parsed as Markdown, if the verification code contained two or more underscores.
 - Fixed a bug where Craft was misinterpreting `X-Forwarded-For` headers as the user’s IP instead of the server’s IP. ([#3036](https://github.com/craftcms/cms/issues/3036))
 - Fixed a bug where Craft wasn’t auto-scrolling the content container when dragging items near a window edge. ([#2340](https://github.com/craftcms/cms/issues/2340))
+- Fixed a PHP error that occurred when loading a Debug Toolbar panel on a page that contained serialized Checkboxes or Multi-Select field data. ([#3034](https://github.com/craftcms/cms/issues/3034))
 
 ## 3.0.13.2 - 2018-06-27
 

diff --git a/src/fields/BaseOptionsField.php b/src/fields/BaseOptionsField.php
@@ -194,6 +194,23 @@ public function normalizeValue($value, ElementInterface $element = null)
  return $value;
  }
 
+ /**
+ * @inheritdoc
+ */
+ public function serializeValue($value, ElementInterface $element = null)
+ {
+ if ($value instanceof MultiOptionsFieldData) {
+ $serialized = [];
+ foreach ($value as $selectedValue) {
+ /** @var OptionData $selectedValue */
+ $serialized[] = $selectedValue->value;
+ }
+ return Json::encode($serialized);
+ }
+
+ return parent::serializeValue($value, $element);
+ }
+
  /**
  * @inheritdoc
  */

diff --git a/src/fields/data/MultiOptionsFieldData.php b/src/fields/data/MultiOptionsFieldData.php
@@ -7,16 +7,13 @@
 
 namespace craft\fields\data;
 
-use craft\base\Serializable;
-use craft\helpers\Json;
-
 /**
  * Multi-select option field data class.
  *
  * @author Pixel & Tonic, Inc. <support@pixelandtonic.com>
  * @since 3.0
  */
-class MultiOptionsFieldData extends \ArrayObject implements Serializable
+class MultiOptionsFieldData extends \ArrayObject
 {
  // Properties
  // =========================================================================
@@ -66,19 +63,4 @@ public function contains($value): bool
 
  return false;
  }
-
- /**
- * @inheritdoc
- */
- public function serialize()
- {
- $serialized = [];
-
- foreach ($this as $selectedValue) {
- /** @var OptionData $selectedValue */
- $serialized[] = $selectedValue->value;
- }
-
- return Json::encode($serialized);
- }
 }