From 1ece860d942682f2c0975aa4149f54b50f674f1b Mon Sep 17 00:00:00 2001 From: Brian Teeman Date: Thu, 9 Aug 2018 11:22:43 +0100 Subject: [PATCH 1/2] [4.0] MVC mot Mvc Codestyle --- .../components/com_installer/Model/DatabaseModel.php | 6 +++--- .../com_workflow/Controller/DisplayController.php | 6 +++--- .../components/com_workflow/Controller/StateController.php | 6 +++--- .../components/com_workflow/Controller/StatesController.php | 6 +++--- .../com_workflow/Controller/TransitionController.php | 6 +++--- .../com_workflow/Controller/WorkflowController.php | 6 +++--- .../com_workflow/Controller/WorkflowsController.php | 6 +++--- libraries/src/Form/Field/RadioField.php | 2 ++ 8 files changed, 23 insertions(+), 21 deletions(-) diff --git a/administrator/components/com_installer/Model/DatabaseModel.php b/administrator/components/com_installer/Model/DatabaseModel.php index c5adc8682477d..8511e23c6f91f 100644 --- a/administrator/components/com_installer/Model/DatabaseModel.php +++ b/administrator/components/com_installer/Model/DatabaseModel.php @@ -13,7 +13,7 @@ use Joomla\CMS\Component\ComponentHelper; use Joomla\CMS\Factory; use Joomla\CMS\Language\Text; -use Joomla\CMS\Mvc\Factory\MvcFactoryInterface; +use Joomla\CMS\MVC\Factory\MVCFactoryInterface; use Joomla\CMS\Schema\ChangeSet; use Joomla\CMS\Table\Extension; use Joomla\CMS\Version; @@ -62,12 +62,12 @@ class DatabaseModel extends InstallerModel * Constructor. * * @param array $config An optional associative array of configuration settings. - * @param MvcFactoryInterface $factory The factory. + * @param MVCFactoryInterface $factory The factory. * * @see ListModel * @since 4.0.0 */ - public function __construct($config = array(), MvcFactoryInterface $factory = null) + public function __construct($config = array(), MVCFactoryInterface $factory = null) { if (empty($config['filter_fields'])) { diff --git a/administrator/components/com_workflow/Controller/DisplayController.php b/administrator/components/com_workflow/Controller/DisplayController.php index 504308afa5171..115509e77b5f6 100644 --- a/administrator/components/com_workflow/Controller/DisplayController.php +++ b/administrator/components/com_workflow/Controller/DisplayController.php @@ -12,7 +12,7 @@ defined('_JEXEC') or die; use Joomla\Component\Categories\Administrator\Helper\CategoriesHelper; -use Joomla\CMS\Mvc\Factory\MvcFactoryInterface; +use Joomla\CMS\MVC\Factory\MVCFactoryInterface; use Joomla\CMS\MVC\Controller\BaseController; /** @@ -42,13 +42,13 @@ class DisplayController extends BaseController * Constructor. * * @param array $config An optional associative array of configuration settings. - * @param MvcFactoryInterface $factory The factory. + * @param MVCFactoryInterface $factory The factory. * @param CMSApplication $app The JApplication for the dispatcher * @param \JInput $input Input * * @since __DEPLOY_VERSION__ */ - public function __construct($config = array(), MvcFactoryInterface $factory = null, $app = null, $input = null) + public function __construct($config = array(), MVCFactoryInterface $factory = null, $app = null, $input = null) { parent::__construct($config, $factory, $app, $input); diff --git a/administrator/components/com_workflow/Controller/StateController.php b/administrator/components/com_workflow/Controller/StateController.php index 697a18fa6a48e..2851e8986b296 100644 --- a/administrator/components/com_workflow/Controller/StateController.php +++ b/administrator/components/com_workflow/Controller/StateController.php @@ -11,7 +11,7 @@ defined('_JEXEC') or die; use Joomla\CMS\Factory; -use Joomla\CMS\Mvc\Factory\MvcFactoryInterface; +use Joomla\CMS\MVC\Factory\MVCFactoryInterface; use Joomla\CMS\MVC\Controller\FormController; /** @@ -43,14 +43,14 @@ class StateController extends FormController * Constructor. * * @param array $config An optional associative array of configuration settings. - * @param MvcFactoryInterface $factory The factory. + * @param MVCFactoryInterface $factory The factory. * @param \CMSApplication $app The JApplication for the dispatcher * @param \JInput $input Input * * @since __DEPLOY_VERSION__ * @see \JControllerLegacy */ - public function __construct($config = array(), MvcFactoryInterface $factory = null, $app = null, $input = null) + public function __construct($config = array(), MVCFactoryInterface $factory = null, $app = null, $input = null) { parent::__construct($config, $factory, $app, $input); diff --git a/administrator/components/com_workflow/Controller/StatesController.php b/administrator/components/com_workflow/Controller/StatesController.php index aa152d35d7b1f..1fe50790a7ff1 100644 --- a/administrator/components/com_workflow/Controller/StatesController.php +++ b/administrator/components/com_workflow/Controller/StatesController.php @@ -10,7 +10,7 @@ defined('_JEXEC') or die; -use Joomla\CMS\Mvc\Factory\MvcFactoryInterface; +use Joomla\CMS\MVC\Factory\MVCFactoryInterface; use Joomla\Utilities\ArrayHelper; use Joomla\CMS\MVC\Controller\AdminController; use Joomla\CMS\Language\Text; @@ -30,13 +30,13 @@ class StatesController extends AdminController * @param array $config An optional associative array of configuration settings. * Recognized key values include 'name', 'default_task', 'model_path', and * 'view_path' (this list is not meant to be comprehensive). - * @param MvcFactoryInterface $factory The factory. + * @param MVCFactoryInterface $factory The factory. * @param CmsApplication $app The JApplication for the dispatcher * @param \JInput $input Input * * @since __DEPLOY_VERSION__ */ - public function __construct(array $config = array(), MvcFactoryInterface $factory = null, $app = null, $input = null) + public function __construct(array $config = array(), MVCFactoryInterface $factory = null, $app = null, $input = null) { parent::__construct($config, $factory, $app, $input); diff --git a/administrator/components/com_workflow/Controller/TransitionController.php b/administrator/components/com_workflow/Controller/TransitionController.php index 8579a3aa81763..308219ed946a3 100644 --- a/administrator/components/com_workflow/Controller/TransitionController.php +++ b/administrator/components/com_workflow/Controller/TransitionController.php @@ -11,7 +11,7 @@ defined('_JEXEC') or die; use Joomla\CMS\Factory; -use Joomla\CMS\Mvc\Factory\MvcFactoryInterface; +use Joomla\CMS\MVC\Factory\MVCFactoryInterface; use Joomla\CMS\MVC\Controller\FormController; /** @@ -43,14 +43,14 @@ class TransitionController extends FormController * Constructor. * * @param array $config An optional associative array of configuration settings. - * @param MvcFactoryInterface $factory The factory. + * @param MVCFactoryInterface $factory The factory. * @param \CMSApplication $app The JApplication for the dispatcher * @param \JInput $input Input * * @since __DEPLOY_VERSION__ * @see \JControllerLegacy */ - public function __construct($config = array(), MvcFactoryInterface $factory = null, $app = null, $input = null) + public function __construct($config = array(), MVCFactoryInterface $factory = null, $app = null, $input = null) { parent::__construct($config, $factory, $app, $input); diff --git a/administrator/components/com_workflow/Controller/WorkflowController.php b/administrator/components/com_workflow/Controller/WorkflowController.php index 8876255948fdc..2f9c61a7497ff 100644 --- a/administrator/components/com_workflow/Controller/WorkflowController.php +++ b/administrator/components/com_workflow/Controller/WorkflowController.php @@ -11,7 +11,7 @@ defined('_JEXEC') or die; use Joomla\CMS\Factory; -use Joomla\CMS\Mvc\Factory\MvcFactoryInterface; +use Joomla\CMS\MVC\Factory\MVCFactoryInterface; use Joomla\CMS\MVC\Controller\FormController; /** @@ -35,14 +35,14 @@ class WorkflowController extends FormController * Constructor. * * @param array $config An optional associative array of configuration settings. - * @param MvcFactoryInterface $factory The factory. + * @param MVCFactoryInterface $factory The factory. * @param \CMSApplication $app The JApplication for the dispatcher * @param \JInput $input Input * * @since __DEPLOY_VERSION__ * @see \JControllerLegacy */ - public function __construct($config = array(), MvcFactoryInterface $factory = null, $app = null, $input = null) + public function __construct($config = array(), MVCFactoryInterface $factory = null, $app = null, $input = null) { parent::__construct($config, $factory, $app, $input); diff --git a/administrator/components/com_workflow/Controller/WorkflowsController.php b/administrator/components/com_workflow/Controller/WorkflowsController.php index bbff925541070..d7b0ccf6f4c0d 100644 --- a/administrator/components/com_workflow/Controller/WorkflowsController.php +++ b/administrator/components/com_workflow/Controller/WorkflowsController.php @@ -11,7 +11,7 @@ defined('_JEXEC') or die; use Joomla\CMS\MVC\Controller\AdminController; -use Joomla\CMS\Mvc\Factory\MvcFactoryInterface; +use Joomla\CMS\MVC\Factory\MVCFactoryInterface; use Joomla\Utilities\ArrayHelper; use Joomla\CMS\Language\Text; @@ -30,13 +30,13 @@ class WorkflowsController extends AdminController * @param array $config An optional associative array of configuration settings. * Recognized key values include 'name', 'default_task', 'model_path', and * 'view_path' (this list is not meant to be comprehensive). - * @param MvcFactoryInterface $factory The factory. + * @param MVCFactoryInterface $factory The factory. * @param CmsApplication $app The JApplication for the dispatcher * @param \JInput $input Input * * @since __DEPLOY_VERSION__ */ - public function __construct(array $config = array(), MvcFactoryInterface $factory = null, $app = null, $input = null) + public function __construct(array $config = array(), MVCFactoryInterface $factory = null, $app = null, $input = null) { parent::__construct($config, $factory, $app, $input); $this->registerTask('unsetDefault', 'setDefault'); diff --git a/libraries/src/Form/Field/RadioField.php b/libraries/src/Form/Field/RadioField.php index a78986dc015ab..a140b9f2e1d6d 100644 --- a/libraries/src/Form/Field/RadioField.php +++ b/libraries/src/Form/Field/RadioField.php @@ -62,6 +62,8 @@ public function setup(\SimpleXMLElement $element, $value, $group = null) // The layout for Switcher if (!$element['layout'] && strpos(trim($this->class), 'switcher') === 0) { + + $this->renderLabelLayout = ''; $this->layout = 'joomla.form.field.radio.switcher'; } From efa27c0b6767bc4806fd449ec5b3d0a150d857a5 Mon Sep 17 00:00:00 2001 From: Brian Teeman Date: Thu, 9 Aug 2018 12:05:25 +0100 Subject: [PATCH 2/2] oops --- libraries/src/Form/Field/RadioField.php | 2 -- 1 file changed, 2 deletions(-) diff --git a/libraries/src/Form/Field/RadioField.php b/libraries/src/Form/Field/RadioField.php index a140b9f2e1d6d..a78986dc015ab 100644 --- a/libraries/src/Form/Field/RadioField.php +++ b/libraries/src/Form/Field/RadioField.php @@ -62,8 +62,6 @@ public function setup(\SimpleXMLElement $element, $value, $group = null) // The layout for Switcher if (!$element['layout'] && strpos(trim($this->class), 'switcher') === 0) { - - $this->renderLabelLayout = ''; $this->layout = 'joomla.form.field.radio.switcher'; }