[7.0] Remove CMSObject and LegacyPropertyManagementTrait

administrator/components/com_finder/src/Controller/IndexerController.php

@@ -267,9 +267,9 @@ public function optimize()
     /**
      * Method to handle a send a \JSON response. The body parameter
      * can be an \Exception object for when an error has occurred or
-     * a CMSObject for a good response.
+     * an object for a good response.
      *
-     * @param   \Joomla\CMS\Object\CMSObject|\Exception  $data  CMSObject on success, \Exception on error. [optional]
+     * @param   object|\Exception  $data  CMSObject on success, \Exception on error. [optional]
      *
      * @return  void
      *

administrator/components/com_users/src/Helper/UsersHelper.php

@@ -15,7 +15,6 @@
 use Joomla\CMS\Helper\UserGroupsHelper;
 use Joomla\CMS\HTML\HTMLHelper;
 use Joomla\CMS\Language\Text;
-use Joomla\CMS\Object\CMSObject;
 
 // phpcs:disable PSR1.Files.SideEffects
 \defined('_JEXEC') or die;
@@ -28,13 +27,6 @@
  */
 class UsersHelper extends ContentHelper
 {
-    /**
-     * @var    CMSObject  A cache for the available actions.
-     * @since  1.6
-     * @deprecated 5.3 will be removed in 7.0 without replacement
-     */
-    protected static $actions;
-
     /**
      * Get a list of filter options for the blocked state of a user.
      *

libraries/src/Editor/Button/ButtonsRegistry.php

@@ -11,7 +11,6 @@
 
 use Joomla\CMS\Event\Editor\EditorButtonsSetupEvent;
 use Joomla\CMS\Factory;
-use Joomla\CMS\Object\CMSObject;
 use Joomla\CMS\Plugin\PluginHelper;
 use Joomla\Event\DispatcherAwareInterface;
 use Joomla\Event\DispatcherAwareTrait;
@@ -124,16 +123,14 @@ public function initRegistry(array $options = []): ButtonsRegistryInterface
             @trigger_error('7.0 Button "' . $plugin->name . '" instance should be set up onEditorButtonsSetup event.', \E_USER_DEPRECATED);
 
             // Transform Legacy buttons to Button object
-            if ($legacyButton instanceof CMSObject || $legacyButton instanceof Registry) {
+            if ($legacyButton instanceof Registry) {
                 $legacyButton = [$legacyButton];
             }
 
             if (\is_array($legacyButton)) {
                 foreach ($legacyButton as $i => $item) {
                     // Extract button properties
-                    if ($item instanceof CMSObject) {
-                        $props = $item->getProperties();
-                    } elseif ($item instanceof Registry) {
+                    if ($item instanceof Registry) {
                         $props = $item->toArray();
                     } else {
                         continue;

libraries/src/Form/Form.php

@@ -12,7 +12,6 @@
 use Joomla\CMS\Factory;
 use Joomla\CMS\HTML\HTMLHelper;
 use Joomla\CMS\Language\Text;
-use Joomla\CMS\Object\CMSObject;
 use Joomla\CMS\User\CurrentUserInterface;
 use Joomla\CMS\User\CurrentUserTrait;
 use Joomla\Database\DatabaseAwareInterface;
@@ -172,9 +171,9 @@ protected function bindLevel($group, $data)
             if ($data instanceof Registry) {
                 // Handle a Registry.
                 $data = $data->toArray();
-            } elseif ($data instanceof CMSObject) {
-                // Handle a CMSObject.
-                $data = $data->getProperties();
+            } else {
+                // Handle an object.
+                $data = ArrayHelper::fromObject($data);
             }
         }
 

libraries/src/Installer/InstallerExtension.php

@@ -13,7 +13,6 @@
 use Joomla\CMS\Language\Text;
 use Joomla\CMS\Log\Log;
 use Joomla\CMS\Object\LegacyErrorHandlingTrait;
-use Joomla\CMS\Object\LegacyPropertyManagementTrait;
 
 // phpcs:disable PSR1.Files.SideEffects
 \defined('_JEXEC') or die;
@@ -27,7 +26,6 @@
 class InstallerExtension
 {
     use LegacyErrorHandlingTrait;
-    use LegacyPropertyManagementTrait;
 
     /**
      * Client ID of the extension

libraries/src/Serializer/JoomlaSerializer.php

@@ -10,7 +10,6 @@
 namespace Joomla\CMS\Serializer;
 
 use Joomla\CMS\Factory;
-use Joomla\CMS\Object\CMSObject;
 use Tobscure\JsonApi\AbstractSerializer;
 use Tobscure\JsonApi\Relationship;
 
@@ -61,11 +60,6 @@ public function getAttributes($post, ?array $fields = null)
             throw new \InvalidArgumentException($message);
         }
 
-        // The response from a standard AdminModel query also works for legacy objects which extends CMSObject
-        if ($post instanceof CMSObject) {
-            $post = $post->getProperties();
-        }
-
         // The object response, from a standard ListModel query
         if (\is_object($post)) {
             $source = $post;

libraries/src/Table/Table.php

@@ -15,7 +15,6 @@
 use Joomla\CMS\Factory;
 use Joomla\CMS\Language\Text;
 use Joomla\CMS\Object\LegacyErrorHandlingTrait;
-use Joomla\CMS\Object\LegacyPropertyManagementTrait;
 use Joomla\Database\DatabaseAwareInterface;
 use Joomla\Database\DatabaseAwareTrait;
 use Joomla\Database\DatabaseInterface;
@@ -43,7 +42,6 @@ abstract class Table extends \stdClass implements TableInterface, DispatcherAwar
     use DispatcherAwareTrait;
     use DatabaseAwareTrait;
     use LegacyErrorHandlingTrait;
-    use LegacyPropertyManagementTrait;
 
 
     /**

libraries/src/Updater/Update.php

@@ -14,7 +14,6 @@
 use Joomla\CMS\Language\Text;
 use Joomla\CMS\Log\Log;
 use Joomla\CMS\Object\LegacyErrorHandlingTrait;
-use Joomla\CMS\Object\LegacyPropertyManagementTrait;
 use Joomla\CMS\Table\Tuf as TufMetadata;
 use Joomla\CMS\TUF\TufFetcher;
 use Joomla\CMS\Version;
@@ -36,7 +35,6 @@
 class Update
 {
     use LegacyErrorHandlingTrait;
-    use LegacyPropertyManagementTrait;
 
     /**
      * Update manifest `<name>` element

libraries/src/Updater/UpdateAdapter.php

@@ -13,7 +13,6 @@
 use Joomla\CMS\Factory;
 use Joomla\CMS\Language\Text;
 use Joomla\CMS\Log\Log;
-use Joomla\CMS\Object\LegacyPropertyManagementTrait;
 use Joomla\CMS\Plugin\PluginHelper;
 use Joomla\CMS\Version;
 use Joomla\Database\DatabaseDriver;
@@ -32,8 +31,6 @@
  */
 abstract class UpdateAdapter
 {
-    use LegacyPropertyManagementTrait;
-
     /**
      * Parent
      *