Merge branch 'hotfix/108' into develop

weierophinney · weierophinney · commit 03864a9fd680 · 2017-01-26T10:03:33.000-06:00
Forward port #108
diff --git a/test/Client/CommonHttpTests.php b/test/Client/CommonHttpTests.php
@@ -76,7 +76,7 @@ abstract class CommonHttpTests extends \PHPUnit_Framework_TestCase
     protected function setUp()
     {
         if (getenv('TESTS_ZEND_HTTP_CLIENT_BASEURI')
-            && (getenv('TESTS_ZEND_HTTP_CLIENT_BASEURI') != false)) {
+            && (filter_var(getenv('TESTS_ZEND_HTTP_CLIENT_BASEURI'), FILTER_VALIDATE_BOOLEAN) != false)) {
             $this->baseuri = getenv('TESTS_ZEND_HTTP_CLIENT_BASEURI');
             if (substr($this->baseuri, -1) != '/') {
                 $this->baseuri .= '/';
diff --git a/test/Client/ProxyAdapterTest.php b/test/Client/ProxyAdapterTest.php
@@ -35,7 +35,7 @@ class ProxyAdapterTest extends SocketTest
     protected function setUp()
     {
         if (getenv('TESTS_ZEND_HTTP_CLIENT_HTTP_PROXY') &&
-              getenv('TESTS_ZEND_HTTP_CLIENT_HTTP_PROXY')) {
+              filter_var(getenv('TESTS_ZEND_HTTP_CLIENT_BASEURI'), FILTER_VALIDATE_BOOLEAN)) {
             list($host, $port) = explode(':', getenv('TESTS_ZEND_HTTP_CLIENT_HTTP_PROXY'), 2);
 
             if (! $host) {
diff --git a/test/Client/StaticClientTest.php b/test/Client/StaticClientTest.php
@@ -33,7 +33,7 @@ class StaticClientTest extends \PHPUnit_Framework_TestCase
     protected function setUp()
     {
         if (getenv('TESTS_ZEND_HTTP_CLIENT_BASEURI')
-            && (getenv('TESTS_ZEND_HTTP_CLIENT_BASEURI') != false)) {
+            && (filter_var(getenv('TESTS_ZEND_HTTP_CLIENT_BASEURI'), FILTER_VALIDATE_BOOLEAN) != false)) {
             $this->baseuri = getenv('TESTS_ZEND_HTTP_CLIENT_BASEURI');
             if (substr($this->baseuri, -1) != '/') {
                 $this->baseuri .= '/';
diff --git a/test/Client/UseCaseTest.php b/test/Client/UseCaseTest.php
@@ -58,7 +58,7 @@ class UseCaseTest extends \PHPUnit_Framework_TestCase
     protected function setUp()
     {
         if (getenv('TESTS_ZEND_HTTP_CLIENT_BASEURI')
-            && (getenv('TESTS_ZEND_HTTP_CLIENT_BASEURI') != false)
+            && (filter_var(getenv('TESTS_ZEND_HTTP_CLIENT_BASEURI'), FILTER_VALIDATE_BOOLEAN) != false)
         ) {
             $this->baseuri = getenv('TESTS_ZEND_HTTP_CLIENT_BASEURI');
             $this->client  = new HTTPClient($this->baseuri);

Original file line number	Diff line number	Diff line change
`@@ -76,7 +76,7 @@ abstract class CommonHttpTests extends \PHPUnit_Framework_TestCase`
`76`	`76`	`protected function setUp()`
`77`	`77`	`{`
`78`	`78`	`if (getenv('TESTS_ZEND_HTTP_CLIENT_BASEURI')`
`79`		`- && (getenv('TESTS_ZEND_HTTP_CLIENT_BASEURI') != false)) {`
	`79`	`+ && (filter_var(getenv('TESTS_ZEND_HTTP_CLIENT_BASEURI'), FILTER_VALIDATE_BOOLEAN) != false)) {`
`80`	`80`	`$this->baseuri = getenv('TESTS_ZEND_HTTP_CLIENT_BASEURI');`
`81`	`81`	`if (substr($this->baseuri, -1) != '/') {`
`82`	`82`	`$this->baseuri .= '/';`
Original file line number	Diff line number	Diff line change
`@@ -35,7 +35,7 @@ class ProxyAdapterTest extends SocketTest`
`35`	`35`	`protected function setUp()`
`36`	`36`	`{`
`37`	`37`	`if (getenv('TESTS_ZEND_HTTP_CLIENT_HTTP_PROXY') &&`
`38`		`- getenv('TESTS_ZEND_HTTP_CLIENT_HTTP_PROXY')) {`
	`38`	`+ filter_var(getenv('TESTS_ZEND_HTTP_CLIENT_BASEURI'), FILTER_VALIDATE_BOOLEAN)) {`
`39`	`39`	`list($host, $port) = explode(':', getenv('TESTS_ZEND_HTTP_CLIENT_HTTP_PROXY'), 2);`
`40`	`40`
`41`	`41`	`if (! $host) {`
Original file line number	Diff line number	Diff line change
`@@ -33,7 +33,7 @@ class StaticClientTest extends \PHPUnit_Framework_TestCase`
`33`	`33`	`protected function setUp()`
`34`	`34`	`{`
`35`	`35`	`if (getenv('TESTS_ZEND_HTTP_CLIENT_BASEURI')`
`36`		`- && (getenv('TESTS_ZEND_HTTP_CLIENT_BASEURI') != false)) {`
	`36`	`+ && (filter_var(getenv('TESTS_ZEND_HTTP_CLIENT_BASEURI'), FILTER_VALIDATE_BOOLEAN) != false)) {`
`37`	`37`	`$this->baseuri = getenv('TESTS_ZEND_HTTP_CLIENT_BASEURI');`
`38`	`38`	`if (substr($this->baseuri, -1) != '/') {`
`39`	`39`	`$this->baseuri .= '/';`
Original file line number	Diff line number	Diff line change
`@@ -58,7 +58,7 @@ class UseCaseTest extends \PHPUnit_Framework_TestCase`
`58`	`58`	`protected function setUp()`
`59`	`59`	`{`
`60`	`60`	`if (getenv('TESTS_ZEND_HTTP_CLIENT_BASEURI')`
`61`		`- && (getenv('TESTS_ZEND_HTTP_CLIENT_BASEURI') != false)`
	`61`	`+ && (filter_var(getenv('TESTS_ZEND_HTTP_CLIENT_BASEURI'), FILTER_VALIDATE_BOOLEAN) != false)`
`62`	`62`	`) {`
`63`	`63`	`$this->baseuri = getenv('TESTS_ZEND_HTTP_CLIENT_BASEURI');`
`64`	`64`	`$this->client = new HTTPClient($this->baseuri);`