fix bindingKey

freyo · freyo · commit a7e961529a5c · 2019-04-03T13:24:34.000+08:00
diff --git a/src/Queue/Driver/Subscription.php b/src/Queue/Driver/Subscription.php
@@ -41,7 +41,7 @@ public function create($subscription_meta)
             $params['protocol'] = $subscription_meta->Protocol;
         }
 
-        if (!$subscription_meta->bindingKey != null && is_array($subscription_meta->bindingKey) && !empty($subscription_meta->bindingKey)) {
+        if (is_array($subscription_meta->bindingKey) && !empty($subscription_meta->bindingKey)) {
             $n = 1;
             foreach ($subscription_meta->bindingKey as $tag) {
                 $key = 'bindingKey.'.$n;
@@ -50,7 +50,7 @@ public function create($subscription_meta)
             }
         }
 
-        if (!$subscription_meta->FilterTag != null && is_array($subscription_meta->FilterTag) && !empty($subscription_meta->FilterTag)) {
+        if (is_array($subscription_meta->FilterTag) && !empty($subscription_meta->FilterTag)) {
             $n = 1;
             foreach ($subscription_meta->FilterTag as $tag) {
                 $key = 'filterTag.'.$n;
@@ -162,7 +162,7 @@ public function set_attributes($subscription_meta)
             $params['protocol'] = $subscription_meta->Protocol;
         }
 
-        if (!$subscription_meta->bindingKey != null && is_array($subscription_meta->bindingKey) && !empty($subscription_meta->bindingKey)) {
+        if (is_array($subscription_meta->bindingKey) && !empty($subscription_meta->bindingKey)) {
             $n = 1;
             foreach ($subscription_meta->bindingKey as $tag) {
                 $key = 'bindingKey.'.$n;
@@ -171,7 +171,7 @@ public function set_attributes($subscription_meta)
             }
         }
 
-        if (!$subscription_meta->FilterTag != null && is_array($subscription_meta->FilterTag) && !empty($subscription_meta->FilterTag)) {
+        if (is_array($subscription_meta->FilterTag) && !empty($subscription_meta->FilterTag)) {
             $n = 1;
             foreach ($subscription_meta->FilterTag as $tag) {
                 $key = 'filterTag.'.$n;

Original file line number	Diff line number	Diff line change
`@@ -41,7 +41,7 @@ public function create($subscription_meta)`
`41`	`41`	`$params['protocol'] = $subscription_meta->Protocol;`
`42`	`42`	`}`
`43`	`43`
`44`		`- if (!$subscription_meta->bindingKey != null && is_array($subscription_meta->bindingKey) && !empty($subscription_meta->bindingKey)) {`
	`44`	`+ if (is_array($subscription_meta->bindingKey) && !empty($subscription_meta->bindingKey)) {`
`45`	`45`	`$n = 1;`
`46`	`46`	`foreach ($subscription_meta->bindingKey as $tag) {`
`47`	`47`	`$key = 'bindingKey.'.$n;`
`@@ -50,7 +50,7 @@ public function create($subscription_meta)`
`50`	`50`	`}`
`51`	`51`	`}`
`52`	`52`
`53`		`- if (!$subscription_meta->FilterTag != null && is_array($subscription_meta->FilterTag) && !empty($subscription_meta->FilterTag)) {`
	`53`	`+ if (is_array($subscription_meta->FilterTag) && !empty($subscription_meta->FilterTag)) {`
`54`	`54`	`$n = 1;`
`55`	`55`	`foreach ($subscription_meta->FilterTag as $tag) {`
`56`	`56`	`$key = 'filterTag.'.$n;`
`@@ -162,7 +162,7 @@ public function set_attributes($subscription_meta)`
`162`	`162`	`$params['protocol'] = $subscription_meta->Protocol;`
`163`	`163`	`}`
`164`	`164`
`165`		`- if (!$subscription_meta->bindingKey != null && is_array($subscription_meta->bindingKey) && !empty($subscription_meta->bindingKey)) {`
	`165`	`+ if (is_array($subscription_meta->bindingKey) && !empty($subscription_meta->bindingKey)) {`
`166`	`166`	`$n = 1;`
`167`	`167`	`foreach ($subscription_meta->bindingKey as $tag) {`
`168`	`168`	`$key = 'bindingKey.'.$n;`
`@@ -171,7 +171,7 @@ public function set_attributes($subscription_meta)`
`171`	`171`	`}`
`172`	`172`	`}`
`173`	`173`
`174`		`- if (!$subscription_meta->FilterTag != null && is_array($subscription_meta->FilterTag) && !empty($subscription_meta->FilterTag)) {`
	`174`	`+ if (is_array($subscription_meta->FilterTag) && !empty($subscription_meta->FilterTag)) {`
`175`	`175`	`$n = 1;`
`176`	`176`	`foreach ($subscription_meta->FilterTag as $tag) {`
`177`	`177`	`$key = 'filterTag.'.$n;`