Fix B/C

joomla · Mar 2, 2024 · f504178 · f504178
1 parent 36aae5f
commit f504178
Show file tree

Hide file tree

Showing 7 changed files with 46 additions and 22 deletions.
diff --git a/administrator/components/com_contact/src/Extension/ContactComponent.php b/administrator/components/com_contact/src/Extension/ContactComponent.php
@@ -19,7 +19,7 @@
 use Joomla\CMS\Extension\BootableExtensionInterface;
 use Joomla\CMS\Extension\MVCComponent;
 use Joomla\CMS\Factory;
-use Joomla\CMS\Fields\FieldsServiceInterface;
+use Joomla\CMS\Fields\FieldsFormServiceInterface;
 use Joomla\CMS\Fields\FieldsServiceTrait;
 use Joomla\CMS\Form\Form;
 use Joomla\CMS\HTML\HTMLRegistryAwareTrait;
@@ -45,7 +45,7 @@
 class ContactComponent extends MVCComponent implements
     BootableExtensionInterface,
     CategoryServiceInterface,
-    FieldsServiceInterface,
+    FieldsFormServiceInterface,
     SchemaorgServiceInterface,
     AssociationServiceInterface,
     RouterServiceInterface,

diff --git a/administrator/components/com_content/src/Extension/ContentComponent.php b/administrator/components/com_content/src/Extension/ContentComponent.php
@@ -19,7 +19,7 @@
 use Joomla\CMS\Extension\BootableExtensionInterface;
 use Joomla\CMS\Extension\MVCComponent;
 use Joomla\CMS\Factory;
-use Joomla\CMS\Fields\FieldsServiceInterface;
+use Joomla\CMS\Fields\FieldsFormServiceInterface;
 use Joomla\CMS\Fields\FieldsServiceTrait;
 use Joomla\CMS\Form\Form;
 use Joomla\CMS\Helper\ContentHelper as LibraryContentHelper;
@@ -48,7 +48,7 @@
 class ContentComponent extends MVCComponent implements
     BootableExtensionInterface,
     CategoryServiceInterface,
-    FieldsServiceInterface,
+    FieldsFormServiceInterface,
     AssociationServiceInterface,
     SchemaorgServiceInterface,
     WorkflowServiceInterface,

diff --git a/administrator/components/com_fields/src/Model/FieldModel.php b/administrator/components/com_fields/src/Model/FieldModel.php
@@ -15,7 +15,7 @@
 use Joomla\CMS\Component\ComponentHelper;
 use Joomla\CMS\Event\CustomFields\PrepareDomEvent;
 use Joomla\CMS\Factory;
-use Joomla\CMS\Fields\FieldsServiceInterface;
+use Joomla\CMS\Fields\FieldsFormServiceInterface;
 use Joomla\CMS\Form\Form;
 use Joomla\CMS\Form\FormHelper;
 use Joomla\CMS\Language\Text;
@@ -1111,7 +1111,7 @@ function () use ($component, $section) {
 
         $componentBooted = Factory::getApplication()->bootComponent($component);
 
-        if ($componentBooted instanceof FieldsServiceInterface) {
+        if ($componentBooted instanceof FieldsFormServiceInterface) {
             $componentBooted->prepareForm($form, $data);
         }
 

diff --git a/administrator/components/com_users/src/Extension/UsersComponent.php b/administrator/components/com_users/src/Extension/UsersComponent.php
@@ -15,7 +15,7 @@
 use Joomla\CMS\Extension\BootableExtensionInterface;
 use Joomla\CMS\Extension\MVCComponent;
 use Joomla\CMS\Factory;
-use Joomla\CMS\Fields\FieldsServiceInterface;
+use Joomla\CMS\Fields\FieldsFormServiceInterface;
 use Joomla\CMS\Fields\FieldsServiceTrait;
 use Joomla\CMS\HTML\HTMLRegistryAwareTrait;
 use Joomla\Component\Users\Administrator\Service\HTML\Users;
@@ -30,7 +30,7 @@
  *
  * @since  4.0.0
  */
-class UsersComponent extends MVCComponent implements BootableExtensionInterface, RouterServiceInterface, FieldsServiceInterface
+class UsersComponent extends MVCComponent implements BootableExtensionInterface, RouterServiceInterface, FieldsFormServiceInterface
 {
     use FieldsServiceTrait;
     use RouterServiceTrait;

diff --git a/libraries/src/Extension/LegacyComponent.php b/libraries/src/Extension/LegacyComponent.php
@@ -19,7 +19,7 @@
 use Joomla\CMS\Component\Router\RouterServiceInterface;
 use Joomla\CMS\Dispatcher\DispatcherInterface;
 use Joomla\CMS\Dispatcher\LegacyComponentDispatcher;
-use Joomla\CMS\Fields\FieldsServiceInterface;
+use Joomla\CMS\Fields\FieldsFormServiceInterface;
 use Joomla\CMS\Fields\FieldsServiceTrait;
 use Joomla\CMS\Menu\AbstractMenu;
 use Joomla\CMS\MVC\Factory\LegacyFactory;
@@ -42,7 +42,7 @@ class LegacyComponent implements
     ComponentInterface,
     MVCFactoryServiceInterface,
     CategoryServiceInterface,
-    FieldsServiceInterface,
+    FieldsFormServiceInterface,
     RouterServiceInterface,
     TagServiceInterface
 {

diff --git a/libraries/src/Fields/FieldsFormServiceInterface.php b/libraries/src/Fields/FieldsFormServiceInterface.php
@@ -0,0 +1,36 @@
+<?php
+
+/**
+ * Joomla! Content Management System
+ *
+ * @copyright  (C) 2024 Open Source Matters, Inc. <https://www.joomla.org>
+ * @license    GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+namespace Joomla\CMS\Fields;
+
+use Joomla\CMS\Form\Form;
+
+// phpcs:disable PSR1.Files.SideEffects
+\defined('_JEXEC') or die;
+// phpcs:enable PSR1.Files.SideEffects
+
+/**
+ * The fields service.
+ *
+ * @since  __DEPLOY_VERSION__
+ */
+interface FieldsFormServiceInterface extends FieldsServiceInterface
+{
+    /**
+     * Prepares the field form
+     *
+     * @param   Form          $form  The form to change
+     * @param   array|object  $data  The form data
+     *
+     * @return  void
+     *
+     * @since   __DEPLOY_VERSION__
+     */
+    public function prepareForm(Form $form, $data);
+}
diff --git a/libraries/src/Fields/FieldsServiceInterface.php b/libraries/src/Fields/FieldsServiceInterface.php
@@ -43,16 +43,4 @@ public function validateSection($section, $item = null);
      * @since   4.0.0
      */
     public function getContexts(): array;
-
-    /**
-     * Prepares the field form
-     *
-     * @param   Form          $form  The form to change
-     * @param   array|object  $data  The form data
-     *
-     * @return  void
-     *
-     * @since   __DEPLOY_VERSION__
-     */
-    public function prepareForm(Form $form, $data);
 }