Skip to content

Change the getItem return type to stdClass and make the CMSObject inherit it #42717

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
LadySolveig merged 4 commits into from
Feb 27, 2024
Merged

Change the getItem return type to stdClass and make the CMSObject inherit it #42717

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
f6387a0
Change the getItem return type to stdClass abd make the CMSObject inh…
laoneo Jan 27, 2024
880124b
Merge branch '5.1-dev' into model/admin/getitem2
laoneo Jan 29, 2024
05e97a6
Merge branch '5.1-dev' into model/admin/getitem2
laoneo Feb 7, 2024
080cca9
Merge branch '5.1-dev' into model/admin/getitem2
laoneo Feb 13, 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_guidedtours/src/Model/StepModel.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,6 @@
use Joomla\CMS\Factory;
use Joomla\CMS\Language\Text;
use Joomla\CMS\MVC\Model\AdminModel;
use Joomla\CMS\Object\CMSObject;
use Joomla\CMS\Table\Table;
use Joomla\Component\Guidedtours\Administrator\Helper\GuidedtoursHelper;

Expand Down Expand Up @@ -232,7 +231,7 @@ protected function loadFormData()
*
* @param integer $pk The id of the primary key.
*
* @return CMSObject|boolean Object on success, false on failure.
* @return \stdClass|boolean Object on success, false on failure.
*
* @since 4.3.0
*/
Expand Down
2 changes: 1 addition & 1 deletion administrator/components/com_guidedtours/src/Model/TourModel.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -191,7 +191,7 @@ protected function loadFormData()
*
* @param integer|string $pk The id or uid of the tour.
*
* @return CMSObject|boolean Object on success, false on failure.
* @return \stdClass|boolean Object on success, false on failure.
*
* @since 4.3.0
*/
Expand Down
2 changes: 1 addition & 1 deletion administrator/components/com_installer/src/Model/UpdatesiteModel.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -78,7 +78,7 @@ protected function loadFormData()
*
* @param integer $pk The id of the primary key.
*
* @return CMSObject|boolean Object on success, false on failure.
* @return \stdClass|boolean Object on success, false on failure.
*
* @since 4.0.0
*/
Expand Down
4 changes: 2 additions & 2 deletions administrator/components/com_mails/src/Model/TemplateModel.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -148,7 +148,7 @@ public function getForm($data = [], $loadData = true)
*
* @param integer $pk The id of the primary key.
*
* @return CMSObject|boolean Object on success, false on failure.
* @return \stdClass|boolean Object on success, false on failure.
*
* @since 4.0.0
*/
Expand Down Expand Up @@ -195,7 +195,7 @@ public function getItem($pk = null)
*
* @param integer $pk The id of the primary key.
*
* @return CMSObject|boolean Object on success, false on failure.
* @return \stdClass|boolean Object on success, false on failure.
*
* @since 4.0.0
*/
Expand Down
2 changes: 1 addition & 1 deletion libraries/src/MVC/Model/AdminModel.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -977,7 +977,7 @@ protected function generateNewTitle($categoryId, $alias, $title)
*
* @param integer $pk The id of the primary key.
*
* @return CMSObject|boolean Object on success, false on failure.
* @return \stdClass|boolean Object on success, false on failure.
*
* @since 1.6
*/
Expand Down
3 changes: 1 addition & 2 deletions libraries/src/Object/CMSObject.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,8 +25,7 @@
* Use \stdClass or \Joomla\Registry\Registry instead.
* Example: new \Joomla\Registry\Registry();
*/
#[\AllowDynamicProperties]
class CMSObject
class CMSObject extends \stdClass
{
use LegacyErrorHandlingTrait;
use LegacyPropertyManagementTrait;
Expand Down
3 changes: 1 addition & 2 deletions libraries/src/Workflow/WorkflowPluginTrait.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,6 @@
namespace Joomla\CMS\Workflow;

use Joomla\CMS\Form\Form;
use Joomla\CMS\Object\CMSObject;

// phpcs:disable PSR1.Files.SideEffects
\defined('_JEXEC') or die;
Expand Down Expand Up @@ -62,7 +61,7 @@ protected function enhanceWorkflowTransitionForm(Form $form, $data)
*
* @param int|null $workflowId ID of the workflow
*
* @return CMSObject|boolean Object on success, false on failure.
* @return \stdClass|boolean Object on success, false on failure.
*
* @since 4.0.0
*/
Expand Down