Always convert to WorkflowRule objects (convert any and all filter_friendly_names)

1 files changed, 6 insertions, 11 deletions

diff --git a/Services/Twilio/WorkflowConfiguration.php b/Services/Twilio/WorkflowConfiguration.php
index 3799e87..ba4da0a 100644
--- a/Services/Twilio/WorkflowConfiguration.php
+++ b/Services/Twilio/WorkflowConfiguration.php
@@ -26,18 +26,13 @@ class WorkflowConfiguration implements JsonSerializable {
 
 	public static function fromJson($json) {
 		$configJSON = self::parse($json);
-		$filters = $configJSON->task_routing->filters;
 		$default_filter = $configJSON->task_routing->default_filter;
-		// aggressive check to see if filter_friendly_name is used
-		if(isset($configJSON->task_routing->filters[0]->filter_friendly_name)) {
-			$filters = array();
-			foreach($configJSON->task_routing->filters as $filter) {
-				// friendly_name and filter_friendly_name should map to same variable
-				$friendly_name = isset($filter->filter_friendly_name) ? $filter->filter_friendly_name : $filter->friendly_name;
-				$filter = new WorkflowRule($filter->expression, $filter->targets, $friendly_name);
-				$filters[] = $filter;
-			}
-			$configJSON->task_routing->filters = $filters;
+		$filters = array();
+		foreach($configJSON->task_routing->filters as $filter) {
+			// friendly_name and filter_friendly_name should map to same variable
+			$friendly_name = isset($filter->filter_friendly_name) ? $filter->filter_friendly_name : $filter->friendly_name;
+			$filter = new WorkflowRule($filter->expression, $filter->targets, $friendly_name);
+			$filters[] = $filter;
 		}
 		return new WorkflowConfiguration($filters, $default_filter);
 	}