Skip to content

[4.0] MVC not Mvc #21478

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Aug 9, 2018
Merged

[4.0] MVC not Mvc #21478

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
1ece860
[4.0] MVC mot Mvc
brianteeman Aug 9, 2018
efa27c0
oops
brianteeman Aug 9, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions administrator/components/com_installer/Model/DatabaseModel.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down Expand Up @@ -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']))
{
Expand Down
6 changes: 3 additions & 3 deletions administrator/components/com_workflow/Controller/DisplayController.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;

/**
Expand Down Expand Up @@ -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);

Expand Down
6 changes: 3 additions & 3 deletions administrator/components/com_workflow/Controller/StateController.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;

/**
Expand Down Expand Up @@ -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);

Expand Down
6 changes: 3 additions & 3 deletions administrator/components/com_workflow/Controller/StatesController.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand All @@ -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);

Expand Down
6 changes: 3 additions & 3 deletions administrator/components/com_workflow/Controller/TransitionController.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;

/**
Expand Down Expand Up @@ -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);

Expand Down
6 changes: 3 additions & 3 deletions administrator/components/com_workflow/Controller/WorkflowController.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;

/**
Expand All @@ -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);

Expand Down
6 changes: 3 additions & 3 deletions administrator/components/com_workflow/Controller/WorkflowsController.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;

Expand All @@ -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');
Expand Down
2 changes: 2 additions & 0 deletions libraries/src/Form/Field/RadioField.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 = '';
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

What's this change doing?

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

oops shouldnt be there

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

fixed

$this->layout = 'joomla.form.field.radio.switcher';
}

Expand Down