Fix CI complaints

catalyst · Dec 10, 2024 · 00816a7 · 00816a7
1 parent c215b8e
commit 00816a7
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 4 deletions.
diff --git a/classes/local/datasource/restore/fields.php b/classes/local/datasource/restore/fields.php
@@ -32,6 +32,9 @@ class fields {
     /** @var \restore_cms_activity_structure_step The stepslib controlling this process. */
     protected $stepslib;
 
+    /** @var array Components array */
+    protected $components = [];
+
     /**
      * Constructs the processor.
      *

diff --git a/tests/datasource_site_test.php b/tests/datasource_site_test.php
@@ -62,9 +62,10 @@ public function test_get_data() {
         $ds = new dssite($cms);
         $data = $ds->get_data();
 
-        $this->assertObjectHasAttribute('fullname', $data);
-        $this->assertObjectHasAttribute('shortname', $data);
-        $this->assertObjectHasAttribute('wwwroot', $data);
+        // Some versions of PHPUnit do not have assertObjectHasProperty(), and assertObjectHasAttribute() is deprecated.
+        $this->assertTrue(property_exists($data, 'fullname'));
+        $this->assertTrue(property_exists($data, 'shortname'));
+        $this->assertTrue(property_exists($data, 'wwwroot'));
     }
 
     /**

diff --git a/tests/renderer_test.php b/tests/renderer_test.php
@@ -67,7 +67,7 @@ public function test_get_data() {
         foreach (dsbase::BUILTIN_DATASOURCES as $ds) {
             $classname = 'mod_cms\\local\\datasource\\' . $ds;
             $attribute = $classname::get_shortname();
-            $this->assertObjectHasAttribute($attribute, $data);
+            $this->assertTrue(property_exists($data, $attribute));
             $this->assertIsObject($data->$attribute);
         }
     }