Merge pull request #1703 from gazben/patch-8

specialtactics · web-flow · commit 1ff4d3ae4354 · 2020-03-13T00:07:21.000+11:00
Fix http/https only detection
diff --git a/src/Routing/Route.php b/src/Routing/Route.php
@@ -511,8 +511,8 @@ public function methods()
      */
     public function httpOnly()
     {
-        return in_array('https', $this->action, true)
-            || (array_key_exists('https', $this->action) && $this->action['https']);
+        return in_array('http', $this->action, true)
+            || (array_key_exists('http', $this->action) && $this->action['http']);
     }
 
     /**
@@ -532,7 +532,8 @@ public function httpsOnly()
      */
     public function secure()
     {
-        return in_array('https', $this->action, true);
+        return in_array('https', $this->action, true)
+            || (array_key_exists('https', $this->action) && $this->action['https']);
     }
 
     /**

Original file line number	Diff line number	Diff line change
`@@ -511,8 +511,8 @@ public function methods()`
`511`	`511`	`*/`
`512`	`512`	`public function httpOnly()`
`513`	`513`	`{`
`514`		`- return in_array('https', $this->action, true)`
`515`		`- \|\| (array_key_exists('https', $this->action) && $this->action['https']);`
	`514`	`+ return in_array('http', $this->action, true)`
	`515`	`+ \|\| (array_key_exists('http', $this->action) && $this->action['http']);`
`516`	`516`	`}`
`517`	`517`
`518`	`518`	`/**`
`@@ -532,7 +532,8 @@ public function httpsOnly()`
`532`	`532`	`*/`
`533`	`533`	`public function secure()`
`534`	`534`	`{`
`535`		`- return in_array('https', $this->action, true);`
	`535`	`+ return in_array('https', $this->action, true)`
	`536`	`+ \|\| (array_key_exists('https', $this->action) && $this->action['https']);`
`536`	`537`	`}`
`537`	`538`
`538`	`539`	`/**`