From bc5d771b72c89b8a4341a3f1cbb14def8318f7c7 Mon Sep 17 00:00:00 2001
From: nagyad <joevagyok@gmail.com>
Date: Fri, 30 Jun 2023 11:10:07 +0200
Subject: [PATCH 1/2] Release-1.24.0: Update changelog.

---
 CHANGELOG.md | 17 ++++++++++++++++-
 1 file changed, 16 insertions(+), 1 deletion(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 4df90186..39e0437e 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,13 +1,24 @@
-# Change Log
+# Changelog
+
+## [1.24.0](https://github.com/openeuropa/oe_media/tree/1.24.0) (2023-06-30)
+
+[Full Changelog](https://github.com/openeuropa/oe_media/compare/1.23.1...1.24.0)
+
+**Merged pull requests:**
+
+- EWPP-2775: Replace 'service' by 'utility' for opwidget. [\#224](https://github.com/openeuropa/oe_media/pull/224) ([sergepavle](https://github.com/sergepavle))
 
 ## [1.23.1](https://github.com/openeuropa/oe_media/tree/1.23.1) (2023-04-11)
+
 [Full Changelog](https://github.com/openeuropa/oe_media/compare/1.23.0...1.23.1)
 
 **Merged pull requests:**
 
+- Prepare changelog for release 1.23.1 [\#227](https://github.com/openeuropa/oe_media/pull/227) ([22Alexandra](https://github.com/22Alexandra))
 - EWPP-3006: Fix oe\_webtools version. [\#226](https://github.com/openeuropa/oe_media/pull/226) ([22Alexandra](https://github.com/22Alexandra))
 
 ## [1.23.0](https://github.com/openeuropa/oe_media/tree/1.23.0) (2023-04-11)
+
 [Full Changelog](https://github.com/openeuropa/oe_media/compare/1.22.0...1.23.0)
 
 **Merged pull requests:**
@@ -16,6 +27,7 @@
 - EWPP-3006: Drupal 10 compatibility. [\#223](https://github.com/openeuropa/oe_media/pull/223) ([brummbar](https://github.com/brummbar))
 
 ## [1.22.0](https://github.com/openeuropa/oe_media/tree/1.22.0) (2023-03-06)
+
 [Full Changelog](https://github.com/openeuropa/oe_media/compare/1.21.2...1.22.0)
 
 **Closed issues:**
@@ -28,6 +40,7 @@
 - ISSUE-204: Make sure the field exists before updating its description. [\#205](https://github.com/openeuropa/oe_media/pull/205) ([22Alexandra](https://github.com/22Alexandra))
 
 ## [1.21.2](https://github.com/openeuropa/oe_media/tree/1.21.2) (2023-01-31)
+
 [Full Changelog](https://github.com/openeuropa/oe_media/compare/1.21.1...1.21.2)
 
 **Fixed bugs:**
@@ -40,6 +53,7 @@
 - EWPP-2932: Update dependencies dev branches. [\#218](https://github.com/openeuropa/oe_media/pull/218) ([22Alexandra](https://github.com/22Alexandra))
 
 ## [1.21.1](https://github.com/openeuropa/oe_media/tree/1.21.1) (2023-01-12)
+
 [Full Changelog](https://github.com/openeuropa/oe_media/compare/1.21.0...1.21.1)
 
 **Merged pull requests:**
@@ -48,6 +62,7 @@
 - OEL-2150: Fix assumptions that all medias using image source are coming from oe\_media. [\#213](https://github.com/openeuropa/oe_media/pull/213) ([brummbar](https://github.com/brummbar))
 
 ## [1.21.0](https://github.com/openeuropa/oe_media/tree/1.21.0) (2022-12-05)
+
 [Full Changelog](https://github.com/openeuropa/oe_media/compare/1.20.0...1.21.0)
 
 **Merged pull requests:**

From 0c2c101b5c7d8127ec337ca4bbfe365943e0f31a Mon Sep 17 00:00:00 2001
From: nagyad <joevagyok@gmail.com>
Date: Fri, 30 Jun 2023 11:49:36 +0200
Subject: [PATCH 2/2] Release-1.24.0: Fix phpcs issues.

---
 modules/oe_media_iframe/oe_media_iframe.post_update.php    | 2 +-
 modules/oe_media_iframe/src/Plugin/media/Source/Iframe.php | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/modules/oe_media_iframe/oe_media_iframe.post_update.php b/modules/oe_media_iframe/oe_media_iframe.post_update.php
index c5b3bb5d..697b1649 100644
--- a/modules/oe_media_iframe/oe_media_iframe.post_update.php
+++ b/modules/oe_media_iframe/oe_media_iframe.post_update.php
@@ -7,8 +7,8 @@
 
 declare(strict_types = 1);
 
-use Drupal\Core\Config\FileStorage;
 use Drupal\Component\Utility\Crypt;
+use Drupal\Core\Config\FileStorage;
 use Drupal\field\Entity\FieldConfig;
 use Drupal\filter\Entity\FilterFormat;
 
diff --git a/modules/oe_media_iframe/src/Plugin/media/Source/Iframe.php b/modules/oe_media_iframe/src/Plugin/media/Source/Iframe.php
index 8c902e4c..52406e86 100644
--- a/modules/oe_media_iframe/src/Plugin/media/Source/Iframe.php
+++ b/modules/oe_media_iframe/src/Plugin/media/Source/Iframe.php
@@ -6,9 +6,9 @@
 
 use Drupal\Core\Entity\Display\EntityFormDisplayInterface;
 use Drupal\Core\Entity\Display\EntityViewDisplayInterface;
+use Drupal\Core\Form\FormStateInterface;
 use Drupal\file\FileInterface;
 use Drupal\media\MediaInterface;
-use Drupal\Core\Form\FormStateInterface;
 use Drupal\media\MediaSourceBase;
 use Drupal\media\MediaTypeInterface;