Convert media action plugins to service provider

plugins/media-action/crop/crop.xml

@@ -9,9 +9,11 @@
 	<authorUrl>www.joomla.org</authorUrl>
 	<version>4.0.0</version>
 	<description>PLG_MEDIA-ACTION_CROP_XML_DESCRIPTION</description>
+	<namespace path="src">Joomla\Plugin\MediaAction\Crop</namespace>
 	<files>
-		<filename plugin="crop">crop.php</filename>
 		<folder>form</folder>
+		<folder plugin="crop">services</folder>
+		<folder>src</folder>
 	</files>
 	<languages>
 		<language tag="en-GB">language/en-GB/plg_media-action_crop.ini</language>

plugins/media-action/crop/services/provider.php

@@ -0,0 +1,47 @@
+<?php
+
+/**
+ * @package     Joomla.Plugin
+ * @subpackage  Media-Action.crop
+ *
+ * @copyright   (C) 2023 Open Source Matters, Inc. <https://www.joomla.org>
+ * @license     GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+defined('_JEXEC') or die;
+
+use Joomla\CMS\Extension\PluginInterface;
+use Joomla\CMS\Factory;
+use Joomla\CMS\Plugin\PluginHelper;
+use Joomla\DI\Container;
+use Joomla\DI\ServiceProviderInterface;
+use Joomla\Event\DispatcherInterface;
+use Joomla\Plugin\MediaAction\Crop\Extension\Crop;
+
+return new class () implements ServiceProviderInterface {
+    /**
+     * Registers the service provider with a DI container.
+     *
+     * @param   Container  $container  The DI container.
+     *
+     * @return  void
+     *
+     * @since   __DEPLOY_VERSION__
+     */
+    public function register(Container $container): void
+    {
+        $container->set(
+            PluginInterface::class,
+            function (Container $container) {
+                $dispatcher = $container->get(DispatcherInterface::class);
+                $plugin     = new Crop(
+                    $dispatcher,
+                    (array) PluginHelper::getPlugin('media-action', 'crop')
+                );
+                $plugin->setApplication(Factory::getApplication());
+
+                return $plugin;
+            }
+        );
+    }
+};

plugins/media-action/crop/crop.php → plugins/media-action/crop/src/Extension/Crop.php

@@ -6,11 +6,12 @@
  *
  * @copyright   (C) 2017 Open Source Matters, Inc. <https://www.joomla.org>
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
-
- * @phpcs:disable PSR1.Classes.ClassDeclaration.MissingNamespace
  */
 
-use Joomla\CMS\Factory;
+namespace Joomla\Plugin\MediaAction\Crop\Extension;
+
+use Joomla\CMS\Application\CMSWebApplicationInterface;
+use Joomla\Component\Media\Administrator\Plugin\MediaActionPlugin;
 
 // phpcs:disable PSR1.Files.SideEffects
 \defined('_JEXEC') or die;
@@ -21,7 +22,7 @@
  *
  * @since  4.0.0
  */
-class PlgMediaActionCrop extends \Joomla\Component\Media\Administrator\Plugin\MediaActionPlugin
+final class Crop extends MediaActionPlugin
 {
     /**
      * Load the javascript files of the plugin.
@@ -34,7 +35,11 @@ protected function loadJs()
     {
         parent::loadJs();
 
-        Factory::getApplication()->getDocument()->getWebAssetManager()->useScript('cropperjs');
+        if (!$this->getApplication() instanceof CMSWebApplicationInterface) {
+            return;
+        }
+
+        $this->getApplication()->getDocument()->getWebAssetManager()->useScript('cropperjs');
     }
 
     /**
@@ -48,6 +53,10 @@ protected function loadCss()
     {
         parent::loadCss();
 
-        Factory::getApplication()->getDocument()->getWebAssetManager()->useStyle('cropperjs');
+        if (!$this->getApplication() instanceof CMSWebApplicationInterface) {
+            return;
+        }
+
+        $this->getApplication()->getDocument()->getWebAssetManager()->useStyle('cropperjs');
     }
 }

plugins/media-action/resize/resize.xml

@@ -9,9 +9,11 @@
 	<authorUrl>www.joomla.org</authorUrl>
 	<version>4.0.0</version>
 	<description>PLG_MEDIA-ACTION_RESIZE_XML_DESCRIPTION</description>
+	<namespace path="src">Joomla\Plugin\MediaAction\Resize</namespace>
 	<files>
-		<filename plugin="resize">resize.php</filename>
 		<folder>form</folder>
+		<folder plugin="resize">services</folder>
+		<folder>src</folder>
 	</files>
 	<languages>
 		<language tag="en-GB">language/en-GB/plg_media-action_resize.ini</language>

plugins/media-action/resize/services/provider.php

@@ -0,0 +1,47 @@
+<?php
+
+/**
+ * @package     Joomla.Plugin
+ * @subpackage  Media-Action.resize
+ *
+ * @copyright   (C) 2023 Open Source Matters, Inc. <https://www.joomla.org>
+ * @license     GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+defined('_JEXEC') or die;
+
+use Joomla\CMS\Extension\PluginInterface;
+use Joomla\CMS\Factory;
+use Joomla\CMS\Plugin\PluginHelper;
+use Joomla\DI\Container;
+use Joomla\DI\ServiceProviderInterface;
+use Joomla\Event\DispatcherInterface;
+use Joomla\Plugin\MediaAction\Resize\Extension\Resize;
+
+return new class () implements ServiceProviderInterface {
+    /**
+     * Registers the service provider with a DI container.
+     *
+     * @param   Container  $container  The DI container.
+     *
+     * @return  void
+     *
+     * @since   __DEPLOY_VERSION__
+     */
+    public function register(Container $container): void
+    {
+        $container->set(
+            PluginInterface::class,
+            function (Container $container) {
+                $dispatcher = $container->get(DispatcherInterface::class);
+                $plugin     = new Resize(
+                    $dispatcher,
+                    (array) PluginHelper::getPlugin('media-action', 'resize')
+                );
+                $plugin->setApplication(Factory::getApplication());
+
+                return $plugin;
+            }
+        );
+    }
+};

plugins/media-action/resize/resize.php → plugins/media-action/resize/src/Extension/Resize.php

@@ -6,11 +6,12 @@
  *
  * @copyright   (C) 2017 Open Source Matters, Inc. <https://www.joomla.org>
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
-
- * @phpcs:disable PSR1.Classes.ClassDeclaration.MissingNamespace
  */
 
+namespace Joomla\Plugin\MediaAction\Resize\Extension;
+
 use Joomla\CMS\Image\Image;
+use Joomla\Component\Media\Administrator\Plugin\MediaActionPlugin;
 
 // phpcs:disable PSR1.Files.SideEffects
 \defined('_JEXEC') or die;
@@ -21,7 +22,7 @@
  *
  * @since  4.0.0
  */
-class PlgMediaActionResize extends \Joomla\Component\Media\Administrator\Plugin\MediaActionPlugin
+final class Resize extends MediaActionPlugin
 {
     /**
      * The save event.
@@ -51,10 +52,7 @@ public function onContentBeforeSave($context, $item, $isNew, $data = [])
 
         $imgObject = new Image(imagecreatefromstring($item->data));
 
-        if (
-            $imgObject->getWidth() < $this->params->get('batch_width', 0)
-            && $imgObject->getHeight() < $this->params->get('batch_height', 0)
-        ) {
+        if ($imgObject->getWidth() < $this->params->get('batch_width', 0) && $imgObject->getHeight() < $this->params->get('batch_height', 0)) {
             return;
         }
 

plugins/media-action/rotate/rotate.xml

@@ -9,9 +9,11 @@
 	<authorUrl>www.joomla.org</authorUrl>
 	<version>4.0.0</version>
 	<description>PLG_MEDIA-ACTION_ROTATE_XML_DESCRIPTION</description>
+	<namespace path="src">Joomla\Plugin\MediaAction\Rotate</namespace>
 	<files>
-		<filename plugin="rotate">rotate.php</filename>
 		<folder>form</folder>
+		<folder plugin="rotate">services</folder>
+		<folder>src</folder>
 	</files>
 	<languages>
 		<language tag="en-GB">language/en-GB/plg_media-action_rotate.ini</language>

plugins/media-action/rotate/services/provider.php

@@ -0,0 +1,47 @@
+<?php
+
+/**
+ * @package     Joomla.Plugin
+ * @subpackage  Media-Action.rotate
+ *
+ * @copyright   (C) 2023 Open Source Matters, Inc. <https://www.joomla.org>
+ * @license     GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+defined('_JEXEC') or die;
+
+use Joomla\CMS\Extension\PluginInterface;
+use Joomla\CMS\Factory;
+use Joomla\CMS\Plugin\PluginHelper;
+use Joomla\DI\Container;
+use Joomla\DI\ServiceProviderInterface;
+use Joomla\Event\DispatcherInterface;
+use Joomla\Plugin\MediaAction\Rotate\Extension\Rotate;
+
+return new class () implements ServiceProviderInterface {
+    /**
+     * Registers the service provider with a DI container.
+     *
+     * @param   Container  $container  The DI container.
+     *
+     * @return  void
+     *
+     * @since   __DEPLOY_VERSION__
+     */
+    public function register(Container $container): void
+    {
+        $container->set(
+            PluginInterface::class,
+            function (Container $container) {
+                $dispatcher = $container->get(DispatcherInterface::class);
+                $plugin     = new Rotate(
+                    $dispatcher,
+                    (array) PluginHelper::getPlugin('media-action', 'rotate')
+                );
+                $plugin->setApplication(Factory::getApplication());
+
+                return $plugin;
+            }
+        );
+    }
+};

plugins/media-action/rotate/rotate.php → plugins/media-action/rotate/src/Extension/Rotate.php

@@ -6,10 +6,12 @@
  *
  * @copyright   (C) 2017 Open Source Matters, Inc. <https://www.joomla.org>
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
-
- * @phpcs:disable PSR1.Classes.ClassDeclaration.MissingNamespace
  */
 
+namespace Joomla\Plugin\MediaAction\Rotate\Extension;
+
+use Joomla\Component\Media\Administrator\Plugin\MediaActionPlugin;
+
 // phpcs:disable PSR1.Files.SideEffects
 \defined('_JEXEC') or die;
 // phpcs:enable PSR1.Files.SideEffects
@@ -19,6 +21,6 @@
  *
  * @since  4.0.0
  */
-class PlgMediaActionRotate extends \Joomla\Component\Media\Administrator\Plugin\MediaActionPlugin
+final class Rotate extends MediaActionPlugin
 {
 }

tests/System/integration/plugins/media-action/crop/CropPlugin.cy.js

@@ -0,0 +1,9 @@
+describe('Test that the crop media action plugin', () => {
+  it('is shown when editing an image', () => {
+    cy.doAdministratorLogin();
+    cy.visit('/administrator/index.php?option=com_media&view=file&mediatypes=0,1,2,3&path=local-images:/joomla_black.png');
+    cy.get('button[role="tab"]:contains(Crop)').click();
+
+    cy.contains('legend', 'Crop');
+  });
+});

tests/System/integration/plugins/media-action/resize/ResizePlugin.cy.js

@@ -0,0 +1,9 @@
+describe('Test that the resize media action plugin', () => {
+  it('is shown when editing an image', () => {
+    cy.doAdministratorLogin();
+    cy.visit('/administrator/index.php?option=com_media&view=file&mediatypes=0,1,2,3&path=local-images:/joomla_black.png');
+    cy.get('button[role="tab"]:contains(Resize)').click();
+
+    cy.contains('legend', 'Resize');
+  });
+});

tests/System/integration/plugins/media-action/rotate/RotatePlugin.cy.js

@@ -0,0 +1,9 @@
+describe('Test that the rotate media action plugin', () => {
+  it('is shown when editing an image', () => {
+    cy.doAdministratorLogin();
+    cy.visit('/administrator/index.php?option=com_media&view=file&mediatypes=0,1,2,3&path=local-images:/joomla_black.png');
+    cy.get('button[role="tab"]:contains(Rotate)').click();
+
+    cy.contains('legend', 'Rotate');
+  });
+});