issue #19 - adapt tests for PHP < 7

mikaelcom · mikaelcom · commit 9671181a0564 · 2018-05-08T23:33:29.000+02:00
diff --git a/tests/SoapClientTest.php b/tests/SoapClientTest.php
@@ -220,7 +220,7 @@ public function testSetHeaders()
         $this->assertTrue(is_resource(SoapClient::getSoapClient()->_stream_context));
 
         $o = stream_context_get_options(SoapClient::getSoapClient()->_stream_context);
-        $this->assertTrue(strpos($o['http']['header'], 'X-Header-Name: X-Header-Value') > 0);
+        $this->assertTrue(strpos($o['http']['header'], 'X-Header-Name: X-Header-Value') !== false);
     }
     /**
      *
@@ -238,7 +238,8 @@ public function testSetHeadersOnExistingHeaders()
         $this->assertTrue(is_resource(SoapClient::getSoapClient()->_stream_context));
 
         $o = stream_context_get_options(SoapClient::getSoapClient()->_stream_context);
-        $this->assertTrue(strpos($o['http']['header'], 'X-Header-Name: X-Header-Value' . "\r\n" . 'X-Header-ID: X-Header-ID-Value') > 0);
+        $this->assertTrue(strpos($o['http']['header'], 'X-Header-Name: X-Header-Value') !== false);
+        $this->assertTrue(strpos($o['http']['header'], 'X-Header-ID: X-Header-ID-Value') !== false);
     }
     /**
      *
@@ -269,7 +270,8 @@ public function testSetHeadersOnExistingHttpsHeaders()
                 'X-HEADER' => 'X-VALUE',
             ),
         ), $o['https']);
-        $this->assertTrue(strpos($o['http']['header'], 'X-Header-Name: X-Header-Value' . "\r\n" . 'X-Header-ID: X-Header-ID-Value') > 0);
+        $this->assertTrue(strpos($o['http']['header'], 'X-Header-Name: X-Header-Value') !== false);
+        $this->assertTrue(strpos($o['http']['header'], 'X-Header-ID: X-Header-ID-Value') !== false);
     }
     /**
      *
@@ -298,7 +300,8 @@ public function testSetHeadersOnExistingHttpHeaders()
         $this->assertSame(array(
             'X-HEADER' => 'X-VALUE',
         ), $o['http']['Auth']);
-        $this->assertTrue(strpos($o['http']['header'], 'X-Header-Name: X-Header-Value' . "\r\n" . 'X-Header-ID: X-Header-ID-Value') > 0);
+        $this->assertTrue(strpos($o['http']['header'], 'X-Header-Name: X-Header-Value') !== false);
+        $this->assertTrue(strpos($o['http']['header'], 'X-Header-ID: X-Header-ID-Value') !== false);
     }
     /**
      *
@@ -315,7 +318,7 @@ public function testGetStreamContext()
         $this->assertTrue(is_resource($soapClient->getStreamContext()));
 
         $o = stream_context_get_options($soapClient->getStreamContext());
-        $this->assertTrue(strpos($o['http']['header'], 'X-Header-Name: X-Header-Value') > 0);
+        $this->assertTrue(strpos($o['http']['header'], 'X-Header-Name: X-Header-Value') !== false);
     }
     /**
      *
@@ -360,7 +363,8 @@ public function testSetHeadersOnExistingHttpHeadersWithGetStreamContextOptions()
         $this->assertSame(array(
             'X-HEADER' => 'X-VALUE',
         ), $o['http']['Auth']);
-        $this->assertTrue(strpos($o['http']['header'], 'X-Header-Name: X-Header-Value' . "\r\n" . 'X-Header-ID: X-Header-ID-Value') > 0);
+        $this->assertTrue(strpos($o['http']['header'], 'X-Header-Name: X-Header-Value') !== false);
+        $this->assertTrue(strpos($o['http']['header'], 'X-Header-ID: X-Header-ID-Value') !== false);
     }
     /**
      *

Original file line number	Diff line number	Diff line change
`@@ -220,7 +220,7 @@ public function testSetHeaders()`
`220`	`220`	`$this->assertTrue(is_resource(SoapClient::getSoapClient()->_stream_context));`
`221`	`221`
`222`	`222`	`$o = stream_context_get_options(SoapClient::getSoapClient()->_stream_context);`
`223`		`- $this->assertTrue(strpos($o['http']['header'], 'X-Header-Name: X-Header-Value') > 0);`
	`223`	`+ $this->assertTrue(strpos($o['http']['header'], 'X-Header-Name: X-Header-Value') !== false);`
`224`	`224`	`}`
`225`	`225`	`/**`
`226`	`226`	`*`
`@@ -238,7 +238,8 @@ public function testSetHeadersOnExistingHeaders()`
`238`	`238`	`$this->assertTrue(is_resource(SoapClient::getSoapClient()->_stream_context));`
`239`	`239`
`240`	`240`	`$o = stream_context_get_options(SoapClient::getSoapClient()->_stream_context);`
`241`		`- $this->assertTrue(strpos($o['http']['header'], 'X-Header-Name: X-Header-Value' . "\r\n" . 'X-Header-ID: X-Header-ID-Value') > 0);`
	`241`	`+ $this->assertTrue(strpos($o['http']['header'], 'X-Header-Name: X-Header-Value') !== false);`
	`242`	`+ $this->assertTrue(strpos($o['http']['header'], 'X-Header-ID: X-Header-ID-Value') !== false);`
`242`	`243`	`}`
`243`	`244`	`/**`
`244`	`245`	`*`
`@@ -269,7 +270,8 @@ public function testSetHeadersOnExistingHttpsHeaders()`
`269`	`270`	`'X-HEADER' => 'X-VALUE',`
`270`	`271`	`),`
`271`	`272`	`), $o['https']);`
`272`		`- $this->assertTrue(strpos($o['http']['header'], 'X-Header-Name: X-Header-Value' . "\r\n" . 'X-Header-ID: X-Header-ID-Value') > 0);`
	`273`	`+ $this->assertTrue(strpos($o['http']['header'], 'X-Header-Name: X-Header-Value') !== false);`
	`274`	`+ $this->assertTrue(strpos($o['http']['header'], 'X-Header-ID: X-Header-ID-Value') !== false);`
`273`	`275`	`}`
`274`	`276`	`/**`
`275`	`277`	`*`
`@@ -298,7 +300,8 @@ public function testSetHeadersOnExistingHttpHeaders()`
`298`	`300`	`$this->assertSame(array(`
`299`	`301`	`'X-HEADER' => 'X-VALUE',`
`300`	`302`	`), $o['http']['Auth']);`
`301`		`- $this->assertTrue(strpos($o['http']['header'], 'X-Header-Name: X-Header-Value' . "\r\n" . 'X-Header-ID: X-Header-ID-Value') > 0);`
	`303`	`+ $this->assertTrue(strpos($o['http']['header'], 'X-Header-Name: X-Header-Value') !== false);`
	`304`	`+ $this->assertTrue(strpos($o['http']['header'], 'X-Header-ID: X-Header-ID-Value') !== false);`
`302`	`305`	`}`
`303`	`306`	`/**`
`304`	`307`	`*`
`@@ -315,7 +318,7 @@ public function testGetStreamContext()`
`315`	`318`	`$this->assertTrue(is_resource($soapClient->getStreamContext()));`
`316`	`319`
`317`	`320`	`$o = stream_context_get_options($soapClient->getStreamContext());`
`318`		`- $this->assertTrue(strpos($o['http']['header'], 'X-Header-Name: X-Header-Value') > 0);`
	`321`	`+ $this->assertTrue(strpos($o['http']['header'], 'X-Header-Name: X-Header-Value') !== false);`
`319`	`322`	`}`
`320`	`323`	`/**`
`321`	`324`	`*`
`@@ -360,7 +363,8 @@ public function testSetHeadersOnExistingHttpHeadersWithGetStreamContextOptions()`
`360`	`363`	`$this->assertSame(array(`
`361`	`364`	`'X-HEADER' => 'X-VALUE',`
`362`	`365`	`), $o['http']['Auth']);`
`363`		`- $this->assertTrue(strpos($o['http']['header'], 'X-Header-Name: X-Header-Value' . "\r\n" . 'X-Header-ID: X-Header-ID-Value') > 0);`
	`366`	`+ $this->assertTrue(strpos($o['http']['header'], 'X-Header-Name: X-Header-Value') !== false);`
	`367`	`+ $this->assertTrue(strpos($o['http']['header'], 'X-Header-ID: X-Header-ID-Value') !== false);`
`364`	`368`	`}`
`365`	`369`	`/**`
`366`	`370`	`*`