Merge branch '51Degrees:main' into main

Author: pi-alexander-popel

.github/workflows/nightky-publish-main.yml renamed to .github/workflows/nightly-publish-main.yml

@@ -32,6 +32,9 @@
 */
 class AspectPropertyValue
 {
+    private $_value;
+    public $noValueMessage = null;
+    public $hasValue = false;
 
     /**
     * Constructor for AspectPropertyValue
@@ -59,8 +62,20 @@ public function __construct($noValueMessage = null, $value = "noValue")
     */
     public function __get($key)
     {
-        if ($key === "value" && $this->noValueMessage) {
-            throw new \Exception($this->noValueMessage);
+        if ($key === "value") {
+            if ($this->hasValue) {
+                return $this->_value;
+            } else if (!empty($this->noValueMessage)) {
+                throw new \Exception($this->noValueMessage);
+            }
+        }
+    }
+
+    public function __set($key, $value)
+    {
+        if ($key === "value") {
+            $this->_value = $value;
+            $this->hasValue = true;
         }
     }
 }

AspectPropertyValue.php

@@ -49,15 +49,13 @@ public function __construct($list)
     */
     public function filterEvidenceKey($key)
     {
-        $keep = false;
-
         foreach ($this->list as $evidenceKey) {
             if (strtolower($key) === strtolower($evidenceKey)) {
-                $keep = true;
+                return true;
             }
         }
 
-        return $keep;
+        return false;
     }
 
     /**

BasicListEvidenceKeyFilter.php

@@ -30,6 +30,7 @@
 **/
 class ElementDataDictionary extends ElementData
 {
+    public $contents;
 
     /**
     * Constructor for element data dictionary

ElementDataDictionary.php

@@ -32,6 +32,7 @@
 */
 class EvidenceKeyFilter
 {
+    private $_filterEvidenceKey = null;
 
     /**
     * filterevidence from an object
@@ -58,6 +59,17 @@ public function filterEvidence($evidenceKeyObject)
     */
     public function filterEvidenceKey($key)
     {
+        if ($this->_filterEvidenceKey) {
+            return call_user_func($this->_filterEvidenceKey, $key);
+        }
+
         return true;
     }
+
+    public function __set($name, $value)
+    {
+        if ($name === 'filterEvidenceKey') {
+            $this->_filterEvidenceKey = $value;
+        }
+    }
 }

EvidenceKeyFilter.php

@@ -171,7 +171,7 @@ public function getEvidenceDataKey()
         $requestedEvidence = array();
         $evidence = $this->evidence->getAll();
 
-        foreach ($this->Pipeline->flowElements as $flowElement) {
+        foreach ($this->pipeline->flowElements as $flowElement) {
             $requestedEvidence = array_merge($requestedEvidence, $flowElement->filterEvidence($this));
         }
 

FlowData.php

@@ -32,16 +32,11 @@
 **/
 class FlowElement
 {
-    public function __construct()
-    {
-
-        // List of Pipelines the FlowElement has been added to
-        $this->pipelines = [];
-    }
-
     public $dataKey;
     public $properties = [];
-    
+    // List of Pipelines the FlowElement has been added to
+    public $pipelines = [];
+
     /**
      * General wrapper function that calls a FlowElement's processInternal method
      * @param FlowData

FlowElement.php

@@ -36,6 +36,9 @@
  */
 class JavascriptBuilderElement extends FlowElement
 {
+    public $settings;
+    public $minify;
+
     public function __construct($settings = array())
     {
         $this->settings = [

JavascriptBuilder.php

@@ -32,6 +32,8 @@ class Logger
 
     private $levels = ["trace", "debug", "information", "warning", "error", "critical"];
 
+    public $settings;
+
     /**
      * Create a logger
      * @param string level ("trace", "debug", "information", "warning", "error", "critical")

Logger.php

@@ -35,6 +35,8 @@ class Pipeline
     public $flowElementsList = array();
     public $logger;
     public $metaDataStore;
+    public $suppressProcessExceptions;
+    public $propertyDatabase;
 
     /**
      * Pipeline constructor

Pipeline.php

@@ -30,6 +30,11 @@
 */
 class PipelineBuilder
 {
+    public $pipelines;
+    public $addJavaScriptBuilder;
+    public $javascriptBuilderSettings;
+    public $useSetHeaderProperties;
+
     public function __construct($settings = array())
     {
 

PipelineBuilder.php

@@ -152,15 +152,14 @@ public function getPropertyValue($flowData, $elementKey, $propertyKey){
 		}
 
 		$propertyKey = strtolower($propertyKey);
-		try {
+		if (isset($elementData->$propertyKey)) {
             $property = $elementData->$propertyKey;
-		}
-        catch (Exception $e) {
+		} else {
 			echo sprintf(Messages::PROPERTY_NOT_FOUND, $propertyKey, $elementKey);
 			return "";
 		}
 
-		if($property->hasValue && !in_array($property->value, ["Unknown", "noValue"])){
+		if($property && $property->hasValue && !in_array($property->value, ["Unknown", "noValue"])){
 			$value = $property->value;
 		}
         else{

SetHeaderElement.php

@@ -67,6 +67,8 @@ public function processInternal($FlowData)
 
 class TestPipeline
 {
+    public $Pipeline;
+
     public function __construct($minify = NULL)
     {
         if (is_null($minify)) {