Replaces the extension of CMSObject with the legacy traits (#40999)

* Replaces the extension of CMSObject with the legacy traits

* Update libraries/src/Changelog/Changelog.php

* Fix indexer alias generation

* use reflection to detect none public properties

* add missing properties


---------

Co-authored-by: Richard Fath <[email protected]>

Author: laoneo

libraries/src/Adapter/Adapter.php

@@ -10,7 +10,8 @@
 namespace Joomla\CMS\Adapter;
 
 use Joomla\CMS\Factory;
-use Joomla\CMS\Object\CMSObject;
+use Joomla\CMS\Object\LegacyErrorHandlingTrait;
+use Joomla\CMS\Object\LegacyPropertyManagementTrait;
 use Joomla\Database\DatabaseAwareInterface;
 
 // phpcs:disable PSR1.Files.SideEffects
@@ -26,8 +27,11 @@
  * @deprecated  4.3 will be removed in 6.0
  *              Will be removed without replacement
  */
-class Adapter extends CMSObject
+class Adapter
 {
+    use LegacyErrorHandlingTrait;
+    use LegacyPropertyManagementTrait;
+
     /**
      * Associative array of adapters
      *

libraries/src/Adapter/AdapterInstance.php

@@ -10,7 +10,8 @@
 namespace Joomla\CMS\Adapter;
 
 use Joomla\CMS\Factory;
-use Joomla\CMS\Object\CMSObject;
+use Joomla\CMS\Object\LegacyErrorHandlingTrait;
+use Joomla\CMS\Object\LegacyPropertyManagementTrait;
 use Joomla\Database\DatabaseDriver;
 
 // phpcs:disable PSR1.Files.SideEffects
@@ -24,8 +25,11 @@
  * @deprecated  4.3 will be removed in 6.0
  *              Will be removed without replacement
  */
-class AdapterInstance extends CMSObject
+class AdapterInstance
 {
+    use LegacyErrorHandlingTrait;
+    use LegacyPropertyManagementTrait;
+
     /**
      * Parent
      *

libraries/src/Categories/CategoryNode.php

@@ -10,7 +10,8 @@
 namespace Joomla\CMS\Categories;
 
 use Joomla\CMS\Factory;
-use Joomla\CMS\Object\CMSObject;
+use Joomla\CMS\Object\LegacyErrorHandlingTrait;
+use Joomla\CMS\Object\LegacyPropertyManagementTrait;
 use Joomla\CMS\Tree\NodeInterface;
 use Joomla\CMS\Tree\NodeTrait;
 use Joomla\Registry\Registry;
@@ -24,8 +25,11 @@
  *
  * @since  1.6
  */
-class CategoryNode extends CMSObject implements NodeInterface
+#[\AllowDynamicProperties]
+class CategoryNode implements NodeInterface
 {
+    use LegacyErrorHandlingTrait;
+    use LegacyPropertyManagementTrait;
     use NodeTrait;
 
     /**

libraries/src/Changelog/Changelog.php

@@ -12,7 +12,8 @@
 use Joomla\CMS\Http\HttpFactory;
 use Joomla\CMS\Language\Text;
 use Joomla\CMS\Log\Log;
-use Joomla\CMS\Object\CMSObject;
+use Joomla\CMS\Object\LegacyErrorHandlingTrait;
+use Joomla\CMS\Object\LegacyPropertyManagementTrait;
 use Joomla\CMS\Version;
 use Joomla\Registry\Registry;
 use RuntimeException;
@@ -26,8 +27,11 @@
  *
  * @since  4.0.0
  */
-class Changelog extends CMSObject
+class Changelog
 {
+    use LegacyErrorHandlingTrait;
+    use LegacyPropertyManagementTrait;
+
     /**
      * Update manifest `<element>` element
      *

libraries/src/Filesystem/Stream.php

@@ -10,7 +10,8 @@
 namespace Joomla\CMS\Filesystem;
 
 use Joomla\CMS\Language\Text;
-use Joomla\CMS\Object\CMSObject;
+use Joomla\CMS\Object\LegacyErrorHandlingTrait;
+use Joomla\CMS\Object\LegacyPropertyManagementTrait;
 
 // phpcs:disable PSR1.Files.SideEffects
 \defined('_JEXEC') or die;
@@ -33,8 +34,11 @@
  * @deprecated  4.4 will be removed in 6.0
  *              Use Joomla\Filesystem\Stream instead.
  */
-class Stream extends CMSObject
+class Stream
 {
+    use LegacyErrorHandlingTrait;
+    use LegacyPropertyManagementTrait;
+
     /**
      * File Mode
      *

libraries/src/Installer/InstallerExtension.php

@@ -12,7 +12,8 @@
 use Joomla\CMS\Application\ApplicationHelper;
 use Joomla\CMS\Language\Text;
 use Joomla\CMS\Log\Log;
-use Joomla\CMS\Object\CMSObject;
+use Joomla\CMS\Object\LegacyErrorHandlingTrait;
+use Joomla\CMS\Object\LegacyPropertyManagementTrait;
 
 // phpcs:disable PSR1.Files.SideEffects
 \defined('_JEXEC') or die;
@@ -23,8 +24,11 @@
  *
  * @since  3.1
  */
-class InstallerExtension extends CMSObject
+class InstallerExtension
 {
+    use LegacyErrorHandlingTrait;
+    use LegacyPropertyManagementTrait;
+
     /**
      * Client ID of the extension
      *

libraries/src/MVC/Model/BaseModel.php

@@ -11,7 +11,8 @@
 
 use Joomla\CMS\Filesystem\Path;
 use Joomla\CMS\Language\Text;
-use Joomla\CMS\Object\CMSObject;
+use Joomla\CMS\Object\LegacyErrorHandlingTrait;
+use Joomla\CMS\Object\LegacyPropertyManagementTrait;
 
 // phpcs:disable PSR1.Files.SideEffects
 \defined('_JEXEC') or die;
@@ -22,10 +23,14 @@
  *
  * @since  4.0.0
  */
-abstract class BaseModel extends CMSObject implements ModelInterface, StatefulModelInterface
+#[\AllowDynamicProperties]
+abstract class BaseModel implements ModelInterface, StatefulModelInterface
 {
     use StateBehaviorTrait;
     use LegacyModelLoaderTrait;
+    use LegacyErrorHandlingTrait;
+    use LegacyPropertyManagementTrait;
+
 
     /**
      * The model (base) name

libraries/src/MVC/View/AbstractView.php

@@ -16,7 +16,8 @@
 use Joomla\CMS\Language\LanguageAwareInterface;
 use Joomla\CMS\Language\LanguageAwareTrait;
 use Joomla\CMS\MVC\Model\BaseDatabaseModel;
-use Joomla\CMS\Object\CMSObject;
+use Joomla\CMS\Object\LegacyErrorHandlingTrait;
+use Joomla\CMS\Object\LegacyPropertyManagementTrait;
 use Joomla\Event\DispatcherAwareInterface;
 use Joomla\Event\DispatcherAwareTrait;
 use Joomla\Event\DispatcherInterface;
@@ -33,10 +34,16 @@
  *
  * @since  2.5.5
  */
-abstract class AbstractView extends CMSObject implements ViewInterface, DispatcherAwareInterface, DocumentAwareInterface, LanguageAwareInterface
+#[\AllowDynamicProperties]
+abstract class AbstractView implements ViewInterface, DispatcherAwareInterface, DocumentAwareInterface, LanguageAwareInterface
 {
     use DispatcherAwareTrait;
     use LanguageAwareTrait;
+    use LegacyErrorHandlingTrait;
+    use LegacyPropertyManagementTrait {
+        get as private legacyGet;
+    }
+
 
     /**
      * The active document object
@@ -154,8 +161,7 @@ public function get($property, $default = null)
             }
         }
 
-        // Degrade to CMSObject::get
-        return parent::get($property, $default);
+        return $this->legacyGet($property, $default);
     }
 
     /**

libraries/src/Object/LegacyPropertyManagementTrait.php

@@ -9,6 +9,9 @@
 
 namespace Joomla\CMS\Object;
 
+use ReflectionObject;
+use ReflectionProperty;
+
 // phpcs:disable PSR1.Files.SideEffects
 \defined('_JEXEC') or die;
 // phpcs:enable PSR1.Files.SideEffects
@@ -93,6 +96,24 @@ public function getProperties($public = true)
                     unset($vars[$key]);
                 }
             }
+
+            // Collect all none public properties of the current class and it's parents
+            $nonePublicProperties = [];
+            $reflection           = new ReflectionObject($this);
+            do {
+                $nonePublicProperties = array_merge(
+                    $reflection->getProperties(ReflectionProperty::IS_PRIVATE | ReflectionProperty::IS_PROTECTED),
+                    $nonePublicProperties
+                );
+            } while ($reflection = $reflection->getParentClass());
+
+            // Unset all none public properties, this is needed as get_object_vars returns now all vars
+            // from the current object and not only the CMSObject and the public ones from the inheriting classes
+            foreach ($nonePublicProperties as $prop) {
+                if (array_key_exists($prop->getName(), $vars)) {
+                    unset($vars[$prop->getName()]);
+                }
+            }
         }
 
         return $vars;

libraries/src/Table/Table.php

@@ -14,7 +14,8 @@
 use Joomla\CMS\Factory;
 use Joomla\CMS\Filesystem\Path;
 use Joomla\CMS\Language\Text;
-use Joomla\CMS\Object\CMSObject;
+use Joomla\CMS\Object\LegacyErrorHandlingTrait;
+use Joomla\CMS\Object\LegacyPropertyManagementTrait;
 use Joomla\Database\DatabaseDriver;
 use Joomla\Database\DatabaseQuery;
 use Joomla\Event\DispatcherAwareInterface;
@@ -34,9 +35,12 @@
  * @since  1.7.0
  */
 #[\AllowDynamicProperties]
-abstract class Table extends CMSObject implements TableInterface, DispatcherAwareInterface
+abstract class Table implements TableInterface, DispatcherAwareInterface
 {
     use DispatcherAwareTrait;
+    use LegacyErrorHandlingTrait;
+    use LegacyPropertyManagementTrait;
+
 
     /**
      * Include paths for searching for Table classes.
@@ -164,8 +168,6 @@ abstract class Table extends CMSObject implements TableInterface, DispatcherAwar
      */
     public function __construct($table, $key, DatabaseDriver $db, DispatcherInterface $dispatcher = null)
     {
-        parent::__construct();
-
         // Set internal variables.
         $this->_tbl = $table;