Skip to content

[5.1] Change item type to stdClass #42960

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
bembelimen merged 6 commits into from
Mar 27, 2024
Merged

[5.1] Change item type to stdClass #42960

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
6367b13
Change item type to stdClass
laoneo Mar 5, 2024
b58d1b9
Merge branch '5.1-dev' into views/stdclass
laoneo Mar 5, 2024
1126544
Merge branch '5.1-dev' into views/stdclass
laoneo Mar 6, 2024
2ec0734
Merge branch '5.1-dev' into views/stdclass
laoneo Mar 19, 2024
8c441f7
Merge branch '5.1-dev' into views/stdclass
laoneo Mar 26, 2024
2723889
Merge branch '5.1-dev' into views/stdclass
LadySolveig Mar 27, 2024
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
3 changes: 1 addition & 2 deletions administrator/components/com_banners/src/View/Client/HtmlView.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,6 @@
use Joomla\CMS\Language\Text;
use Joomla\CMS\MVC\View\GenericDataException;
use Joomla\CMS\MVC\View\HtmlView as BaseHtmlView;
use Joomla\CMS\Object\CMSObject;
use Joomla\CMS\Toolbar\Toolbar;
use Joomla\CMS\Toolbar\ToolbarHelper;
use Joomla\Component\Banners\Administrator\Model\ClientModel;
Expand All @@ -44,7 +43,7 @@ class HtmlView extends BaseHtmlView
/**
* The active item
*
* @var CMSObject
* @var \stdClass
* @since 1.5
*/
protected $item;
Expand Down
3 changes: 1 addition & 2 deletions administrator/components/com_fields/src/View/Field/HtmlView.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,6 @@
use Joomla\CMS\Language\Text;
use Joomla\CMS\MVC\View\GenericDataException;
use Joomla\CMS\MVC\View\HtmlView as BaseHtmlView;
use Joomla\CMS\Object\CMSObject;
use Joomla\CMS\Toolbar\Toolbar;
use Joomla\CMS\Toolbar\ToolbarHelper;
use Joomla\Filesystem\Path;
Expand All @@ -39,7 +38,7 @@ class HtmlView extends BaseHtmlView
protected $form;

/**
* @var CMSObject
* @var \stdClass
*
* @since 3.7.0
*/
Expand Down
3 changes: 1 addition & 2 deletions administrator/components/com_fields/src/View/Group/HtmlView.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,6 @@
use Joomla\CMS\Language\Text;
use Joomla\CMS\MVC\View\GenericDataException;
use Joomla\CMS\MVC\View\HtmlView as BaseHtmlView;
use Joomla\CMS\Object\CMSObject;
use Joomla\CMS\Toolbar\Toolbar;
use Joomla\CMS\Toolbar\ToolbarHelper;
use Joomla\Component\Fields\Administrator\Helper\FieldsHelper;
Expand All @@ -40,7 +39,7 @@ class HtmlView extends BaseHtmlView
protected $form;

/**
* @var CMSObject
* @var \stdClass
*
* @since 3.7.0
*/
Expand Down
3 changes: 1 addition & 2 deletions administrator/components/com_finder/src/View/Filter/HtmlView.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,6 @@
use Joomla\CMS\Language\Text;
use Joomla\CMS\MVC\View\GenericDataException;
use Joomla\CMS\MVC\View\HtmlView as BaseHtmlView;
use Joomla\CMS\Object\CMSObject;
use Joomla\CMS\Toolbar\Toolbar;
use Joomla\CMS\Toolbar\ToolbarHelper;

Expand Down Expand Up @@ -51,7 +50,7 @@ class HtmlView extends BaseHtmlView
/**
* The active item
*
* @var CMSObject|boolean
* @var \stdClass
*
* @since 3.6.2
*/
Expand Down
2 changes: 1 addition & 1 deletion administrator/components/com_guidedtours/src/View/Step/HtmlView.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@ class HtmlView extends BaseHtmlView
/**
* The active item
*
* @var object
* @var \stdClass
*/
protected $item;

Expand Down
2 changes: 1 addition & 1 deletion administrator/components/com_mails/src/View/Template/HtmlView.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@ class HtmlView extends BaseHtmlView
/**
* The active item
*
* @var CMSObject
* @var \stdClass
*/
protected $item;

Expand Down
3 changes: 1 addition & 2 deletions administrator/components/com_menus/src/View/Item/HtmlView.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,6 @@
use Joomla\CMS\Language\Text;
use Joomla\CMS\MVC\View\GenericDataException;
use Joomla\CMS\MVC\View\HtmlView as BaseHtmlView;
use Joomla\CMS\Object\CMSObject;
use Joomla\CMS\Toolbar\Toolbar;
use Joomla\CMS\Toolbar\ToolbarHelper;

Expand All @@ -42,7 +41,7 @@ class HtmlView extends BaseHtmlView
/**
* The active item
*
* @var CMSObject
* @var \stdClass
*/
protected $item;

Expand Down
3 changes: 1 addition & 2 deletions administrator/components/com_newsfeeds/src/View/Newsfeeds/HtmlView.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,6 @@
use Joomla\CMS\Language\Text;
use Joomla\CMS\MVC\View\GenericDataException;
use Joomla\CMS\MVC\View\HtmlView as BaseHtmlView;
use Joomla\CMS\Object\CMSObject;
use Joomla\CMS\Toolbar\Button\DropdownButton;
use Joomla\CMS\Toolbar\Toolbar;
use Joomla\CMS\Toolbar\ToolbarHelper;
Expand All @@ -35,7 +34,7 @@ class HtmlView extends BaseHtmlView
/**
* The list of newsfeeds
*
* @var CMSObject
* @var array
*
* @since 1.6
*/
Expand Down
3 changes: 1 addition & 2 deletions administrator/components/com_plugins/src/View/Plugin/HtmlView.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,6 @@
use Joomla\CMS\Language\Text;
use Joomla\CMS\MVC\View\GenericDataException;
use Joomla\CMS\MVC\View\HtmlView as BaseHtmlView;
use Joomla\CMS\Object\CMSObject;
use Joomla\CMS\Toolbar\Toolbar;
use Joomla\CMS\Toolbar\ToolbarHelper;

Expand All @@ -33,7 +32,7 @@ class HtmlView extends BaseHtmlView
/**
* The item object for the newsfeed
*
* @var CMSObject
* @var \stdClass
*/
protected $item;

Expand Down
3 changes: 1 addition & 2 deletions administrator/components/com_privacy/src/View/Request/HtmlView.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,6 @@
use Joomla\CMS\Language\Text;
use Joomla\CMS\MVC\View\GenericDataException;
use Joomla\CMS\MVC\View\HtmlView as BaseHtmlView;
use Joomla\CMS\Object\CMSObject;
use Joomla\CMS\Router\Route;
use Joomla\CMS\Session\Session;
use Joomla\CMS\Toolbar\Toolbar;
Expand Down Expand Up @@ -52,7 +51,7 @@ class HtmlView extends BaseHtmlView
/**
* The item record
*
* @var CMSObject
* @var \stdClass
* @since 3.9.0
*/
protected $item;
Expand Down
5 changes: 2 additions & 3 deletions administrator/components/com_templates/src/View/Style/HtmlView.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,6 @@
use Joomla\CMS\Language\Text;
use Joomla\CMS\MVC\View\GenericDataException;
use Joomla\CMS\MVC\View\HtmlView as BaseHtmlView;
use Joomla\CMS\Object\CMSObject;
use Joomla\CMS\Toolbar\Toolbar;
use Joomla\CMS\Toolbar\ToolbarHelper;

Expand All @@ -31,9 +30,9 @@
class HtmlView extends BaseHtmlView
{
/**
* The CMSObject (on success, false on failure)
* The item
*
* @var CMSObject
* @var \stdClass
*/
protected $item;

Expand Down
5 changes: 2 additions & 3 deletions administrator/components/com_templates/src/View/Style/JsonView.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,6 @@

use Joomla\CMS\Factory;
use Joomla\CMS\MVC\View\HtmlView as BaseHtmlView;
use Joomla\CMS\Object\CMSObject;

// phpcs:disable PSR1.Files.SideEffects
\defined('_JEXEC') or die;
Expand All @@ -26,9 +25,9 @@
class JsonView extends BaseHtmlView
{
/**
* The CMSObject (on success, false on failure)
* The item
*
* @var CMSObject
* @var \stdClass
*/
protected $item;

Expand Down
3 changes: 1 addition & 2 deletions administrator/components/com_users/src/Model/DebuggroupModel.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,6 @@
use Joomla\CMS\Factory;
use Joomla\CMS\MVC\Factory\MVCFactoryInterface;
use Joomla\CMS\MVC\Model\ListModel;
use Joomla\CMS\Object\CMSObject;
use Joomla\Component\Users\Administrator\Helper\DebugHelper;
use Joomla\Database\DatabaseQuery;
use Joomla\Database\ParameterType;
Expand Down Expand Up @@ -170,7 +169,7 @@ protected function getStoreId($id = '')
/**
* Get the group being debugged.
*
* @return CMSObject
* @return \stdClass
*
* @since 1.6
*/
Expand Down
2 changes: 1 addition & 1 deletion components/com_contact/src/Model/ContactModel.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -169,7 +169,7 @@ protected function loadFormData()
*
* @param integer $pk Id for the contact
*
* @return mixed Object or null
* @return mixed \stdClass or null
*
* @since 1.6.0
*/
Expand Down
2 changes: 1 addition & 1 deletion components/com_contact/src/View/Contact/HtmlView.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -56,7 +56,7 @@ class HtmlView extends BaseHtmlView implements UserFactoryAwareInterface
/**
* The item object details
*
* @var \Joomla\CMS\Object\CMSObject
* @var \stdClass
*
* @since 1.6
*/
Expand Down
2 changes: 1 addition & 1 deletion components/com_contact/src/View/Contact/VcfView.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ class VcfView extends AbstractView
/**
* The contact item
*
* @var \Joomla\CMS\Object\CMSObject
* @var \stdClass
*/
protected $item;

Expand Down
2 changes: 1 addition & 1 deletion components/com_contact/src/View/Featured/HtmlView.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@ class HtmlView extends BaseHtmlView
/**
* The item details
*
* @var \Joomla\CMS\Object\CMSObject
* @var array
*
* @since 1.6.0
*/
Expand Down
2 changes: 1 addition & 1 deletion components/com_tags/src/Model/TagModel.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,7 @@ class TagModel extends ListModel
/**
* Array of tags
*
* @var CMSObject[]
* @var array
* @since 4.3.0
*/
protected $item = [];
Expand Down
3 changes: 1 addition & 2 deletions components/com_tags/src/View/Tag/HtmlView.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,6 @@
use Joomla\CMS\Menu\MenuItem;
use Joomla\CMS\MVC\View\GenericDataException;
use Joomla\CMS\MVC\View\HtmlView as BaseHtmlView;
use Joomla\CMS\Object\CMSObject;
use Joomla\CMS\Plugin\PluginHelper;
use Joomla\CMS\Router\Route;
use Joomla\CMS\User\User;
Expand Down Expand Up @@ -52,7 +51,7 @@ class HtmlView extends BaseHtmlView
/**
* Tag data for the current tag or tags (on success, false on failure)
*
* @var CMSObject[]|boolean
* @var array
*
* @since 3.1
*/
Expand Down