From d29f0caa8dbbe5481ba9261ed757536747c79b9b Mon Sep 17 00:00:00 2001 From: Francis Besset Date: Fri, 23 Sep 2011 10:23:59 +0200 Subject: [PATCH] [SoapRequest] Returns null if headers is empty --- src/BeSimple/SoapClient/SoapRequest.php | 6 +++--- tests/BeSimple/Tests/SoapClient/SoapRequestTest.php | 6 +++--- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/src/BeSimple/SoapClient/SoapRequest.php b/src/BeSimple/SoapClient/SoapRequest.php index 178a26a..28f2926 100644 --- a/src/BeSimple/SoapClient/SoapRequest.php +++ b/src/BeSimple/SoapClient/SoapRequest.php @@ -146,11 +146,11 @@ class SoapRequest } /** - * @return array + * @return array|null */ public function getHeaders() { - return $this->headers; + return empty($this->headers) ? null : $this->headers; } /** @@ -194,4 +194,4 @@ class SoapRequest return $this; } -} \ No newline at end of file +} diff --git a/tests/BeSimple/Tests/SoapClient/SoapRequestTest.php b/tests/BeSimple/Tests/SoapClient/SoapRequestTest.php index 56240c6..c56d195 100644 --- a/tests/BeSimple/Tests/SoapClient/SoapRequestTest.php +++ b/tests/BeSimple/Tests/SoapClient/SoapRequestTest.php @@ -76,7 +76,7 @@ class SoapRequestTest extends \PHPUnit_Framework_TestCase { $soapRequest = new SoapRequest(); - $this->assertEquals(array(), $soapRequest->getHeaders()); + $this->assertEquals(null, $soapRequest->getHeaders()); $header1 = new \SoapHeader('foobar', 'foo', 'bar'); $header2 = new \SoapHeader('barfoo', 'bar', 'foo'); @@ -95,7 +95,7 @@ class SoapRequestTest extends \PHPUnit_Framework_TestCase $this->assertNull($soapRequest->getFunction()); $this->assertEquals(array(), $soapRequest->getArguments()); $this->assertEquals(array(), $soapRequest->getOptions()); - $this->assertEquals(array(), $soapRequest->getHeaders()); + $this->assertEquals(null, $soapRequest->getHeaders()); $arguments = array('bar' => 'foobar'); $options = array('soapaction' => 'foobar'); @@ -110,4 +110,4 @@ class SoapRequestTest extends \PHPUnit_Framework_TestCase $this->assertEquals($options, $soapRequest->getOptions()); $this->assertSame($headers, $soapRequest->getHeaders()); } -} \ No newline at end of file +}