diff --git a/administrator/components/com_contact/src/Extension/ContactComponent.php b/administrator/components/com_contact/src/Extension/ContactComponent.php index 73d1ed69cde8e..a80efb8e76315 100644 --- 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\FieldsFormServiceInterface; +use Joomla\CMS\Fields\FieldsServiceInterface; 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, - FieldsFormServiceInterface, + FieldsServiceInterface, SchemaorgServiceInterface, AssociationServiceInterface, RouterServiceInterface, diff --git a/administrator/components/com_content/src/Extension/ContentComponent.php b/administrator/components/com_content/src/Extension/ContentComponent.php index a27ddb5a396b9..1397363a3441c 100644 --- 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\FieldsFormServiceInterface; +use Joomla\CMS\Fields\FieldsServiceInterface; use Joomla\CMS\Fields\FieldsServiceTrait; use Joomla\CMS\Form\Form; use Joomla\CMS\Helper\ContentHelper as LibraryContentHelper; @@ -50,7 +50,7 @@ class ContentComponent extends MVCComponent implements BootableExtensionInterface, CategoryServiceInterface, - FieldsFormServiceInterface, + FieldsServiceInterface, AssociationServiceInterface, SchemaorgServiceInterface, WorkflowServiceInterface, diff --git a/administrator/components/com_fields/src/Model/FieldModel.php b/administrator/components/com_fields/src/Model/FieldModel.php index 18e2d8b5aefb3..0a560161cf51e 100644 --- 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\FieldsFormServiceInterface; +use Joomla\CMS\Fields\FieldsServiceInterface; use Joomla\CMS\Form\Form; use Joomla\CMS\Form\FormHelper; use Joomla\CMS\Language\Text; @@ -1135,7 +1135,7 @@ function () use ($component, $section) { $componentBooted = Factory::getApplication()->bootComponent($component); - if ($componentBooted instanceof FieldsFormServiceInterface) { + if ($componentBooted instanceof FieldsServiceInterface) { $componentBooted->prepareForm($form, $data); } diff --git a/administrator/components/com_users/src/Extension/UsersComponent.php b/administrator/components/com_users/src/Extension/UsersComponent.php index 33964a7a87ccf..6dd0d168a031c 100644 --- 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\FieldsFormServiceInterface; +use Joomla\CMS\Fields\FieldsServiceInterface; 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, FieldsFormServiceInterface +class UsersComponent extends MVCComponent implements BootableExtensionInterface, RouterServiceInterface, FieldsServiceInterface { use FieldsServiceTrait; use RouterServiceTrait; diff --git a/libraries/src/Extension/LegacyComponent.php b/libraries/src/Extension/LegacyComponent.php index dcb61435781a4..fb9b432675104 100644 --- 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\FieldsFormServiceInterface; +use Joomla\CMS\Fields\FieldsServiceInterface; 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, - FieldsFormServiceInterface, + FieldsServiceInterface, RouterServiceInterface, TagServiceInterface { diff --git a/libraries/src/Fields/FieldsFormServiceInterface.php b/libraries/src/Fields/FieldsFormServiceInterface.php deleted file mode 100644 index e1bd9452fe224..0000000000000 --- a/libraries/src/Fields/FieldsFormServiceInterface.php +++ /dev/null @@ -1,44 +0,0 @@ - - * @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 5.1.0 - * - * @deprecated 5.1.0 will be removed in 7.0 - */ -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 5.1.0 - * - * @todo 7.0 Move to FieldsServiceInterface - * - * @deprecated 5.1.0 will be removed in 7.0 - * Use the FieldServiceInterface instead - * - */ - public function prepareForm(Form $form, $data); -} diff --git a/libraries/src/Fields/FieldsServiceInterface.php b/libraries/src/Fields/FieldsServiceInterface.php index 4d564ebdf186b..1f027601d8f74 100644 --- a/libraries/src/Fields/FieldsServiceInterface.php +++ b/libraries/src/Fields/FieldsServiceInterface.php @@ -9,6 +9,8 @@ namespace Joomla\CMS\Fields; +use Joomla\CMS\Form\Form; + // phpcs:disable PSR1.Files.SideEffects \defined('_JEXEC') or die; // phpcs:enable PSR1.Files.SideEffects @@ -41,4 +43,16 @@ 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); } diff --git a/phpstan-baseline.neon b/phpstan-baseline.neon index 19b608b070a0a..64ee94a93e79e 100644 --- a/phpstan-baseline.neon +++ b/phpstan-baseline.neon @@ -835,15 +835,6 @@ parameters: count: 2 path: administrator/components/com_contact/src/Extension/ContactComponent.php - - - message: ''' - #^Class Joomla\\Component\\Contact\\Administrator\\Extension\\ContactComponent implements deprecated interface Joomla\\CMS\\Fields\\FieldsFormServiceInterface\: - 5\.1\.0 will be removed in 7\.0$# - ''' - identifier: class.implementsDeprecatedInterface - count: 1 - path: administrator/components/com_contact/src/Extension/ContactComponent.php - - message: ''' #^Call to deprecated method getDbo\(\) of class Joomla\\CMS\\Factory\: @@ -998,15 +989,6 @@ parameters: count: 1 path: administrator/components/com_content/src/Extension/ContentComponent.php - - - message: ''' - #^Class Joomla\\Component\\Content\\Administrator\\Extension\\ContentComponent implements deprecated interface Joomla\\CMS\\Fields\\FieldsFormServiceInterface\: - 5\.1\.0 will be removed in 7\.0$# - ''' - identifier: class.implementsDeprecatedInterface - count: 1 - path: administrator/components/com_content/src/Extension/ContentComponent.php - - message: ''' #^Call to deprecated method getDbo\(\) of class Joomla\\CMS\\Factory\: @@ -1409,15 +1391,6 @@ parameters: count: 5 path: administrator/components/com_fields/src/Model/FieldModel.php - - - message: ''' - #^Call to method prepareForm\(\) of deprecated interface Joomla\\CMS\\Fields\\FieldsFormServiceInterface\: - 5\.1\.0 will be removed in 7\.0$# - ''' - identifier: method.deprecatedInterface - count: 1 - path: administrator/components/com_fields/src/Model/FieldModel.php - - message: ''' #^Call to deprecated method getLanguage\(\) of class Joomla\\CMS\\Factory\: @@ -4944,15 +4917,6 @@ parameters: count: 2 path: administrator/components/com_users/src/Controller/UsersController.php - - - message: ''' - #^Class Joomla\\Component\\Users\\Administrator\\Extension\\UsersComponent implements deprecated interface Joomla\\CMS\\Fields\\FieldsFormServiceInterface\: - 5\.1\.0 will be removed in 7\.0$# - ''' - identifier: class.implementsDeprecatedInterface - count: 1 - path: administrator/components/com_users/src/Extension/UsersComponent.php - - message: ''' #^Call to deprecated method getDbo\(\) of class Joomla\\CMS\\Factory\: @@ -9612,15 +9576,6 @@ parameters: count: 1 path: libraries/src/Extension/LegacyComponent.php - - - message: ''' - #^Class Joomla\\CMS\\Extension\\LegacyComponent implements deprecated interface Joomla\\CMS\\Fields\\FieldsFormServiceInterface\: - 5\.1\.0 will be removed in 7\.0$# - ''' - identifier: class.implementsDeprecatedInterface - count: 1 - path: libraries/src/Extension/LegacyComponent.php - - message: ''' #^Instantiation of deprecated class Joomla\\CMS\\Component\\Router\\RouterLegacy\: