issue #909: fix dynamic propeties

classes/local/execution/iterators/dataflow_iterator.php

@@ -48,6 +48,16 @@ class dataflow_iterator implements iterator {
     /** @var int */
     protected $iterationcount = 0;
 
+    /**
+     * @var \tool_dataflows\local\variables\var_step|null
+     */
+    protected $stepvars = null;
+
+    /**
+     * @var null
+     */
+    protected $pulled = null;
+
     /**
      * Create an instance of this class.
      *

classes/local/step/flow_cap.php

@@ -33,6 +33,12 @@
  */
 final class flow_cap extends flow_step {
 
+    /**
+     * Upstream interator.
+     * @var
+     */
+    protected $upstream;
+
     /**
      * Generates an engine step for this type.
      *

classes/step.php

@@ -57,6 +57,12 @@ class step extends persistent {
     /** @var array array for lazy loading step dependants */
     private $dependents = null;
 
+    /** @var dataflow Dataflow */
+    protected $dataflow = null;
+
+    /** @var base_step step type */
+    protected $steptype;
+
     /**
      * Return the definition of the properties of this model.
      *
@@ -495,7 +501,7 @@ public function upsert() {
         // Update the local dependencies to the database.
         $this->update_depends_on();
 
-        $this->steptype->on_save();
+        $this->get_steptype()->on_save();
         $this->get_dataflow()->on_steps_save();
 
         return $this;
@@ -628,7 +634,7 @@ protected function before_delete() {
         $DB->delete_records('tool_dataflows_step_depends', ['stepid' => $this->id]);
         $DB->delete_records('tool_dataflows_step_depends', ['dependson' => $this->id]);
 
-        $steptype = $this->steptype;
+        $steptype = $this->get_steptype();
         if (isset($steptype)) {
             $steptype->on_delete();
         }
@@ -728,7 +734,7 @@ protected function validate_config() {
             return new \lang_string('invalidyaml', 'tool_dataflows');
         }
 
-        $validation = $this->steptype->validate_config($yaml);
+        $validation = $this->get_steptype()->validate_config($yaml);
         if ($validation !== true) {
             // NOTE: This will only return the first error as the persistent
             // class expects the return value to be an instance of lang_string.
@@ -748,7 +754,7 @@ protected function validate_config() {
      */
     protected function validate_link_count(int $count, string $inputoutput, string $flowconnector) {
         $fn = "get_number_of_{$inputoutput}_{$flowconnector}s";
-        $steptype = $this->steptype;
+        $steptype = $this->get_steptype();
         [$min, $max] = $steptype->$fn();
         if ($inputoutput === 'output') {
             $min = max($min, count($steptype->get_output_labels()));
@@ -778,7 +784,7 @@ protected function validate_links(array $deps, string $inputoutput) {
         $count = count($deps);
         $errors = [];
 
-        $steptype = $this->steptype;
+        $steptype = $this->get_steptype();
 
         if ($count != 0) {
             $dep = array_shift($deps);
@@ -877,7 +883,7 @@ public function has_side_effect(): bool {
         if ($typevalidation !== true) {
             return false;
         }
-        return $this->steptype->has_side_effect();
+        return $this->get_steptype()->has_side_effect();
     }
 
     /**

tests/tool_dataflows_event_processor_test.php

@@ -35,6 +35,37 @@
  */
 class tool_dataflows_event_processor_test extends \advanced_testcase {
 
+    /**
+     * Test workflow.
+     * @var \tool_dataflows\dataflow
+     */
+    protected $dataflow;
+
+    /**
+     * Test writer.
+     * @var
+     */
+    protected $writer;
+
+    /**
+     * Test reader.
+     * @var
+     */
+    protected $reader;
+
+    /**
+     * Test course.
+     *
+     * @var \stdClass
+     */
+    protected $course;
+
+    /**
+     * Test output path.
+     * @var
+     */
+    protected $outputpath;
+
     /**
      * Set up before each test
      */

tests/tool_dataflows_flow_sql_test.php

@@ -34,6 +34,41 @@
  * @license   http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
  */
 class tool_dataflows_flow_sql_test extends \advanced_testcase {
+    /**
+     * Test workflow.
+     * @var \tool_dataflows\dataflow
+     */
+    protected $dataflow;
+
+    /**
+     * Test writer.
+     * @var
+     */
+    protected $writer;
+
+    /**
+     * Test reader.
+     * @var
+     */
+    protected $reader;
+
+    /**
+     * Test input path.
+     * @var false|string
+     */
+    protected $inputpath;
+
+    /**
+     * Test output path.
+     * @var
+     */
+    protected $outputpath;
+
+    /**
+     * Test flow step.
+     * @var \tool_dataflows\step
+     */
+    protected $flow;
 
     /**
      * Set up before each test

tests/tool_dataflows_json_reader_test.php

@@ -36,6 +36,42 @@
  */
 class tool_dataflows_json_reader_test extends \advanced_testcase {
 
+    /**
+     * Test workflow.
+     * @var \tool_dataflows\dataflow
+     */
+    protected $dataflow;
+
+    /**
+     * Test writer.
+     * @var
+     */
+    protected $writer;
+
+    /**
+     * Test reader.
+     * @var
+     */
+    protected $reader;
+
+    /**
+     * Test input path.
+     * @var false|string
+     */
+    protected $inputpath;
+
+    /**
+     * Test output path.
+     * @var
+     */
+    protected $outputpath;
+
+    /**
+     * Test users.
+     * @var
+     */
+    protected $users;
+
     /**
      * Set up before each test
      */

tests/tool_dataflows_reader_csv_test.php

@@ -35,6 +35,17 @@
  * @license   http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
  */
 class tool_dataflows_reader_csv_test extends \advanced_testcase {
+    /**
+     * Test writer.
+     * @var
+     */
+    protected $writer;
+
+    /**
+     * Test reader.
+     * @var
+     */
+    protected $reader;
 
     /**
      * Set up before each test